Index: AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42286 -r42385
--- AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42286)
+++ 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>
@@ -28,8 +34,11 @@
 
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
-<Implementation><![CDATA[	quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
+<ReturnType>%CacheString</ReturnType>
+<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>