Index: DOM/PM/impl/DataM/Pakket.cls.xml
===================================================================
diff -u -r39510 -r47936
--- DOM/PM/impl/DataM/Pakket.cls.xml	(.../Pakket.cls.xml)	(revision 39510)
+++ DOM/PM/impl/DataM/Pakket.cls.xml	(.../Pakket.cls.xml)	(revision 47936)
@@ -6,18 +6,44 @@
 <StorageStrategy>VHOpslag</StorageStrategy>
 <Super>%Persistent</Super>
 
+<Property name="KlantNr">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> set {*} = ##class(DOM.PM.impl.DataM.Pakket).%OpenId({ID}).KlantNr</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
 <Property name="PakketNummer">
 <Type>%String</Type>
 </Property>
 
-<Property name="KlantNr">
-<Type>%Integer</Type>
+<Property name="Klant">
+<Type>Derde.Klant.Klant</Type>
 </Property>
 
 <Property name="Naam">
 <Type>%String</Type>
 </Property>
 
+<Property name="Type">
+<Type>%String</Type>
+</Property>
+
+<Method name="KlantNrGet">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..KlantGetObjectId()
+]]></Implementation>
+</Method>
+
+<Method name="KlantNrSet">
+<FormalSpec>Nr:%String</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	do ..KlantSetObjectId(Nr)
+	quit $$$OK
+]]></Implementation>
+</Method>
+
 <Index name="PrimaryKey">
 <IdKey>1</IdKey>
 <PrimaryKey>1</PrimaryKey>
@@ -37,14 +63,18 @@
 <Subscript name="2">
 <Expression>{PakketNummer}</Expression>
 </Subscript>
-<Data name="KlantNr">
+<Data name="Klant">
 <Delimiter>"\"</Delimiter>
 <Piece>1</Piece>
 </Data>
 <Data name="Naam">
 <Delimiter>"\"</Delimiter>
 <Piece>2</Piece>
 </Data>
+<Data name="Type">
+<Delimiter>"\"</Delimiter>
+<Piece>3</Piece>
+</Data>
 </SQLMap>
 </Storage>
 </Class>