Index: WS/Halux/PPS/Verpakking/TAXFlatpackV1Controle/ControleService.cls.xml
===================================================================
diff -u -r35721 -r35722
--- WS/Halux/PPS/Verpakking/TAXFlatpackV1Controle/ControleService.cls.xml	(.../ControleService.cls.xml)	(revision 35721)
+++ WS/Halux/PPS/Verpakking/TAXFlatpackV1Controle/ControleService.cls.xml	(.../ControleService.cls.xml)	(revision 35722)
@@ -7,13 +7,31 @@
 <Default>ControleService</Default>
 </Parameter>
 
+<Property name="ObjectAPI">
+<Type>TECH.Object.ObjectAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ObjectAPI = ##class(TECH.Context).Instance().GeefObjectAPI()
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="GeefMetaData">
 <ReturnType>WS.Halux.PPS.Verpakking.TAXFlatpackV1Controle.MetaData</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#dim ServiceKlasseNaam As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("Verpakking_ControleService_GeefMetaData")
-
-	Xecute "Quit ##class(" _ ServiceKlasseNaam _ ").%New().GeefMetaData()"
+	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService = ..ObjectAPI.New(ServiceKlasseNaam)
+	
+	Quit Service.GeefMetaData()
 	;Quit ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService).%New().GeefMetaData()
 ]]></Implementation>
 </Method>
@@ -26,8 +44,9 @@
 	$$$chkRequiredParameter(Id)
 	
 	#dim ServiceKlasseNaam As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("Verpakking_ControleService_GeefData")
-
-	Xecute "Quit ##class(" _ ServiceKlasseNaam _ ").%New().GeefData(" _ Id _ ")"
+	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService = ..ObjectAPI.New(ServiceKlasseNaam)
+	
+	Quit Service.GeefData(Id)
 	;Quit ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService).%New().GeefData(Id)
 ]]></Implementation>
 </Method>
@@ -39,8 +58,9 @@
 	$$$chkRequiredParameter(Data)
 	
 	#dim ServiceKlasseNaam As TECH.String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("Verpakking_ControleService_Afgehandeld")
-
-	Xecute "Quit ##class(" _ ServiceKlasseNaam _ ").%New().Afgehandeld(" _ Data _ ")"
+	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService = ..ObjectAPI.New(ServiceKlasseNaam)
+	
+	Quit Service.Afgehandeld(Data)
 	;Quit ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.ControleService).%New().Afgehandeld(Data)
 ]]></Implementation>
 </Method>