Index: APPS/OV/impl/GLSTrackAndTrace.cls.xml
===================================================================
diff -u -r40892 -r40946
--- APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40892)
+++ APPS/OV/impl/GLSTrackAndTrace.cls.xml	(.../GLSTrackAndTrace.cls.xml)	(revision 40946)
@@ -28,20 +28,26 @@
 <Private>1</Private>
 </Property>
 
+<Property name="GLSTools">
+<Type>APPS.OV.impl.GLSTools</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>
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator,GLSTools:APPS.OV.impl.GLSTools</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() 
+	Set ..GLSTools = $$$Inject(GLSTools,##class(APPS.OV.impl.GLSTools).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -87,16 +93,14 @@
 <FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	set GLSTools = ##class(APPS.OV.impl.GLSTools).%New()
-
 	#dim WebPagina As %String = "http://services.gls-belgium.com/pgm/wwwdspenvc.pgm?REQUEST="
 	#dim TeEncrypteren As %String = "langue="_Taal
 	Set TeEncrypteren = TeEncrypteren_"&userid="_..#FreightUserID
 	Set TeEncrypteren = TeEncrypteren_"&passwd="_..#FreightPaswoord
 	Set TeEncrypteren = TeEncrypteren_"&country=bd"
 	Set TeEncrypteren = TeEncrypteren_"&label1="_..GeefTrackAndTraceID(Levering)
 	Set TeEncrypteren = TeEncrypteren_"&sndcon="
-	#dim URL As %String = WebPagina_GLSTools.GeefEncodedWaarde(TeEncrypteren)
+	#dim URL As %String = WebPagina _ ..GLSTools.GeefEncodedWaarde(TeEncrypteren)
 	
 	quit URL
 ]]></Implementation>
@@ -106,9 +110,7 @@
 <FormalSpec>Levering:DOM.TRANSP.Levering,Taal:DOM.enu.Taal</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	set GLSTools = ##class(APPS.OV.impl.GLSTools).%New()
-
-	#dim TaalGLS As %String = GLSTools.GeefTaalVoorGLS(Taal)
+	#dim TaalGLS As %String = ..GLSTools.GeefTaalVoorGLS(Taal)
 	#dim WebPagina As %String = "http://www.gls-group.eu/276-I-PORTAL-WEB/dLink.jsp"
 	#dim ReferentiesInPieces As %String = ##class(TECH.ListUtils).ListToPieces(..GeefReferenties(Levering),",")
 	#dim TeEncrypteren As %String = ..#ParcelLogin_ReferentiesInPieces_..#ParcelLogin_..#ParcelURLPaswoord