Index: zTryout/ARC/BASE/impl/DataM/DataMAdres.cls.xml
===================================================================
diff -u -r1074 -r1133
--- zTryout/ARC/BASE/impl/DataM/DataMAdres.cls.xml	(.../DataMAdres.cls.xml)	(revision 1074)
+++ zTryout/ARC/BASE/impl/DataM/DataMAdres.cls.xml	(.../DataMAdres.cls.xml)	(revision 1133)
@@ -1,67 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="9">
 <Class name="zTryout.ARC.BASE.impl.DataM.DataMAdres">
-<Import>zTryout.ARC.BASE</Import>
+<Import>zTryout.ARC.BASE,zTryout.ARC.TECH.Persistentie</Import>
 <IncludeCode>%VHMacro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>Adres,%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Property name="CustInfo">
-<Type>%String</Type>
+<Property name="CustInfoNode">
+<Type>GlobalNode</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="KLNr">
-<Type>%Integer</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
-<FormalSpec>klnr:%Integer,str:%String</FormalSpec>
+<FormalSpec>CustInfoNode:GlobalNode</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-		Set ..KLNr = klnr
-		Set ..CustInfo = str
+		Set ..CustInfoNode = CustInfoNode 
 		Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GeefNaam">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,2)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(2)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefToenaam">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,3)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(3)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAanspreking">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,4)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(4)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefStraat">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,5)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(5)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefPostcode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,6)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(6)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefGemeente">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[		Quit $P(..CustInfo,$$$D,7)
+<Implementation><![CDATA[		Quit ..CustInfoNode.GeefPiece(7)
 ]]></Implementation>
 </Method>
 
@@ -71,14 +65,19 @@
 <FormalSpec>taal:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-		Set CountryCode = $P(..CustInfo,$$$D,8)
+		Set CountryCode = ..CustInfoNode.GeefPiece(8)
 		// Default taal: taal van de klant
-		Set taalStr = $G(taal,$P(..CustInfo,$$$D,9))
+		Set taalStr = $G(taal,..CustInfoNode.GeefPiece(9))
 		Set Index = $S(taalStr="E":32,taalStr="F":12,taalStr="D":22,1:2)
 		Quit $P(^ISO(0,"ISO.LAND",CountryCode,0),$$$D,Index)
 ]]></Implementation>
 </Method>
 
+<Method name="Save">
+<Implementation><![CDATA[	Do ..CustInfoNode.Save()
+]]></Implementation>
+</Method>
+
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefNaam() _ " " _ ..GeefToenaam() _ " " _ ..GeefAanspreking() _ $$$CRLF _ ..GeefStraat() _ $$$CRLF _ ..GeefPostcode() _ " " _ ..GeefGemeente() _ $$$CRLF _ ..GeefLandString()
@@ -87,7 +86,7 @@
 
 <Method name="AsString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..CustInfo
+<Implementation><![CDATA[	Quit ..CustInfoNode.GeefGewijzigdeString()
 ]]></Implementation>
 </Method>
 </Class>