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>