Index: AXimpl/ResponseProcessor.cls.xml
===================================================================
diff -u -r42275 -r42386
--- AXimpl/ResponseProcessor.cls.xml	(.../ResponseProcessor.cls.xml)	(revision 42275)
+++ AXimpl/ResponseProcessor.cls.xml	(.../ResponseProcessor.cls.xml)	(revision 42386)
@@ -18,8 +18,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RequestGeneratorConfig">
+<Type>AXimpl.RequestGeneratorConfig</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FileAPI:TECH.File.FileAPI,XmlCorrelater:TECH.XMLCorrelater,EventRaiser:AXimpl.EventRaiser</FormalSpec>
+<FormalSpec>FileAPI:TECH.File.FileAPI,XmlCorrelater:TECH.XMLCorrelater,EventRaiser:AXimpl.EventRaiser,RequestGeneratorConfig:AXimpl.RequestGeneratorConfig</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -28,6 +33,7 @@
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.File.impl.FileAPI).%New())
 	set ..XmlCorrelater = $$$Inject(XmlCorrelater,##class(TECH.XMLCorrelater).%New())
 	set ..EventRaiser = $$$Inject(EventRaiser,##class(AXimpl.EventRaiser).%New())
+	set ..RequestGeneratorConfig = $$$Inject(RequestGeneratorConfig,##class(AXimpl.RequestGeneratorConfig).%New())
 	quit $$$OK
 ]]></Implementation>
 </Method>
@@ -36,16 +42,15 @@
 <FormalSpec>FullFilename:%String</FormalSpec>
 <Implementation><![CDATA[
 	try {
-		#dim Message As AXaif.Message.Envelope = ..XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
-		
+		#dim KlasseNaam As %String = ..RequestGeneratorConfig.GetEnvelopeViaSubPath(##class(TECH.StringUtils).Replace(FullFilename,##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),""))
+		#dim Message As %CacheString = ..XmlCorrelater.GeefObjectVanBestand(FullFilename,KlasseNaam,"Envelope")
 		do ..EventRaiser.RaiseResponseReceivedEvent(Message,..FileAPI.GeefFileReader(FullFilename).GeefStream())
 		
 		do ..FileAPI.DeleteFile(FullFilename)
 		
 	} catch {
 		
-		#dim Exception As TECH.ExceptionHandler = ##class(TECH.ExceptionHandler).Catch()
-		
+		#dim Exception As TECH.Exception = ##class(TECH.ExceptionHandler).Catch()
 		#dim ErrorPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AX_AIF_ErrorPath")
 		#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(ErrorPath,##class(TECH.File).GetFilename(FullFilename))