Index: vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml
===================================================================
diff -u -r47069 -r47075
--- vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47069)
+++ vhUnitTest/AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 47075)
@@ -54,9 +54,12 @@
 	Set Cust = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
 	Set Cust.CustAccount = $Piece(Klant.GeefID(),"||",2)
 	
-	Set Bericht = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
-	Do Bericht.Cust.Insert(Cust)
+	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
+	Do CustOutQuery.Cust.Insert(Cust)
 	
+	Set Bericht = ##class(AXif.Dynamics.CustomerIn.Envelope).%New()
+	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
+	
 	Quit Bericht
 ]]></Implementation>
 </Method>
@@ -74,11 +77,14 @@
 	Set Cust3 = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust).%New()
 	Set Cust3.CustAccount = $Piece(Klant.GeefID(),"||",2)
 	
-	Set Bericht = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
-	Do Bericht.Cust.Insert(Cust1)
-	Do Bericht.Cust.Insert(Cust2)
-	Do Bericht.Cust.Insert(Cust3)
+	Set CustOutQuery = ##class(AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery).%New()
+	Do CustOutQuery.Cust.Insert(Cust1)
+	Do CustOutQuery.Cust.Insert(Cust2)
+	Do CustOutQuery.Cust.Insert(Cust3)
 	
+	Set Bericht = ##class(AXif.Dynamics.CustomerIn.Envelope).%New()
+	Set Bericht.Body.MessageParts.MessagePart = CustOutQuery
+	
 	Quit Bericht
 ]]></Implementation>
 </Method>
Index: AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml
===================================================================
diff -u -r47069 -r47075
--- AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47069)
+++ AXimpl/Dynamics/CustomerIn/Converter/CustomerInConverter.cls.xml	(.../CustomerInConverter.cls.xml)	(revision 47075)
@@ -21,9 +21,10 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>AxdADUMsgCustOutQuery:AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery,MessageId:%String</FormalSpec>
+<FormalSpec>Message:AXif.Dynamics.CustomerIn.Envelope</FormalSpec>
 <Implementation><![CDATA[
-	Set AxdEntityCustIterator = ##class(TECH.ListIterator).%New(AxdADUMsgCustOutQuery.Cust)
+	#dim CustOutQuery As AXif.Dynamics.CustomerIn.MessageParts.AxdADUMsgCustOutQuery = Message.Body.MessageParts.MessagePart
+	Set AxdEntityCustIterator = ##class(TECH.ListIterator).%New(CustOutQuery.Cust)
 	While AxdEntityCustIterator.HasNext() {
 		#dim Cust as AXif.Dynamics.CustomerIn.MessageParts.AxdEntityCust = AxdEntityCustIterator.Next()
 		#dim KlantId As %String = "K||"_##class(TECH.StringUtils).LeftTrim(Cust.CustAccount,"0")