Index: AXimpl/EventRaiser.cls.xml
===================================================================
diff -u -r42275 -r42336
--- AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42275)
+++ AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42336)
@@ -20,7 +20,7 @@
 </Method>
 
 <Method name="RaiseRequestSendEvent">
-<FormalSpec>Command:%String,Id:%String,Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<FormalSpec>Command:%String,Id:%String,Message:%CacheString,MessageStream:%GlobalCharacterStream</FormalSpec>
 <Implementation><![CDATA[
 	set EventData = ##class(AX.AifMessage.event.AifRequestSendEventData).%New()
 	
@@ -35,7 +35,7 @@
 </Method>
 
 <Method name="RaiseResponseReceivedEvent">
-<FormalSpec>Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<FormalSpec>Message:%CacheString,MessageStream:%GlobalCharacterStream</FormalSpec>
 <Implementation><![CDATA[
 	set EventData = ##class(AX.AifMessage.event.AifResponseReceivedEventData).%New()
 	set EventData.Message = Message
Index: vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35255 -r42336
--- vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35255)
+++ vhTest/Mock/AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 42336)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.AX.AifMessage.MessageRepository">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AX.AifMessage.MessageRepository,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -31,7 +30,7 @@
 
 <Method name="GeefViaRequestGuid">
 <FormalSpec>Guid:%String</FormalSpec>
-<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefViaRequestGuid",Guid)
 ]]></Implementation>
 </Method>
Index: AXdata/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r36450 -r42336
--- AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 36450)
+++ AXdata/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 42336)
@@ -10,7 +10,7 @@
 
 <Method name="GeefViaRequestGuid">
 <FormalSpec>Guid:%String</FormalSpec>
-<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit ..GeefViaFilter("Request_Guid = ?",$listbuild(Guid))
 ]]></Implementation>
 </Method>
@@ -24,7 +24,7 @@
 
 <Method name="GeefViaCommandAndSubjectId">
 <FormalSpec>Command:%String,SubjectId:%String</FormalSpec>
-<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit ..GeefViaFilter("SubjectId = ? AND Command = ?",$listbuild(SubjectId,Command))
 ]]></Implementation>
 </Method>
Index: AXimpl/Generator.cls.xml
===================================================================
diff -u -r42275 -r42336
--- AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 42275)
+++ AXimpl/Generator.cls.xml	(.../Generator.cls.xml)	(revision 42336)
@@ -94,7 +94,7 @@
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
 <Implementation><![CDATA[
 	try {
-		#dim RequestEnvelope As AXaif.Message.Envelope = ..RequestComposer.Compose(Request)
+		#dim RequestEnvelope As %CacheString = ..RequestComposer.Compose(Request)
 	
 		#dim Path As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_AIF_RequestPath"),..RequestGeneratorConfig.GetSubPath(Request))
 		#dim Filename As %String = $replace(Request.Command,"/","-")_" "_$replace(Request.SubjectId,"|","")_" "_" - "_RequestEnvelope.Header.Company_" - "_##class(TECH.Files).GeefCurrentTimeStamp()_".xml"
Index: vhTest/Mock/AXimpl/EventRaiser.cls.xml
===================================================================
diff -u -r42280 -r42336
--- vhTest/Mock/AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42280)
+++ vhTest/Mock/AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42336)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.AXimpl.EventRaiser">
 <Description>
 Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
-Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
-Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>AXimpl.EventRaiser,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -16,13 +15,13 @@
 </Method>
 
 <Method name="RaiseRequestSendEvent">
-<FormalSpec>Command:%String,Id:%String,Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<FormalSpec>Command:%String,Id:%String,Message:%CacheString,MessageStream:%GlobalCharacterStream</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("RaiseRequestSendEvent",Command,Id,Message,MessageStream)
 ]]></Implementation>
 </Method>
 
 <Method name="RaiseResponseReceivedEvent">
-<FormalSpec>Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<FormalSpec>Message:%CacheString,MessageStream:%GlobalCharacterStream</FormalSpec>
 <Implementation><![CDATA[	do ..VerwerkMethodCall("RaiseResponseReceivedEvent",Message,MessageStream)
 ]]></Implementation>
 </Method>
Index: AX/AifMessage/MessageRepository.cls.xml
===================================================================
diff -u -r35255 -r42336
--- AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 35255)
+++ AX/AifMessage/MessageRepository.cls.xml	(.../MessageRepository.cls.xml)	(revision 42336)
@@ -34,7 +34,7 @@
 <Method name="GeefViaRequestGuid">
 <Abstract>1</Abstract>
 <FormalSpec>Guid:%String</FormalSpec>
-<ReturnType>AXdata.AifMessage.Message</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 </Method>
 </Class>
 
Index: AXimpl/Dynamics/CustomerUpsertOut/Exception/CustomerUpdatePart2UnknownFaultCodeException.cls.xml
===================================================================
diff -u -r42275 -r42336
--- AXimpl/Dynamics/CustomerUpsertOut/Exception/CustomerUpdatePart2UnknownFaultCodeException.cls.xml	(.../CustomerUpdatePart2UnknownFaultCodeException.cls.xml)	(revision 42275)
+++ AXimpl/Dynamics/CustomerUpsertOut/Exception/CustomerUpdatePart2UnknownFaultCodeException.cls.xml	(.../CustomerUpdatePart2UnknownFaultCodeException.cls.xml)	(revision 42336)
@@ -4,7 +4,7 @@
 <Super>TECH.Exceptions.Exception</Super>
 
 <Property name="Envelope">
-<Type>AXaif.Message.Envelope</Type>
+<Type>%CacheString</Type>
 <Private>1</Private>
 </Property>
 
@@ -14,7 +14,7 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ResponseError:AXimpl.ResponseError,Envelope:AXaif.Message.Envelope</FormalSpec>
+<FormalSpec>ResponseError:AXimpl.ResponseError,Envelope:%CacheString</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
Index: AXimpl/Dynamics/CustomerUpsertOut/EventHandler/CustomerUpdaterPart2.cls.xml
===================================================================
diff -u -r42275 -r42336
--- AXimpl/Dynamics/CustomerUpsertOut/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 42275)
+++ AXimpl/Dynamics/CustomerUpsertOut/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 42336)
@@ -40,7 +40,7 @@
 </Method>
 
 <Method name="Verwerk">
-<FormalSpec>Envelope:AXaif.Message.Envelope</FormalSpec>
+<FormalSpec>Envelope:%CacheString</FormalSpec>
 <Implementation><![CDATA[
 	#dim AifMessage As AXdata.AifMessage.Message = ..MessageRepository.GeefViaRequestGuid(Envelope.Header.RequestMessageId)
 	
@@ -60,7 +60,7 @@
 </Method>
 
 <Method name="RaiseCustomerUpdatePart2UnknownFaultCodeException">
-<FormalSpec>Error:AXimpl.ResponseError,Envelope:AXaif.Message.Envelope</FormalSpec>
+<FormalSpec>Error:AXimpl.ResponseError,Envelope:%CacheString</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 	set Exception = ##class(AXimpl.Dynamics.CustomerUpsertOut.Exception.CustomerUpdatePart2UnknownFaultCodeException).%New(Error,Envelope)