Index: AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart1Converter.cls.xml
===================================================================
diff -u -r42319 -r43018
--- AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart1Converter.cls.xml	(.../CustomerUpdatePart1Converter.cls.xml)	(revision 42319)
+++ AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart1Converter.cls.xml	(.../CustomerUpdatePart1Converter.cls.xml)	(revision 43018)
@@ -4,7 +4,7 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="Convert">
-<FormalSpec>Command:AXimpl.Request</FormalSpec>
+<FormalSpec>Command:AXimpl.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Common.EntityKey.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXif.Common.EntityKey.MessageParts).%New()
Index: vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml
===================================================================
diff -u -r42335 -r43018
--- vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 42335)
+++ vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 43018)
@@ -47,7 +47,7 @@
 		
 	if $$$AssertEquals(Request.Message.Body.MessageParts.Customer.CustTable.Count(),1) {
 		set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-		do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+		do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GetMessageParts())
 		set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 		#dim MessageParts As AXif.Dynamics.CustomerOut.MessageParts = Converter.Convert(Request)
 
@@ -65,7 +65,7 @@
 	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTableRead)
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GetMessageParts())
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim MessageParts As AXif.Dynamics.CustomerOut.MessageParts = Converter.Convert(Request)
@@ -81,7 +81,7 @@
 	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTableRead)
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanException(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),"K||1234"))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanException(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),"K||1234"))
 	
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 
Index: AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter.cls.xml
===================================================================
diff -u -r42313 -r43018
--- AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 42313)
+++ AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter.cls.xml	(.../CustomerUpdatePart2Converter.cls.xml)	(revision 43018)
@@ -46,7 +46,7 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Command:AXimpl.Request</FormalSpec>
+<FormalSpec>Command:AXimpl.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.CustomerOut.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	#dim MessagePartsRead As AXif.Dynamics.CustomerOut.MessageParts = Command.Message.Body.MessageParts.%ConstructClone($$$true)
Index: vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/TestContactInfo.cls.xml
===================================================================
diff -u -r42335 -r43018
--- vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/TestContactInfo.cls.xml	(.../TestContactInfo.cls.xml)	(revision 42335)
+++ vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Convert/TestContactInfo.cls.xml	(.../TestContactInfo.cls.xml)	(revision 43018)
@@ -9,7 +9,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts()
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of  AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
@@ -27,7 +27,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts($listbuild("Phone","Telefoon 1","09 111 11 11",$$$true),$listbuild("Phone","Telefoon 2","09 111 11 12",$$$false))
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of  AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
@@ -45,7 +45,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts($listbuild("Phone","Telefoon 1","09 111 11 11",$$$true),$listbuild("Phone","Telefoon 2","09 111 11 12",$$$false))
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of  AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
@@ -63,7 +63,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts($listbuild("Phone","Telefoon 1","09 111 11 11",$$$true))
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of  AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
@@ -81,7 +81,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts($listbuild("Phone","Telefoon 1","09 111 11 11",$$$true),$listbuild("Phone","Telefoon 2","09 111 11 12",$$$false))
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 2","09 222 22 23",$$$true)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 2","09 222 22 23",$$$true)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
@@ -99,7 +99,7 @@
 	set Request.Message.Body.MessageParts = ..BuildMessageParts($listbuild("Phone","Telefoon 2","09 111 11 12",$$$true))
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..BuildMessageParts($listbuild("Phone","Telefoon 1","09 222 22 22",$$$true),$listbuild("Phone","Telefoon 2","09 222 22 23",$$$false)))
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim ContactViews As list of AXaif.Customer.AxdEntityDirPartyContactInfoView = ..GetContactViews(Converter.Convert(Request))
Index: AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r42313 -r43018
--- AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42313)
+++ AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 43018)
@@ -61,7 +61,7 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Command:AXimpl.Request</FormalSpec>
+<FormalSpec>Command:AXimpl.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.CustomerOut.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXif.Dynamics.CustomerOut.MessageParts).%New()
Index: vhTest/Mock/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r42313 -r43018
--- vhTest/Mock/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 42313)
+++ vhTest/Mock/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 43018)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="Convert">
-<FormalSpec>Command:AXimpl.Request</FormalSpec>
+<FormalSpec>Command:AXimpl.Request,MessageId:%String=""</FormalSpec>
 <ReturnType>AXif.Dynamics.CustomerOut.MessageParts</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Command)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Command,MessageId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Test.cls.xml
===================================================================
diff -u -r42344 -r43018
--- vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 42344)
+++ vhUnitTest/AXimpl/Dynamics/CustomerUpsertOut/Converter/CustomerUpdatePart2Converter/Test.cls.xml	(.../Test.cls.xml)	(revision 43018)
@@ -47,7 +47,7 @@
 		
 	if $$$AssertEquals(Request.Message.Body.MessageParts.Customer.CustTable.Count(),1) {
 		set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-		do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+		do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GetMessageParts())
 		set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 		#dim MessageParts As AXif.Dynamics.CustomerOut.MessageParts = Converter.Convert(Request)
 
@@ -65,7 +65,7 @@
 	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTableRead)
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanReturn(..GetMessageParts())
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn(..GetMessageParts())
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)
 	
 	#dim MessageParts As AXif.Dynamics.CustomerOut.MessageParts = Converter.Convert(Request)
@@ -81,7 +81,7 @@
 	do Request.Message.Body.MessageParts.Customer.CustTable.Insert(CustTableRead)
 	
 	set CreateConverterStub = ##class(vhTest.Mock.AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerCreateConverter).%New()
-	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde).DanException(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),"K||1234"))
+	do CreateConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanException(##class(AXimpl.NoConversionNeededException).%New(##this.%ClassName(),"K||1234"))
 	
 	set Converter = ##class(AXimpl.Dynamics.CustomerUpsertOut.Converter.CustomerUpdatePart2Converter).%New(CreateConverterStub)