Index: AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42340 -r42385
--- AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42340)
+++ AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42385)
@@ -8,14 +8,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="RequestGeneratorConfig">
+<Type>AXimpl.RequestGeneratorConfig</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>initvalue:%CacheString</FormalSpec>
+<FormalSpec>RequestGeneratorConfig:AXimpl.RequestGeneratorConfig</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
+	set ..RequestGeneratorConfig = $$$Inject(RequestGeneratorConfig,##class(AXimpl.RequestGeneratorConfig).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -29,7 +35,10 @@
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
-<Implementation><![CDATA[	quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
+<Implementation><![CDATA[
+	#dim KlasseNaam As %String = ..RequestGeneratorConfig.GetEnvelopeViaSubPath(##class(TECH.StringUtils).Replace(FullFilename,##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),""))
+
+	quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,KlasseNaam,"Envelope")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml
===================================================================
diff -u -r42343 -r42385
--- vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42343)
+++ vhUnitTest/AXimpl/MessageManager/Import/Test.cls.xml	(.../Test.cls.xml)	(revision 42385)
@@ -7,7 +7,10 @@
 <Implementation><![CDATA[
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
-	set MessageManager = ##class(AXimpl.MessageManager).%New()
+	set RequestGeneratorConfigStub = ##class(vhTest.Mock.AXimpl.RequestGeneratorConfig).%New()
+	do RequestGeneratorConfigStub.IndienMethodCall("GetEnvelopeViaSubPath", FullFilename).DanReturn("AXif.Dynamics.CustomerOut.Envelope")
+	
+	set MessageManager = ##class(AXimpl.MessageManager).%New(RequestGeneratorConfigStub)
 	#dim Message As %CacheString = MessageManager.Import(FullFilename)
 	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"SchemaValidationFailed")
@@ -20,7 +23,10 @@
 <Implementation><![CDATA[
 	#dim FullFilename As %String = ##class(TECH.Files).AppendFile(..GeefBestandLocatie(),"Message.xml")
 	
-	set MessageManager = ##class(AXimpl.MessageManager).%New()
+	set RequestGeneratorConfigStub = ##class(vhTest.Mock.AXimpl.RequestGeneratorConfig).%New()
+	do RequestGeneratorConfigStub.IndienMethodCall("GetEnvelopeViaSubPath", FullFilename).DanReturn("AXif.Dynamics.CustomerOut.Envelope")
+	
+	set MessageManager = ##class(AXimpl.MessageManager).%New(RequestGeneratorConfigStub)
 	#dim Message As %CacheString = MessageManager.Import(FullFilename)
 	
 	do $$$AssertEquals(Message.Body.MessageParts.Fault.Code,"DuplicateMessage")