Index: AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter.cls.xml
===================================================================
diff -u -r42156 -r42157
--- AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 42156)
+++ AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter.cls.xml	(.../AddressUpsertConverter.cls.xml)	(revision 42157)
@@ -9,7 +9,7 @@
 </Property>
 
 <Property name="Address">
-<Type>AXif.Crm.CustomerAddressUpsertOut.Address</Type>
+<Type>AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address</Type>
 <Private>1</Private>
 </Property>
 
Index: AXif/Crm/CustomerAddressUpsertOut/MessageParts.cls.xml
===================================================================
diff -u -r42156 -r42157
--- AXif/Crm/CustomerAddressUpsertOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 42156)
+++ AXif/Crm/CustomerAddressUpsertOut/MessageParts.cls.xml	(.../MessageParts.cls.xml)	(revision 42157)
@@ -10,7 +10,7 @@
 </Parameter>
 
 <Property name="Address">
-<Type>AXif.Crm.CustomerAddressUpsertOut.Address</Type>
+<Type>AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address</Type>
 <Parameter name="REFELEMENTQUALIFIED" value="1"/>
 <Parameter name="XMLNAME" value="Customer"/>
 <Parameter name="XMLREF" value="1"/>
Index: vhUnitTest/AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter/Test.cls.xml
===================================================================
diff -u -r42156 -r42157
--- vhUnitTest/AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42156)
+++ vhUnitTest/AXimpl/Crm/CustomerAddressOut/Converter/AddressUpsertConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 42157)
@@ -34,7 +34,7 @@
 
 <Method name="Test: properties die 1 op 1 worden overgenomen">
 <Implementation><![CDATA[
-	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.Address = ..GeefAddress(..Leveradres.GeefID())
+	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Klantnummer,"01001")
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Straat1,"Straat 1")
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Postcode,"9101")
@@ -54,7 +54,7 @@
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetAdresType("F")
 	
-	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.Address = ..GeefAddress(..Leveradres.GeefID())
+	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$True)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveringAdres,$$$False)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.BezoekAdres,$$$False)
@@ -65,7 +65,7 @@
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetAdresType("B")
 	
-	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.Address = ..GeefAddress(..Leveradres.GeefID())
+	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.FacturatieAdres,$$$False)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.LeveringAdres,$$$False)
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.BezoekAdres,$$$True)
@@ -76,7 +76,7 @@
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetVerzendingWijze("OD;2`OD;5")
 	
-	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.Address = ..GeefAddress(..Leveradres.GeefID())
+	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.Verzendwijze,"OD(Di),OD(Vr)")
 ]]></Implementation>
 </Method>
@@ -85,14 +85,14 @@
 <Implementation><![CDATA[
 	Do ..Leveradres.ZetLandNr("")
 	
-	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.Address = ..GeefAddress(..Leveradres.GeefID())
+	#dim GeconverteerdeLeverAdres As AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address = ..GeefAddress(..Leveradres.GeefID())
 	Do $$$AssertEquals(GeconverteerdeLeverAdres.LandCodeISO3,"BEL")
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAddress">
 <FormalSpec>LeveradresId:%String</FormalSpec>
-<ReturnType>AXif.Crm.CustomerAddressUpsertOut.Address</ReturnType>
+<ReturnType>AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address</ReturnType>
 <Implementation><![CDATA[
 	Set LeveradresRepositoryStub = ##class(vhTest.Mock.AXimpl.Crm.CustomerAddressOut.Converter.LeveradresRepository).%New()
 	Do LeveradresRepositoryStub.IndienMethodCall("GeefViaID",$$$ElkeWaarde).DanReturn(..Leveradres)
Index: AXif/Crm/CustomerAddressUpsertOut/MessageParts/Address.cls.xml
===================================================================
diff -u
--- AXif/Crm/CustomerAddressUpsertOut/MessageParts/Address.cls.xml	(revision 0)
+++ AXif/Crm/CustomerAddressUpsertOut/MessageParts/Address.cls.xml	(revision 42157)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXif.Crm.CustomerAddressUpsertOut.MessageParts.Address">
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Parameter name="XMLIGNORENULL">
+<Type>%String</Type>
+<Default>1</Default>
+</Parameter>
+
+<Property name="LeveradresId">
+<Type>%String</Type>
+</Property>
+
+<Property name="Klantnummer">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="20"/>
+</Property>
+
+<Property name="BezoekAdres">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="ToonzaalAdres">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="LeveringAdres">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="FacturatieAdres">
+<Type>%Boolean</Type>
+</Property>
+
+<Property name="Straat1">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
+</Property>
+
+<Property name="Straat2">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
+</Property>
+
+<Property name="Straat3">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="250"/>
+</Property>
+
+<Property name="Postcode">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="20"/>
+</Property>
+
+<Property name="Plaats">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="80"/>
+</Property>
+
+<Property name="County">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="50"/>
+</Property>
+
+<Property name="Provincie">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="50"/>
+</Property>
+
+<Property name="LandCodeISO3">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="3"/>
+</Property>
+
+<Property name="Telefoon">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="50"/>
+</Property>
+
+<Property name="Verzendwijze">
+<Type>%String</Type>
+<Parameter name="MAXLEN" value="100"/>
+</Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>AddressState</State>
+<StreamLocation>^AXBizTalk.AddressS</StreamLocation>
+<Data name="AddressState">
+<Value name="1">
+<Value>Klantnummer</Value>
+</Value>
+<Value name="2">
+<Value>BezoekAdres</Value>
+</Value>
+<Value name="3">
+<Value>ToonzaalAdres</Value>
+</Value>
+<Value name="4">
+<Value>LeveringAdres</Value>
+</Value>
+<Value name="5">
+<Value>FacturatieAdres</Value>
+</Value>
+<Value name="6">
+<Value>Straat1</Value>
+</Value>
+<Value name="7">
+<Value>Straat2</Value>
+</Value>
+<Value name="8">
+<Value>Straat3</Value>
+</Value>
+<Value name="9">
+<Value>Postcode</Value>
+</Value>
+<Value name="10">
+<Value>Plaats</Value>
+</Value>
+<Value name="11">
+<Value>County</Value>
+</Value>
+<Value name="12">
+<Value>Provincie</Value>
+</Value>
+<Value name="13">
+<Value>LandCodeISO3</Value>
+</Value>
+<Value name="14">
+<Value>Telefoon</Value>
+</Value>
+<Value name="15">
+<Value>Verzendwijze</Value>
+</Value>
+<Value name="16">
+<Value>LeveradresId</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>