Index: AXimpl/AifMessage/Request.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/Request.cls.xml	(revision 0)
+++ AXimpl/AifMessage/Request.cls.xml	(revision 35457)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.Request">
+<Super>%SerialObject,%XML.Adaptor</Super>
+
+<Property name="Command">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="SubjectId">
+<Type>%String</Type>
+<Required>1</Required>
+</Property>
+
+<Property name="Message">
+<Type>AXaif.Message.Envelope</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Command:%String,SubjectId:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Command = Command
+	set ..SubjectId = SubjectId 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>CommandState</State>
+<StreamLocation>^AXimpl.AifMessage.CommandS</StreamLocation>
+<Data name="CommandState">
+<Value name="1">
+<Value>Command</Value>
+</Value>
+<Value name="2">
+<Value>SubjectId</Value>
+</Value>
+<Value name="3">
+<Value>Message</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: AXimpl/AifMessage/Converter/CustomerUpdatePart1Converter.cls.xml
===================================================================
diff -u -r35427 -r35457
--- AXimpl/AifMessage/Converter/CustomerUpdatePart1Converter.cls.xml	(.../CustomerUpdatePart1Converter.cls.xml)	(revision 35427)
+++ AXimpl/AifMessage/Converter/CustomerUpdatePart1Converter.cls.xml	(.../CustomerUpdatePart1Converter.cls.xml)	(revision 35457)
@@ -4,11 +4,11 @@
 <Super>TECH.RegisteredObject</Super>
 
 <Method name="Convert">
-<FormalSpec>Id:%String</FormalSpec>
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXaif.Message.MessageParts).%New()
-	set MessageParts.EntityKeyList = ..GetEntityKeyList(Id)
+	set MessageParts.EntityKeyList = ..GetEntityKeyList(Command.SubjectId)
 	quit MessageParts
 ]]></Implementation>
 </Method>
Index: AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml
===================================================================
diff -u -r35427 -r35457
--- AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35427)
+++ AXimpl/AifMessage/Converter/CustomerCreateConverter.cls.xml	(.../CustomerCreateConverter.cls.xml)	(revision 35457)
@@ -56,11 +56,11 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Id:%String</FormalSpec>
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXaif.Message.MessageParts).%New()
-	set MessageParts.Customer = ..GetCustomer(Id)
+	set MessageParts.Customer = ..GetCustomer(Command.SubjectId)
 	quit MessageParts
 ]]></Implementation>
 </Method>
Index: AXimpl/AifMessage/RequestComposer.cls.xml
===================================================================
diff -u -r35427 -r35457
--- AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35427)
+++ AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35457)
@@ -27,17 +27,17 @@
 </Method>
 
 <Method name="Compose">
-<FormalSpec>Command:%String,Id:%String</FormalSpec>
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.Envelope</ReturnType>
 <Implementation><![CDATA[
-	set Request = ##class(AXaif.Message.Envelope).%New()
-	set Request.Header = ##class(AXaif.Message.Header).%New()
-	set Request.Header.MessageId = ..MessageManager.GenerateID()
-	set Request.Header.Company = ..FirmaBepaler.GeefInitialen()
-	set Request.Header.Action = ..GetAction(Command)
-	set Request.Body = ##class(AXaif.Message.Body).%New()
-	set Request.Body.MessageParts = ..GetConverter(Command).Convert(Id)
-	quit Request
+	set Envelope = ##class(AXaif.Message.Envelope).%New()
+	set Envelope.Header = ##class(AXaif.Message.Header).%New()
+	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
+	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
+	set Envelope.Header.Action = ..GetAction(Request.Command)
+	set Envelope.Body = ##class(AXaif.Message.Body).%New()
+	set Envelope.Body.MessageParts = ..GetConverter(Request.Command).Convert(Request)
+	quit Envelope
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml
===================================================================
diff -u -r35427 -r35457
--- vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 35427)
+++ vhUnitTest/AX/Uitgaand/VKP/VanHoeckeKlant/impl/AifConverter/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 35457)
@@ -44,7 +44,7 @@
 	Do FirmaBepaler.IndienMethodCall("GeefInitialen").DanReturn(..Firma)
 	
 	set AifConverter = ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New(PartijAPI,VerkoopAPI,FirmaBepaler)
-	quit AifConverter.Convert(..Partij.GeefID()).Customer
+	quit AifConverter.Convert(##class(AXimpl.AifMessage.Request).%New("Customer/Create",..Partij.GeefID())).Customer
 ]]></Implementation>
 </Method>
 </Class>
Index: AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r35427 -r35457
--- AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35427)
+++ AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35457)
@@ -64,11 +64,11 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Id:%String</FormalSpec>
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.LedgerGeneralJournal.AxdLedgerGeneralJournal</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXaif.Message.MessageParts).%New()
-	set MessageParts.LedgerGeneralJournal = ..GetLedgerGeneralJournal(Id)
+	set MessageParts.LedgerGeneralJournal = ..GetLedgerGeneralJournal(Command.SubjectId)
 	quit MessageParts
 ]]></Implementation>
 </Method>
Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r35259 -r35457
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35259)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35457)
@@ -46,7 +46,7 @@
 	
 	#dim KlantIterator As TECH.Iterator = ##class(TECH.DynamicIterator).%New(VerkoopAPI.GeefKlantIterator(),,Filter)
 	while KlantIterator.HasNext() {
-		do ..Generate("Customer/Create",KlantIterator.Next().GeefID())	
+		do ..Generate(##class(AXimpl.AifMessage.Request).%New("Customer/Create",KlantIterator.Next().GeefID()))	
 	}
 ]]></Implementation>
 </Method>
@@ -67,23 +67,23 @@
 
 <Method name="GenerateSalesInvoice">
 <FormalSpec>FactuurId:%String</FormalSpec>
-<Implementation><![CDATA[	do ..Generate("SalesInvoice/Create",FactuurId)
+<Implementation><![CDATA[	do ..Generate(##class(AXimpl.AifMessage.Request).%New("SalesInvoice/Create",FactuurId))
 ]]></Implementation>
 </Method>
 
 <Method name="Generate">
-<FormalSpec>Command:%String,Id:%String</FormalSpec>
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
 <Implementation><![CDATA[
-	#dim Request As AXaif.Message.Envelope = ..RequestComposer.Compose(Command,Id)
+	#dim RequestEnvelope As AXaif.Message.Envelope = ..RequestComposer.Compose(Request)
 		
-	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),Command)
-	#dim Filename As %String = $replace(Command,"/","-")_" "_$replace(Id,"|","")_" "_" - "_Request.Header.Company_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
+	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),Request.Command)
+	#dim Filename As %String = $replace(Request.Command,"/","-")_" "_$replace(Request.SubjectId,"|","")_" "_" - "_RequestEnvelope.Header.Company_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(Path,Filename)
 		
 	do ..FileWriter.Open(FullFilename,$$$True)
-	do ..FileWriter.WriteXML(Request)
+	do ..FileWriter.WriteXML(RequestEnvelope)
 	
-	do ..EventRaiser.RaiseRequestSendEvent(Command,Id,Request,..FileWriter.GetStream())
+	do ..EventRaiser.RaiseRequestSendEvent(Request.Command,Request.SubjectId,RequestEnvelope,..FileWriter.GetStream())
 	
 	do ..FileWriter.Close()
 ]]></Implementation>
Index: vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Base.cls.xml
===================================================================
diff -u -r35427 -r35457
--- vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Base.cls.xml	(.../Base.cls.xml)	(revision 35427)
+++ vhUnitTest/AX/Uitgaand/VKP/VerkoopFactuur/impl/AifConverter/Base.cls.xml	(.../Base.cls.xml)	(revision 35457)
@@ -13,7 +13,7 @@
 	do OrderApiStub.IndienMethodCall("GeefFactuur",VerkoopFactuur.GeefID()).DanReturn(VerkoopFactuur)
 	
 	set Converter = ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New(,,OrderApiStub)
-	#dim MessageParts As AXaif.Message.MessageParts = Converter.Convert(VerkoopFactuur.GeefID())
+	#dim MessageParts As AXaif.Message.MessageParts = Converter.Convert(##class(AXimpl.AifMessage.Request).%New("SalesInvoice/Create",VerkoopFactuur.GeefID()))
 	
 	quit MessageParts.LedgerGeneralJournal.LedgerJournalTable.GetAt(1)
 ]]></Implementation>
Index: vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml
===================================================================
diff -u -r35427 -r35457
--- vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35427)
+++ vhUnitTest/AX/Uitgaand/common/impl/AifGenerator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 35457)
@@ -25,7 +25,7 @@
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
 	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
-	do Generator.Generate("Customer/Create",KlantId)
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/Create",KlantId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -47,7 +47,7 @@
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
 	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
-	do Generator.Generate("SalesInvoice/Create",VerkoopFactuurId)
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -69,7 +69,7 @@
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
 	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
-	do Generator.Generate("SalesInvoice/Create",VerkoopFactuurId)
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("SalesInvoice/Create",VerkoopFactuurId))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -90,7 +90,7 @@
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.AifMessage.EventRaiser).%New()
 
 	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,FakeEventRaiser)
-	do Generator.Generate("Customer/UpdatePart1",KlantId)
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart1",KlantId))
 		
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 ]]></Implementation>
@@ -126,7 +126,7 @@
 	do EventRaiserMock.VerwachtMethodCall("RaiseRequestSendEvent","PurchaseInvoice/Create",AankoopFactuur.GeefID(),$$$ElkeWaarde,$$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(1)
 
 	set Generator = ##class(AX.Uitgaand.common.impl.AifGenerator).%New(RequestComposer,,EventRaiserMock)
-	do Generator.Generate("PurchaseInvoice/Create",AankoopFactuur.GeefID())
+	do Generator.Generate(##class(AXimpl.AifMessage.Request).%New("PurchaseInvoice/Create",AankoopFactuur.GeefID()))
 	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie())
 	
Index: AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml
===================================================================
diff -u -r35427 -r35457
--- AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35427)
+++ AX/Uitgaand/BKH/AankoopFactuur/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 35457)
@@ -40,11 +40,11 @@
 </Method>
 
 <Method name="Convert">
-<FormalSpec>Id:%String</FormalSpec>
+<FormalSpec>Command:AXimpl.AifMessage.Request</FormalSpec>
 <ReturnType>AXaif.Message.MessageParts</ReturnType>
 <Implementation><![CDATA[
 	set MessageParts = ##class(AXaif.Message.MessageParts).%New()
-	set MessageParts.LedgerGeneralJournal = ..GetLedgerGeneralJournal(Id)
+	set MessageParts.LedgerGeneralJournal = ..GetLedgerGeneralJournal(Command.SubjectId)
 	quit MessageParts
 ]]></Implementation>
 </Method>