Index: APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml
===================================================================
diff -u -r40533 -r40633
--- APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40533)
+++ APPS/TRANSP/GLS/GLSv1/Bericht/impl/RequestDataBouwer.cls.xml	(.../RequestDataBouwer.cls.xml)	(revision 40633)
@@ -3,18 +3,25 @@
 <Class name="APPS.TRANSP.GLS.GLSv1.Bericht.impl.RequestDataBouwer">
 <Super>TECH.RegisteredObject,APPS.TRANSP.GLS.GLSv1.Bericht.RequestDataBouwer</Super>
 
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="T854SuffixBepaler">
 <Type>APPS.TRANSP.GLS.GLSv1.Bericht.impl.T854SuffixBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..T854SuffixBepaler = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.impl.T854SuffixBepaler).%New()
+	Set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -89,8 +96,7 @@
 <FormalSpec>VerzendData:APPS.TRANSP.GLS.dto.VerzendData,IsLaatsteUnit:%Boolean=0</FormalSpec>
 <ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.ParcelReleaseRequest</ReturnType>
 <Implementation><![CDATA[
-	#dim CommunicatieServiceLocator As APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator = ##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New()
-	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
+	#dim Dienst As APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(VerzendData.VerzendWijze)
 	
 	#dim ReleaseRequest As APPS.TRANSP.GLS.GLSv1.Bericht.dto.ReleaseRequest
 	if Dienst = ##class(APPS.TRANSP.GLS.GLSv1.enu.Dienst).Freight() {
@@ -356,9 +362,7 @@
 <FormalSpec>VerzendWijze:APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[
-	#dim CommunicatieService As APPS.TRANSP.GLS.impl.CommunicatieService = ##class(APPS.ApplicatieContext).Instance().GeefTransportAPI().GeefCommunicatieService(##class(DOM.TRANSP.enu.Transporteur).GLSBelgiumDistribution())
-	quit CommunicatieService.GeefUnitIDBepaler().GeefUnitID(VerzendWijze)
+<Implementation><![CDATA[	quit ..CommunicatieServiceLocator.GeefUnitIDBepaler().GeefUnitID(VerzendWijze)
 ]]></Implementation>
 </Method>