Index: AXimpl/AifMessage/RequestGeneratorConfig.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/RequestGeneratorConfig.cls.xml	(revision 0)
+++ AXimpl/AifMessage/RequestGeneratorConfig.cls.xml	(revision 35548)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.RequestGeneratorConfig">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GetConverter">
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
+<ReturnType>AX.Uitgaand.common.AifConverter</ReturnType>
+<Implementation><![CDATA[
+	quit:Request.Command="Customer/Create" ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New()
+	quit:Request.Command="Customer/Read" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart1Converter).%New()
+	quit:Request.Command="Customer/UpdatePart1" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart1Converter).%New()
+	quit:Request.Command="Customer/UpdatePart2" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New()
+	quit:Request.Command="SalesInvoice/Create" ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New()
+	quit:Request.Command="PurchaseInvoice/Create" ##class(AX.Uitgaand.BKH.AankoopFactuur.impl.AifConverter).%New()
+	
+	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Request.Command_" not supported")
+]]></Implementation>
+</Method>
+
+<Method name="GetAction">
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:Request.Command="Customer/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
+	quit:Request.Command="Customer/Read" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
+	quit:Request.Command="Customer/UpdatePart1" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
+	quit:Request.Command="Customer/UpdatePart2" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/update"
+	quit:Request.Command="SalesInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
+	quit:Request.Command="PurchaseInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
+	
+	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Request.Command_" not supported")
+]]></Implementation>
+</Method>
+
+<Method name="GetSubPath">
+<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	quit:Request.Command="Customer/Create" "Customer/Create"
+	quit:Request.Command="Customer/UpdatePart1" "Customer/Create"
+	quit:Request.Command="Customer/UpdatePart2" "Customer/Update"
+	quit:Request.Command="SalesInvoice/Create" "SalesInvoice/Create"
+	quit:Request.Command="PurchaseInvoice/Create" "PurchaseInvoice/Create"
+	
+	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Request.Command_" not supported")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AX/Uitgaand/common/impl/AifGenerator.cls.xml
===================================================================
diff -u -r35537 -r35548
--- AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35537)
+++ AX/Uitgaand/common/impl/AifGenerator.cls.xml	(.../AifGenerator.cls.xml)	(revision 35548)
@@ -23,6 +23,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RequestGeneratorConfig">
+<Type>AXimpl.AifMessage.RequestGeneratorConfig</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>RequestComposer:AXimpl.AifMessage.RequestComposer,FileWriter:AX.common.impl.FileWriter,EventRaiser:AXimpl.AifMessage.EventRaiser</FormalSpec>
 <Private>1</Private>
@@ -34,6 +39,7 @@
 	set ..FileWriter = $$$Inject(FileWriter,##class(AX.common.impl.FileWriter).%New())
 	set ..EventRaiser = $$$Inject(EventRaiser,##class(AXimpl.AifMessage.EventRaiser).%New())
 	set ..RequestComposer = $$$Inject(RequestComposer,##class(AXimpl.AifMessage.RequestComposer).%New())
+	set ..RequestGeneratorConfig = ##class(AXimpl.AifMessage.RequestGeneratorConfig).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -76,7 +82,7 @@
 <Implementation><![CDATA[
 	#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"),..GetSubPath(Request))
+	#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),..RequestGeneratorConfig.GetSubPath(Request))
 	#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)
 		
@@ -88,21 +94,6 @@
 	do ..FileWriter.Close()
 ]]></Implementation>
 </Method>
-
-<Method name="GetSubPath">
-<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	quit:Request.Command="Customer/Create" "Customer/Create"
-	quit:Request.Command="Customer/Read" "Customer/Update"
-	quit:Request.Command="Customer/UpdatePart1" "Customer/Update"
-	quit:Request.Command="Customer/UpdatePart2" "Customer/Create"
-	quit:Request.Command="SalesInvoice/Create" "SalesInvoice/Create"
-	quit:Request.Command="PurchaseInvoice/Create" "PurchaseInvoice/Create"
-	
-	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Request.Command_" not supported")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: AXimpl/AifMessage/RequestComposer.cls.xml
===================================================================
diff -u -r35537 -r35548
--- AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35537)
+++ AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35548)
@@ -34,44 +34,12 @@
 	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.Header.Action = ##class(AXimpl.AifMessage.RequestGeneratorConfig).%New().GetAction(Request)
 	set Envelope.Body = ##class(AXaif.Message.Body).%New()
-	set Envelope.Body.MessageParts = ..GetConverter(Request.Command).Convert(Request)
+	set Envelope.Body.MessageParts = ##class(AXimpl.AifMessage.RequestGeneratorConfig).%New().GetConverter(Request).Convert(Request)
 	quit Envelope
 ]]></Implementation>
 </Method>
-
-<Method name="GetConverter">
-<FormalSpec>Command:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>AX.Uitgaand.common.AifConverter</ReturnType>
-<Implementation><![CDATA[
-	quit:Command="Customer/Create" ##class(AXimpl.AifMessage.Converter.CustomerCreateConverter).%New()
-	quit:Command="Customer/Read" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart1Converter).%New()
-	quit:Command="Customer/UpdatePart1" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart1Converter).%New()
-	quit:Command="Customer/UpdatePart2" ##class(AXimpl.AifMessage.Converter.CustomerUpdatePart2Converter).%New()
-	quit:Command="SalesInvoice/Create" ##class(AX.Uitgaand.VKP.VerkoopFactuur.impl.AifConverter).%New()
-	quit:Command="PurchaseInvoice/Create" ##class(AX.Uitgaand.BKH.AankoopFactuur.impl.AifConverter).%New()
-	
-	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Command_" not supported")
-]]></Implementation>
-</Method>
-
-<Method name="GetAction">
-<FormalSpec>Command:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	quit:Command="Customer/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/create"
-	quit:Command="Customer/Read" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
-	quit:Command="Customer/UpdatePart1" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/read"
-	quit:Command="Customer/UpdatePart2" "http://schemas.microsoft.com/dynamics/2008/01/services/CustomerService/update"
-	quit:Command="SalesInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
-	quit:Command="PurchaseInvoice/Create" "http://schemas.microsoft.com/dynamics/2008/01/services/GeneralJournalService/create"
-	
-	do ##class(TECH.Exceptions.IllegalUsageException).Throw(Command_" not supported")
-]]></Implementation>
-</Method>
 </Class>