Index: AXimpl/AifMessage/RequestComposer.cls.xml
===================================================================
diff -u -r35607 -r37932
--- AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 35607)
+++ AXimpl/AifMessage/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 37932)
@@ -33,15 +33,13 @@
 </Method>
 
 <Method name="Compose">
-<FormalSpec>Request:AXimpl.AifMessage.Request</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
+<FormalSpec>Request:%CacheString</FormalSpec>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	set Envelope = ##class(AXaif.Message.Envelope).%New()
-	set Envelope.Header = ##class(AXaif.Message.Header).%New()
+	#dim Envelope As %CacheString = $$$If($classname(Request)["Aif",##class(AXaif.Message.Envelope).%New(), ##class(AXBizTalk.Crm.Customer.Envelope).%New())
 	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
 	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
 	set Envelope.Header.Action = ..RequestGeneratorConfig.GetAction(Request)
-	set Envelope.Body = ##class(AXaif.Message.Body).%New()
 	set Envelope.Body.MessageParts = ..RequestGeneratorConfig.GetConverter(Request).Convert(Request)
 	quit Envelope
 ]]></Implementation>