Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42286 -r42334
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42286)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42334)
@@ -36,7 +36,7 @@
 <FormalSpec>Request:%CacheString</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim Envelope As %CacheString = $$$If($classname(Request)["AXimpl.Request",##class(AXaif.Message.Envelope).%New(), ##class(AXif.Crm.CustomerOut.Envelope).%New())
+	#dim Envelope As %CacheString = ..RequestGeneratorConfig.GetEnvelope(Request)
 	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
 	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
 	set Envelope.Header.Action = ..RequestGeneratorConfig.GetAction(Request)