Index: APPS/TRANSP/GLS/impl/EtiketBouwerResponseVisitor.cls.xml
===================================================================
diff -u -r40355 -r40366
--- APPS/TRANSP/GLS/impl/EtiketBouwerResponseVisitor.cls.xml	(.../EtiketBouwerResponseVisitor.cls.xml)	(revision 40355)
+++ APPS/TRANSP/GLS/impl/EtiketBouwerResponseVisitor.cls.xml	(.../EtiketBouwerResponseVisitor.cls.xml)	(revision 40366)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.EtiketBouwerResponseVisitor">
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSv1.ResponseVisitor</Super>
 
 <Property name="Response">
 <Type>APPS.TRANSP.GLS.Bericht.dto.Response</Type>
Index: APPS/OV/impl/GLSTrackAndTrace.cls.xml
===================================================================
diff -u -r40358 -r40366
--- APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40358)
+++ APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40366)
@@ -45,7 +45,7 @@
 <Implementation><![CDATA[
 
 	#dim CommunicatieService As APPS.TRANSP.GLS.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
-	#dim DienstBepaler As APPS.TRANSP.GLS.DienstBepaler = CommunicatieService.GeefDienstBepaler()
+	#dim DienstBepaler As APPS.TRANSP.GLS.GLSv1.DienstBepaler = CommunicatieService.GeefDienstBepaler()
 	
 	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = DienstBepaler.GeefDienst(..GeefVerzendWijze(Levering))
 	
Index: APPS/TRANSP/GLS/Bericht/dto/ParcelResponse.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/Bericht/dto/ParcelResponse.cls.xml	(.../ParcelResponse.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/Bericht/dto/ParcelResponse.cls.xml	(.../ParcelResponse.cls.xml)	(revision 40366)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.GLS.Bericht.dto.ParcelRequest,APPS.TRANSP.GLS.Bericht.dto.ParcelErrorResponse</Super>
 
 <Method name="Accept">
-<FormalSpec>Visitor:APPS.TRANSP.GLS.ResponseVisitor</FormalSpec>
+<FormalSpec>Visitor:APPS.TRANSP.GLS.GLSv1.ResponseVisitor</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit Visitor.VerwerkParcelResponse(##this)
 ]]></Implementation>
Index: vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml
===================================================================
diff -u -r29059 -r40366
--- vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 29059)
+++ vhUnitTest/APPS/TRANSP/GLS/Bericht/RequestDataBouwer/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40366)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.GLS.impl.CommunicatieService</Super>
 
 <Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
 <Implementation><![CDATA[	quit ##class(vhUnitTest.APPS.TRANSP.GLS.Bericht.RequestDataBouwer.UnitIDBepalerMock).%New()
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/CommunicatieService.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40366)
@@ -6,13 +6,13 @@
 
 <Method name="GeefUnitIDBepaler">
 <Abstract>1</Abstract>
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="GeefDienstBepaler">
 <Abstract>1</Abstract>
-<ReturnType>APPS.TRANSP.GLS.DienstBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
FishEye: Tag 40366 refers to a dead (removed) revision in file `vhTest/Mock/APPS/TRANSP/GLS/UnitIDBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
FishEye: Tag 40355 refers to a dead (removed) revision in file `vhTest/Mock/APPS/TRANSP/GLS/DienstBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml
===================================================================
diff -u -r29059 -r40366
--- vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 29059)
+++ vhTest/Mock/APPS/TRANSP/GLS/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40366)
@@ -3,13 +3,14 @@
 <Class name="vhTest.Mock.APPS.TRANSP.GLS.CommunicatieService">
 <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</Description>
+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>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>APPS.TRANSP.GLS.CommunicatieService,Tools.Mock.MockClassBase</Super>
 <Inheritance>right</Inheritance>
 
 <Method name="GeefDienstBepaler">
-<ReturnType>APPS.TRANSP.GLS.DienstBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefDienstBepaler")
 ]]></Implementation>
 </Method>
@@ -21,7 +22,7 @@
 </Method>
 
 <Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefUnitIDBepaler")
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/Bericht/dto/FreightResponse.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/Bericht/dto/FreightResponse.cls.xml	(.../FreightResponse.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/Bericht/dto/FreightResponse.cls.xml	(.../FreightResponse.cls.xml)	(revision 40366)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.GLS.Bericht.dto.FreightRequest,APPS.TRANSP.GLS.Bericht.dto.FreightErrorResponse</Super>
 
 <Method name="Accept">
-<FormalSpec>Visitor:APPS.TRANSP.GLS.ResponseVisitor</FormalSpec>
+<FormalSpec>Visitor:APPS.TRANSP.GLS.GLSv1.ResponseVisitor</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Quit Visitor.VerwerkFreightResponse(##this)
 ]]></Implementation>
@@ -195,8 +195,6 @@
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <Data name="RequestState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>T050</Value>
 </Value>
Index: APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40366)
@@ -108,13 +108,13 @@
 </Method>
 
 <Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
 <Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.impl.UnitIDBepaler).%New()
 ]]></Implementation>
 </Method>
 
 <Method name="GeefDienstBepaler">
-<ReturnType>APPS.TRANSP.GLS.DienstBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.DienstBepaler</ReturnType>
 <Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.impl.DienstBepaler).%New()
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/GLSv1/UnitIDBepaler.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/GLSv1/UnitIDBepaler.cls.xml	(.../UnitIDBepaler.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/GLSv1/UnitIDBepaler.cls.xml	(.../GLSv1/UnitIdBepaler.cls.xml)	(revision 40366)
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="APPS.TRANSP.GLS.UnitIDBepaler">
-<Abstract>1</Abstract>
+<Class name="APPS.TRANSP.GLS.GLSv1.UnitIdBepaler">
 <Super>TECH.Interface</Super>
 
 <Method name="GeefUnitID">
 <Abstract>1</Abstract>
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
 <ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
FishEye: Tag 40366 refers to a dead (removed) revision in file `APPS/TRANSP/GLS/UnitIDBepaler.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/TRANSP/GLS/GLSv1/ResponseVisitor.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/GLSv1/ResponseVisitor.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/GLSv1/ResponseVisitor.cls.xml	(revision 40366)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.GLSv1.ResponseVisitor">
+<Abstract>1</Abstract>
+
+<Method name="VerwerkParcelResponse">
+<Abstract>1</Abstract>
+<FormalSpec>ParselResponse:APPS.TRANSP.GLS.Bericht.dto.ParcelResponse</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
+<Method name="VerwerkFreightResponse">
+<Abstract>1</Abstract>
+<FormalSpec>FreightResponse:APPS.TRANSP.GLS.Bericht.dto.FreightResponse</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/TRANSP/GLS/Bericht/dto/Response.cls.xml
===================================================================
diff -u -r29059 -r40366
--- APPS/TRANSP/GLS/Bericht/dto/Response.cls.xml	(.../Response.cls.xml)	(revision 29059)
+++ APPS/TRANSP/GLS/Bericht/dto/Response.cls.xml	(.../Response.cls.xml)	(revision 40366)
@@ -118,8 +118,9 @@
 
 <Method name="Accept">
 <Abstract>1</Abstract>
-<FormalSpec>Visitor:APPS.TRANSP.GLS.ResponseVisitor</FormalSpec>
+<FormalSpec>Visitor:APPS.TRANSP.GLS.GLSv1.ResponseVisitor</FormalSpec>
 <ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Storage name="Default">
Index: APPS/TRANSP/GLS/impl/UnitIDBepaler.cls.xml
===================================================================
diff -u -r30995 -r40366
--- APPS/TRANSP/GLS/impl/UnitIDBepaler.cls.xml	(.../UnitIDBepaler.cls.xml)	(revision 30995)
+++ APPS/TRANSP/GLS/impl/UnitIDBepaler.cls.xml	(.../UnitIDBepaler.cls.xml)	(revision 40366)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.TRANSP.GLS.impl.UnitIDBepaler">
-<Super>TECH.RegisteredObject,APPS.TRANSP.GLS.UnitIDBepaler</Super>
+<Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</Super>
 
 <Parameter name="WaarschuwingVanafProcentOpgebruikt">
 <Type>%Decimal</Type>
Index: APPS/TRANSP/GLS/GLSv1/DienstBepaler.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/GLSv1/DienstBepaler.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/GLSv1/DienstBepaler.cls.xml	(revision 40366)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.GLSv1.DienstBepaler">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="GeefDienst">
+<Abstract>1</Abstract>
+<FormalSpec>VerzendWijze:APPS.TRANSP.GLS.Bericht.enu.VerzendWijze</FormalSpec>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.enu.Dienst</ReturnType>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml
===================================================================
diff -u -r29059 -r40366
--- vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 29059)
+++ vhTest/Integratie/Magazijn/Transport/GLS/BerichtEnEtiket/CommunicatieServiceMock.cls.xml	(.../CommunicatieServiceMock.cls.xml)	(revision 40366)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.GLS.impl.CommunicatieService</Super>
 
 <Method name="GeefUnitIDBepaler">
-<ReturnType>APPS.TRANSP.GLS.UnitIDBepaler</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.UnitIdBepaler</ReturnType>
 <Implementation><![CDATA[	quit ##class(vhTest.Integratie.Magazijn.Transport.GLS.BerichtEnEtiket.UnitIDBepalerMock).%New()
 ]]></Implementation>
 </Method>