Index: APPS/OV/impl/GLSTrackAndTrace.cls.xml
===================================================================
diff -u -r40503 -r40512
--- APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40503)
+++ APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40512)
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.OV.impl.GLSTrackAndTrace">
-<IncludeCode>vhLib.Macro</IncludeCode>
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Parameter name="ParcelLogin">
 <Type>%String</Type>
@@ -24,6 +23,29 @@
 <Default>fgc846</Default>
 </Parameter>
 
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TransportApi">
+<Type>DOM.TRANSP.TransportAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
+	set ..TransportApi = ##class(DOM.DomeinContext).Instance().GeefTransportAPI() 
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefPrivateTrackAndTraceURL">
 <FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -43,14 +65,11 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-
-	#dim CommunicatieService As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgium())
-	#dim DienstBepaler As APPS.TRANSP.GLS.GLSv1.DienstBepaler = CommunicatieService.GeefDienstBepaler()
+	#dim DienstBepaler As APPS.TRANSP.GLS.GLSv1.DienstBepaler = ..CommunicatieServiceLocator.GeefDienstBepaler()
 	
 	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = DienstBepaler.GeefDienst(..GeefVerzendWijze(Levering))
 	
 	#dim URL As %String = ""
-	Set GLSTools = ##class(APPS.OV.impl.GLSTools).%New()
 	If Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
 		set URL = ..GeefFreightTrackAndTraceURL(Levering,Taal)
 	} elseif  Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Parcel() {
@@ -118,7 +137,7 @@
 	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(Levering.GeefDistributeurDataIDs())
 	While DistributeurDataIDIt.HasNext(){
 		#dim DistributeurDataID As %String = DistributeurDataIDIt.Next()
-		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefDistributeurData(DistributeurDataID)
+		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ..TransportApi.GeefDistributeurData(DistributeurDataID)
 		Do Referenties.Insert(DistributeurData.UnitID)
 	}
 	Quit Referenties
@@ -134,7 +153,7 @@
 	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(Levering.GeefDistributeurDataIDs())
 	While DistributeurDataIDIt.HasNext(){
 		#dim DistributeurDataID As %String = DistributeurDataIDIt.Next()
-		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefDistributeurData(DistributeurDataID)
+		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ..TransportApi.GeefDistributeurData(DistributeurDataID)
 		Do TrackAndTraceIDs.Insert(DistributeurData.TrackAndTraceID)
 	}
 	Quit TrackAndTraceIDs
@@ -150,7 +169,7 @@
 	Set DistributeurDataIDIt = ##class(TECH.ListIterator).%New(Levering.GeefDistributeurDataIDs())
 	If DistributeurDataIDIt.HasNext() {
 		#dim DistributeurDataID As %String = DistributeurDataIDIt.Next()
-		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefDistributeurData(DistributeurDataID)
+		#dim DistributeurData As APPS.TRANSP.GLS.data.VerzendData = ..TransportApi.GeefDistributeurData(DistributeurDataID)
 		set VerzendWijze = DistributeurData.VerzendWijze
 	}
 	Quit VerzendWijze
Index: APPS/OV/impl/TrackAndTraceService.cls.xml
===================================================================
diff -u -r29059 -r40512
--- APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 29059)
+++ APPS/OV/impl/TrackAndTraceService.cls.xml	(.../TrackAndTraceService.cls.xml)	(revision 40512)
@@ -2,10 +2,37 @@
 <Export generator="Cache" version="24">
 <Class name="APPS.OV.impl.TrackAndTraceService">
 <ClassType/>
-<IncludeCode>vhLib.Macro</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject,APPS.OV.TrackAndTraceService</Super>
+<Super>TECH.RegisteredObject,APPS.OV.TrackAndTraceService</Super>
 
+<Property name="OrderApi">
+<Type>DOM.VKP.OrderAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="TransportApi">
+<Type>DOM.TRANSP.TransportAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijApi">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..OrderApi = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+	set ..TransportApi = ##class(DOM.DomeinContext).Instance().GeefTransportAPI()
+	set ..PartijApi = ##class(DOM.DomeinContext).Instance().GeefPartijAPI()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefPrivateTrackAndTraceURL">
 <FormalSpec>BonID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -48,12 +75,9 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim IsTransportViaGLS  As %Boolean = 0
-	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
-	#dim TransportAPI  AS DOM.TRANSP.TransportAPI = ##class(DOM.DomeinContext).Instance().GeefTransportAPI()
 	
-	#dim Bon As DOM.VKP.Bon = OrderAPI.GeefBon(BonID)
-	
-	#dim Rit As DOM.TRANSP.Rit = ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefRit(Bon.GeefRitID())
+	#dim Bon As DOM.VKP.Bon = ..OrderApi.GeefBon(BonID)
+	#dim Rit As DOM.TRANSP.Rit = ..TransportApi.GeefRit(Bon.GeefRitID())
 	Set IsTransportViaGLS = (Rit.GeefTransporteur() = ##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumDistribution())
 	
 	Quit IsTransportViaGLS
@@ -65,10 +89,8 @@
 <Private>1</Private>
 <ReturnType>DOM.TRANSP.Levering</ReturnType>
 <Implementation><![CDATA[
-	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
-	#dim TransportAPI  AS DOM.TRANSP.TransportAPI = ##class(DOM.DomeinContext).Instance().GeefTransportAPI()	
-	#dim Bon As DOM.VKP.Bon = OrderAPI.GeefBon(BonID)
-	Quit ##class(DOM.DomeinContext).Instance().GeefTransportAPI().GeefLevering(Bon.GeefRitID(),Bon.GeefLeveringID())
+	#dim Bon As DOM.VKP.Bon = ..OrderApi.GeefBon(BonID)
+	Quit ..TransportApi.GeefLevering(Bon.GeefRitID(),Bon.GeefLeveringID())
 ]]></Implementation>
 </Method>
 
@@ -77,10 +99,8 @@
 <Private>1</Private>
 <ReturnType>DOM.enu.Taal</ReturnType>
 <Implementation><![CDATA[
-	
-	#dim OrderAPI As DOM.VKP.OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()	
-	#dim Bon As DOM.VKP.Bon = OrderAPI.GeefBon(BonID)	
-	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(Bon.GeefKlantID())
+	#dim Bon As DOM.VKP.Bon = ..OrderApi.GeefBon(BonID)	
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(Bon.GeefKlantID())
 	Quit Partij.GeefTaal()
 ]]></Implementation>
 </Method>