Index: vhTest/Fake/AXimpl/EventRaiser.cls.xml
===================================================================
diff -u -r42281 -r42340
--- vhTest/Fake/AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42281)
+++ vhTest/Fake/AXimpl/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 42340)
@@ -8,7 +8,7 @@
 <Super>AXimpl.EventRaiser</Super>
 
 <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[]]></Implementation>
 </Method>
 
@@ -18,7 +18,7 @@
 </Method>
 
 <Method name="RaiseResponseReceivedEvent">
-<FormalSpec>Message:AXaif.Message.Envelope,MessageStream:%GlobalCharacterStream</FormalSpec>
+<FormalSpec>Message:%CacheString,MessageStream:%GlobalCharacterStream</FormalSpec>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
Index: AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42286 -r42340
--- AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42286)
+++ AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42340)
@@ -28,7 +28,7 @@
 
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit ..XmlCorrelater.GeefObjectVanBestand(FullFilename,##class(AXaif.Message.Envelope).%ClassName(1),"Envelope")
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42127 -r42340
--- vhTest/Fake/AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42127)
+++ vhTest/Fake/AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42340)
@@ -9,7 +9,7 @@
 
 <Method name="Compose">
 <FormalSpec>Request:AXimpl.Request</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42288 -r42340
--- vhTest/Fake/AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42288)
+++ vhTest/Fake/AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42340)
@@ -15,7 +15,7 @@
 
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
Index: vhTest/Mock/AXimpl/MessageManager.cls.xml
===================================================================
diff -u -r42289 -r42340
--- vhTest/Mock/AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42289)
+++ vhTest/Mock/AXimpl/MessageManager.cls.xml	(.../MessageManager.cls.xml)	(revision 42340)
@@ -3,8 +3,7 @@
 <Class name="vhTest.Mock.AXimpl.MessageManager">
 <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.MessageManager,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
@@ -17,7 +16,7 @@
 
 <Method name="Import">
 <FormalSpec>FullFilename:%String</FormalSpec>
-<ReturnType>AXaif.Message.Envelope</ReturnType>
+<ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("Import",FullFilename)
 ]]></Implementation>
 </Method>