Index: AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42385 -r50889
--- AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42385)
+++ AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 50889)
@@ -9,36 +9,43 @@
 </Property>
 
 <Property name="RequestGeneratorConfig">
-<Type>AXimpl.RequestGeneratorConfig</Type>
+<Type>AXimpl.ConfigOut</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="MessageIdFormatter">
+<Type>AXimpl.MessageIdFormatter</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>RequestGeneratorConfig:AXimpl.RequestGeneratorConfig</FormalSpec>
+<FormalSpec>RequestGeneratorConfig:AXimpl.ConfigOut="",MessageIdFormatter:AXimpl.MessageIdFormatter=""</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())
+	Set ..XmlCorrelater = ##class(TECH.XMLCorrelater).%New()
+	Set ..RequestGeneratorConfig = $$$Inject(RequestGeneratorConfig, ##class(AXimpl.ConfigOut).%New())
+	Set ..MessageIdFormatter = $$$Inject(MessageIdFormatter, ##class(AXimpl.MessageIdFormatter).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="GenerateID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	quit "{"_$system.Util.CreateGUID()_"}"
+<Implementation><![CDATA[	Quit ..MessageIdFormatter.Format($system.Util.CreateGUID())
 ]]></Implementation>
 </Method>
 
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <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"),""))
+	#dim KlasseNaam As %String = ..RequestGeneratorConfig.GetResponseEnvelope(##class(TECH.StringUtils).Replace(FullFilename,##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_OUT_RequestPath"),""))
 
-	quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,KlasseNaam,"Envelope")
+	Quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,KlasseNaam,"Envelope")
 ]]></Implementation>
 </Method>
 </Class>