Index: DOM/AKP/impl/DataM/DataMToelevering.cls.xml
===================================================================
diff -u -r53196 -r53220
--- DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 53196)
+++ DOM/AKP/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 53220)
@@ -238,11 +238,12 @@
 	#dim KlantID As DOM.VKP.VanHoeckeKlantID = ""
 	#dim OrderID As %String = ..GeefOrderID()
 	if $length(OrderID) {
-		If $$$Not(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatOrder(OrderID)) {
+		#dim LocalOrderApi As DOM.VKP.OrderAPI = $$$LazyLoad(..OrderApi, ##class(DOM.DomeinContext).Instance().GeefOrderAPI())
+		If $$$Not(LocalOrderApi.BestaatOrder(OrderID)) {
 			;#dim FixDataMsg As %String = $$$CRLF_"Fix data via "_$$$CRLF_"Do ##class(vhPowerTools.DOM.AKP.ToeleveringTools).VerwijderOrderVerwijzingIndienOrderNietBestaat("_..GeefID()_")"
 			Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Foutieve orderverwijzing in Toelevering "_..GeefID()_": order "_OrderID_" bestaat niet!"))
 					}
-		set KlantID = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderID).GeefKlantID()
+		set KlantID = LocalOrderApi.GeefOrder(OrderID).GeefKlantID()
 	}
 	quit KlantID
 ]]></Implementation>
@@ -288,15 +289,15 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	Try {
-		//If $$$HasLength(..GeefOorsprongKetting()) {
+		If $$$HasLength(..GeefOorsprongKetting()) {
 			Set Personality = ..EindPersonalityBepaler.GeefEindPersonality(..GeefOorsprongKetting())
-		/*} Else {
+		} Else {
 			If ..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
 				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
 			} Else {
 				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
 			}
-		}*/
+		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
Index: vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r53196 -r53220
--- vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53196)
+++ vhUnitTest/DOM/AKP/impl/DataM/DataMToelevering/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53220)
@@ -37,7 +37,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: Geen OorsprongKetting aanwezig -&gt; EindPersonality is VanHoecke">
+<Method name="Test: Geen OorsprongKetting aanwezig -&gt; EindPersonality is VanHoecke">
 <Implementation><![CDATA[
 	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
 	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)
@@ -55,7 +55,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: Geen OorsprongKetting aanwezig, maar klant is HFLNL: HFLNL als EindPersonality nemen">
+<Method name="Test: Geen OorsprongKetting aanwezig, maar klant is HFLNL: HFLNL als EindPersonality nemen">
 <Implementation><![CDATA[
 	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
 	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)