Index: DOM/OV/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r1585 -r2423
--- DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 1585)
+++ DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 2423)
@@ -102,7 +102,7 @@
 	Set VerzendWijze = ""
 	If (AfleverAdres '= "")
 	{
-		Set VerzendWijze = ##class(DOM.VKP.VerzendWijze).%New(..KlantNr, ..GeefVerzendingWijze(), AfleverAdres.GeefLandCode(), AfleverAdres.GeefPostcode(), ..OrderNr)
+		Set VerzendWijze = ##class(DOM.VKP.VerzendWijze).%New(..KlantNr, ..GeefVerzendingWijze(), AfleverAdres.GeefLand().GeefCode(), AfleverAdres.GeefPostcode(), ..OrderNr)
 	}
 	Quit VerzendWijze
 ]]></Implementation>
Index: APPS/HR/ProTime/Facade.cls.xml
===================================================================
diff -u -r2217 -r2423
--- APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2217)
+++ APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2423)
@@ -230,13 +230,13 @@
 	($$$UCase(KlantAdres.GeefStraat()) '= $$$UCase(dtoKlantAdres.GeefStraat())) || 
 	(KlantAdres.GeefPostcode() '= dtoKlantAdres.GeefPostcode()) || 
 	($$$UCase(KlantAdres.GeefGemeente()) '= $$$UCase(dtoKlantAdres.GeefGemeente())) ||
-	(KlantAdres.GeefLandNr() '= dtoKlantAdres.GeefLandNr()))
+	(KlantAdres.GeefLand().GeefID() '= dtoKlantAdres.GeefLand().GeefID()))
 	
-	If ((dtoKlantAdres.GeefLandNr() = "") || (dtoKlantAdres.GeefGemeente() = "") ||
+	If ((dtoKlantAdres.GeefLand().GeefID() = "") || (dtoKlantAdres.GeefGemeente() = "") ||
 	(dtoKlantAdres.GeefPostcode() = "") || (dtoKlantAdres.GeefStraat() = "")){
 		Set Gewijzigd = -1
 	}
-	If ((dtoKlantAdres.GeefLandNr() = " ") || (dtoKlantAdres.GeefGemeente() = " ") ||
+	If ((dtoKlantAdres.GeefLand().GeefID() = " ") || (dtoKlantAdres.GeefGemeente() = " ") ||
 	(dtoKlantAdres.GeefPostcode() = " ") || (dtoKlantAdres.GeefStraat() = " ")){
 		Set Gewijzigd = -1
 	}
Index: DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml
===================================================================
diff -u -r2246 -r2423
--- DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml	(.../DataMKlantAPI.cls.xml)	(revision 2246)
+++ DOM/CRM/impl/DataM/DataMKlantAPI.cls.xml	(.../DataMKlantAPI.cls.xml)	(revision 2423)
@@ -87,7 +87,7 @@
 	Set $Piece(Data(0),..#Delimiter,5) = dtoKlant.Adres.GeefStraat()
 	Set $Piece(Data(0),..#Delimiter,6) = dtoKlant.Adres.GeefPostcode()
 	Set $Piece(Data(0),..#Delimiter,7) = dtoKlant.Adres.GeefGemeente()
-	Set $Piece(Data(0),..#Delimiter,8) = dtoKlant.Adres.GeefLandNr()
+	Set $Piece(Data(0),..#Delimiter,8) = dtoKlant.Adres.GeefLand().GeefID()
 	Set $Piece(Data(0),..#Delimiter,9) = dtoKlant.Taal
 	Set $Piece(Data(0),..#Delimiter,13) = dtoKlant.Telefoon1
 	If (dtoKlant.BTWNummer '= ""){
Index: APPS/common/DataService.cls.xml
===================================================================
diff -u -r2302 -r2423
--- APPS/common/DataService.cls.xml	(.../DataService.cls.xml)	(revision 2302)
+++ APPS/common/DataService.cls.xml	(.../DataService.cls.xml)	(revision 2423)
@@ -42,7 +42,7 @@
 	Set KlantData.Code = KlantID
 	Set Adres = Klant.GeefAdres()
 	Set KlantData.Gemeente = Adres.GeefGemeente()
-	Set KlantData.Land = Adres.GeefLandCode()
+	Set KlantData.Land = Adres.GeefLand().GeefCode()
 	
 	Quit KlantData
 ]]></Implementation>
Index: vhUnitTest/DOM/OV/TestOrder.cls.xml
===================================================================
diff -u -r1585 -r2423
--- vhUnitTest/DOM/OV/TestOrder.cls.xml	(.../TestOrder.cls.xml)	(revision 1585)
+++ vhUnitTest/DOM/OV/TestOrder.cls.xml	(.../TestOrder.cls.xml)	(revision 2423)
@@ -40,7 +40,7 @@
 	Do $$$AssertEquals(Adres.GeefStraat(),"Europark noord 9","Straat")
 	Do $$$AssertEquals(Adres.GeefPostcode(),9100,"Postcode")
 	Do $$$AssertEquals(Adres.GeefGemeente(),"Sint-Niklaas","Gemeente")
-	Do $$$AssertEquals(Adres.GeefLandNr(),"1019","Land")
+	Do $$$AssertEquals(Adres.GeefLand().GeefID(),"1019","Land")
 	
 	Set Orderlijn = Order.GeefOrderLijn(103)
 	Do $$$AssertTrue($IsObject(Orderlijn),"De orderlijn is een object")
Index: DOM/common/Land.cls.xml
===================================================================
diff -u
--- DOM/common/Land.cls.xml	(revision 0)
+++ DOM/common/Land.cls.xml	(revision 2423)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.Land">
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefID">
+<Abstract>1</Abstract>
+<ReturnType>%Integer</ReturnType>
+</Method>
+
+<Method name="GeefCode">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+
+<Method name="GeefNaam">
+<Abstract>1</Abstract>
+<ReturnType>%String</ReturnType>
+</Method>
+</Class>
+</Export>
Index: DOM/common/impl/Adres.cls.xml
===================================================================
diff -u -r1075 -r2423
--- DOM/common/impl/Adres.cls.xml	(.../Adres.cls.xml)	(revision 1075)
+++ DOM/common/impl/Adres.cls.xml	(.../Adres.cls.xml)	(revision 2423)
@@ -81,18 +81,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLandNr">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit ..LandNr
+<Method name="GeefLand">
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[
+	Set LocatieAPI = ##class(DOM.DomeinContext).Instance().GeefLocatieAPI()
+	Quit LocatieAPI.GeefLand(..LandNr)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLandCode">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$LAND^vhRtn1(..GeefLandNr(),1)
-]]></Implementation>
-</Method>
-
 <Method name="GeefTaal">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Taal
@@ -113,7 +109,7 @@
 
 <Method name="ToString">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..Naam_", "_..Straat_", "_..Postcode_" "_..Woonplaats_", "_..GeefLandCode()
+<Implementation><![CDATA[	Quit ..Naam_", "_..Straat_", "_..Postcode_" "_..Woonplaats_", "_..GeefLand().GeefCode()
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/CRM/impl/DataM/DataMKlantBase.cls.xml
===================================================================
diff -u -r2165 -r2423
--- DOM/CRM/impl/DataM/DataMKlantBase.cls.xml	(.../DataMKlantBase.cls.xml)	(revision 2165)
+++ DOM/CRM/impl/DataM/DataMKlantBase.cls.xml	(.../DataMKlantBase.cls.xml)	(revision 2423)
@@ -428,7 +428,7 @@
 	Do ..ZetAlgemeneGegevens(5,Adres.GeefStraat())
 	Do ..ZetAlgemeneGegevens(6,Adres.GeefPostcode())
 	Do ..ZetAlgemeneGegevens(7,Adres.GeefGemeente())
-	Do ..ZetAlgemeneGegevens(8,Adres.GeefLandNr())
+	Do ..ZetAlgemeneGegevens(8,Adres.GeefLand().GeefID())
 	Do ..ZetAlgemeneGegevens(9,Adres.GeefTaal())
 ]]></Implementation>
 </Method>
Index: vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml
===================================================================
diff -u -r1074 -r2423
--- vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml	(.../TestMaakKlant.cls.xml)	(revision 1074)
+++ vhUnitTest/DOM/CRM/TestMaakKlant.cls.xml	(.../TestMaakKlant.cls.xml)	(revision 2423)
@@ -45,7 +45,7 @@
 	Do $$$AssertEquals(KlantObject.Adres.Straat,Klant.GeefAdres().GeefStraat(),"Straat is gelijk.")
 	Do $$$AssertEquals(KlantObject.Adres.Postcode,Klant.GeefAdres().GeefPostcode(),"Postcode is gelijk.")
 	Do $$$AssertEquals(KlantObject.Adres.Woonplaats,Klant.GeefAdres().GeefGemeente(),"Gemeente is gelijk.")
-	Do $$$AssertEquals(KlantObject.Adres.LandNr,Klant.GeefAdres().GeefLandNr(),"LandNr is gelijk.")	
+	Do $$$AssertEquals(KlantObject.Adres.LandNr,Klant.GeefAdres().GeefLand().GeefID(),"LandID is gelijk.")	
 	
 	Do $$$AssertEquals(KlantObject.BTWNummer,Klant.GeefBTWNr(),"BTWNummer is gelijk.")
 	
@@ -93,7 +93,7 @@
 	Do $$$AssertEquals(KlantObject.Adres.Straat,Klant.GeefAdres().GeefStraat(),"Straat is gelijk.")
 	Do $$$AssertEquals(KlantObject.Adres.Postcode,Klant.GeefAdres().GeefPostcode(),"Postcode is gelijk.")
 	Do $$$AssertEquals(KlantObject.Adres.Woonplaats,Klant.GeefAdres().GeefGemeente(),"Gemeente is gelijk.")
-	Do $$$AssertEquals(KlantObject.Adres.LandNr,Klant.GeefAdres().GeefLandNr(),"LandNr is gelijk.")	
+	Do $$$AssertEquals(KlantObject.Adres.LandNr,Klant.GeefAdres().GeefLand().GeefID(),"LandID is gelijk.")	
 	
 	Do $$$AssertEquals(KlantObject.BTWNummer,Klant.GeefBTWNr(),"BTWNummer is gelijk.")
 ]]></Implementation>
Index: DOM/common/impl/LocatieAPI.cls.xml
===================================================================
diff -u
--- DOM/common/impl/LocatieAPI.cls.xml	(revision 0)
+++ DOM/common/impl/LocatieAPI.cls.xml	(revision 2423)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.impl.LocatieAPI">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,DOM.common.LocatieAPI</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefLand">
+<FormalSpec>LandID:%String</FormalSpec>
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[		Quit ##class(DOM.common.impl.Land).%New(LandID)
+]]></Implementation>
+</Method>
+
+<Method name="GeefBelgie">
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[		Quit ..GeefLand(1019)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNederland">
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[		Quit ..GeefLand(1147)
+]]></Implementation>
+</Method>
+
+<Method name="GeefLuxemburg">
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[		Quit ..GeefLand(1120)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: DOM/common/Adres.cls.xml
===================================================================
diff -u -r1075 -r2423
--- DOM/common/Adres.cls.xml	(.../Adres.cls.xml)	(revision 1075)
+++ DOM/common/Adres.cls.xml	(.../Adres.cls.xml)	(revision 2423)
@@ -35,16 +35,11 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
-<Method name="GeefLandNr">
+<Method name="GeefLand">
 <Abstract>1</Abstract>
-<ReturnType>%Integer</ReturnType>
+<ReturnType>DOM.common.Land</ReturnType>
 </Method>
 
-<Method name="GeefLandCode">
-<Abstract>1</Abstract>
-<ReturnType>%String</ReturnType>
-</Method>
-
 <Method name="GeefTaal">
 <Abstract>1</Abstract>
 <ReturnType>%String</ReturnType>
Index: APPS/LEV/LeverancierService.cls.xml
===================================================================
diff -u -r2182 -r2423
--- APPS/LEV/LeverancierService.cls.xml	(.../LeverancierService.cls.xml)	(revision 2182)
+++ APPS/LEV/LeverancierService.cls.xml	(.../LeverancierService.cls.xml)	(revision 2423)
@@ -171,7 +171,7 @@
 	Set Adres.StraatNrBus = LeverancierAdres.GeefStraat()
 	Set Adres.Woonplaats = LeverancierAdres.GeefGemeente()
 	Set Adres.PostCode = LeverancierAdres.GeefPostcode()
-	Set Adres.Land = LeverancierAdres.GeefLandCode()
+	Set Adres.Land = LeverancierAdres.GeefLand().GeefCode()
 	Set dtoLeverancierId.Adres = Adres
 	
 	$$$TECHErrorTrapOff
Index: CHUI/Orgalux/PrintSelect.cls.xml
===================================================================
diff -u -r1133 -r2423
--- CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 1133)
+++ CHUI/Orgalux/PrintSelect.cls.xml	(.../PrintSelect.cls.xml)	(revision 2423)
@@ -386,12 +386,17 @@
  	} 
  	else {
  		set Klant = $$$CRMGeefKlant(..ExportFilter.KlantNr)
- 		set LandKlant = Klant.GeefAdres().GeefLandNr()
- 		if (LandKlant'=1019)&&(LandKlant'=1147) { //&&(LandKlant'=1120) 
+ 		Set LocatieAPI = ##class(DOM.DomeinContext).Instance().GeefLocatieAPI()
+ 		Set Belgie = LocatieAPI.GeefBelgie()
+ 		Set Nederland = LocatieAPI.GeefNederland()
+ 		Set Luxemburg = LocatieAPI.GeefLuxemburg()
+ 		
+ 		set LandKlant = Klant.GeefAdres().GeefLand().GeefID()
+ 		if (LandKlant'=Belgie.GeefID())&&(LandKlant'=Nederland.GeefID()) { //&&(LandKlant'=1120) 
  			if (..pmTaal.Value'="K")&&(..pmBTW.Value'="K") // Taal en BTW hebben een geldige waarde
  			else  set errMessage=errMessage_"De ORGALUX prijslijst voor klanten buiten Belgie of"_$$$CRLF_"Nederland is enkel mogelijk indien men een taal en"_$$$CRLF_"BTW-tarief heeft gekozen"_$$$CRLF
  		}
- 		if 0&&(LandKlant'=1019)&&(LandKlant'=1147) //&&(LandKlant'=1120) 
+ 		if 0&&(LandKlant'=Belgie.GeefID())&&(LandKlant'=Nederland.GeefID()) //&&(LandKlant'=1120) 
  			{ set errMessage=errMessage_"Klant is niet afkomstig van Belgie of Nederland"_$$$CRLF }
  	 	if ..pmTaal.Value = "K" { 
 			set TaalKlant = Klant.GeefTaal()
@@ -408,9 +413,9 @@
 		}
 		
 		if ..pmBTW.Value= "K" {
-			if LandKlant=1019 { set ..ExportFilter.BTW = "InclBTW-BE" }
-			elseif LandKlant=1147 { set ..ExportFilter.BTW = "InclBTW-NL" }
-			elseif LandKlant=1120 { set ..ExportFilter.BTW = "InclBTW-BE" }
+			if LandKlant=Belgie.GeefID() { set ..ExportFilter.BTW = "InclBTW-BE" }
+			elseif LandKlant=Nederland.GeefID() { set ..ExportFilter.BTW = "InclBTW-NL" }
+			elseif LandKlant=Luxemburg.GeefID() { set ..ExportFilter.BTW = "InclBTW-BE" }
 		}
 		else { set ..ExportFilter.BTW = ..pmBTW.Value }
  	}
Index: zTryout/ARC/APPS/VKP/OrderIngaveService.cls.xml
===================================================================
diff -u -r1408 -r2423
--- zTryout/ARC/APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 1408)
+++ zTryout/ARC/APPS/VKP/OrderIngaveService.cls.xml	(.../OrderIngaveService.cls.xml)	(revision 2423)
@@ -79,7 +79,7 @@
 	Set AdresDto.Straat = Adres.GeefStraat()
 	Set AdresDto.Postcode = Adres.GeefPostcode()
 	Set AdresDto.Gemeente = Adres.GeefGemeente()
-	Set AdresDto.Land = Adres.GeefLandCode()
+	Set AdresDto.Land = Adres.GeefLand().GeefCode()
 	
 	Quit AdresDto
 ]]></Implementation>
Index: DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml
===================================================================
diff -u -r1075 -r2423
--- DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml	(.../KlantBeoordeling.cls.xml)	(revision 1075)
+++ DOM/CRM/Stat/dto/KlantBeoordeling.cls.xml	(.../KlantBeoordeling.cls.xml)	(revision 2423)
@@ -130,7 +130,7 @@
 	Set ..KlantNr=Klant.GeefNummer()
 	Set ..KlantNaam=Klant.GeefNaam()
 	Set ..Regio=Klant.GeefRegio()
-	Set ..LandCode=Klant.GeefAdres().GeefLandCode()
+	Set ..LandCode=Klant.GeefAdres().GeefLand().GeefCode()
 	Set ..FactuurType=$S(Factuur.%ClassName()["Proforma":"P",1:"F")
 	Set ..FactuurNr=Factuur.GeefNr()
 ]]></Implementation>
Index: DOM/DomeinContext.cls.xml
===================================================================
diff -u -r2302 -r2423
--- DOM/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 2302)
+++ DOM/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 2423)
@@ -65,6 +65,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TransportAPINamen">
+<Type>TECH.Stack</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LocatieAPINamen">
+<Type>TECH.Stack</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="OrderAPI">
 <Type>DOM.OV.OrderAPI</Type>
 <Private>1</Private>
@@ -120,6 +130,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="TransportAPI">
+<Type>DOM.TRANSP.TransportAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="LocatieAPI">
+<Type>DOM.common.LocatieAPI</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.DomeinContext</ReturnType>
@@ -147,6 +167,8 @@
 	Set ..VerwachteUitvoerAPINamen = ##class(TECH.Stack).%New()
 	Set ..VerwachteInvoerAPINamen = ##class(TECH.Stack).%New()
 	Set ..GebruikerAPINamen = ##class(TECH.Stack).%New()
+	Set ..TransportAPINamen = ##class(TECH.Stack).%New()
+	Set ..LocatieAPINamen = ##class(TECH.Stack).%New()
 	// Initialize the stacks
 	Do ..Reset()
 	Quit $$$OK
@@ -285,6 +307,28 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefTransportAPI">
+<ReturnType>DOM.TRANSP.TransportAPI</ReturnType>
+<Implementation><![CDATA[
+	If (..TransportAPI = ""){
+		Set ClassName = ..TransportAPINamen.Peek()
+		Set ..TransportAPI = $ZOBJCLASSMETHOD(ClassName, "%New")	
+	}	
+	Quit ..TransportAPI
+]]></Implementation>
+</Method>
+
+<Method name="GeefLocatieAPI">
+<ReturnType>DOM.common.LocatieAPI</ReturnType>
+<Implementation><![CDATA[
+	If (..LocatieAPI = ""){
+		Set ClassName = ..LocatieAPINamen.Peek()
+		Set ..LocatieAPI = $ZOBJCLASSMETHOD(ClassName, "%New")	
+	}	
+	Quit ..LocatieAPI
+]]></Implementation>
+</Method>
+
 <Method name="Reset">
 <Implementation><![CDATA[
 	Do ..ProductAPINamen.Clear()
@@ -300,6 +344,8 @@
 	Do ..PushVerwachtUitvoerAPIClassName("DOM.ProdRes.impl.VerwachteUitvoerAPIimpl")
 	Do ..PushVerwachtInvoerAPIClassName("DOM.ProdRes.impl.VerwachteInvoerAPIimpl")
 	Do ..PushGebruikerAPIClassName("DOM.common.impl.GebruikerAPIimpl")
+	Do ..PushTransportAPIClassName("DOM.TRANSP.impl.DataM.DataMTransportAPI")
+	Do ..PushLocatieAPIClassName("DOM.common.impl.LocatieAPI")
 ]]></Implementation>
 </Method>
 
@@ -383,6 +429,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="PopTransportAPIClassName">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do ..TransportAPINamen.Pop()
+	Set TransportAPI = ""
+]]></Implementation>
+</Method>
+
+<Method name="PopLocatieAPIClassName">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Do ..LocatieAPINamen.Pop()
+	Set LocatieAPI = ""
+]]></Implementation>
+</Method>
+
 <Method name="PushOrderAPIClassName">
 <FormalSpec>Naam:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -470,5 +532,21 @@
 	Set ..GebruikerAPI = ""
 ]]></Implementation>
 </Method>
+
+<Method name="PushTransportAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..TransportAPINamen.Push(Naam)
+	Set ..TransportAPI = ""
+]]></Implementation>
+</Method>
+
+<Method name="PushLocatieAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ..LocatieAPINamen.Push(Naam)
+	Set LocatieAPI = ""
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: DOM/common/impl/Land.cls.xml
===================================================================
diff -u
--- DOM/common/impl/Land.cls.xml	(revision 0)
+++ DOM/common/impl/Land.cls.xml	(revision 2423)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.impl.Land">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>%RegisteredObject,DOM.common.Land</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="LandID">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LandID:%String</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..LandID = LandID
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefID">
+<ReturnType>%Integer</ReturnType>
+<Implementation><![CDATA[	Quit ..LandID
+]]></Implementation>
+</Method>
+
+<Method name="GeefCode">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$LAND^vhRtn1(..LandID,1)
+]]></Implementation>
+</Method>
+
+<Method name="GeefNaam">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit $$LAND^vhRtn1(..LandID,2)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^DOM.common.impl.LandD</DataLocation>
+<DefaultData>LandDefaultData</DefaultData>
+<IdLocation>^DOM.common.impl.LandD</IdLocation>
+<IndexLocation>^DOM.common.impl.LandI</IndexLocation>
+<StreamLocation>^DOM.common.impl.LandS</StreamLocation>
+<Data name="LandDefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: DOM/common/LocatieAPI.cls.xml
===================================================================
diff -u
--- DOM/common/LocatieAPI.cls.xml	(revision 0)
+++ DOM/common/LocatieAPI.cls.xml	(revision 2423)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="DOM.common.LocatieAPI">
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="GeefLand">
+<Abstract>1</Abstract>
+<FormalSpec>LandID:%String</FormalSpec>
+</Method>
+
+<Method name="GeefBelgie">
+<Abstract>1</Abstract>
+<ReturnType>DOM.common.Land</ReturnType>
+</Method>
+
+<Method name="GeefNederland">
+<Abstract>1</Abstract>
+<ReturnType>DOM.common.Land</ReturnType>
+</Method>
+
+<Method name="GeefLuxemburg">
+<Abstract>1</Abstract>
+<ReturnType>DOM.common.Land</ReturnType>
+</Method>
+</Class>
+</Export>
Index: APPS/CRM/KlantService.cls.xml
===================================================================
diff -u -r2182 -r2423
--- APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 2182)
+++ APPS/CRM/KlantService.cls.xml	(.../KlantService.cls.xml)	(revision 2423)
@@ -111,7 +111,7 @@
 	Set Adres.StraatNrBus = KlantAdres.GeefStraat()
 	Set Adres.Woonplaats = KlantAdres.GeefGemeente()
 	Set Adres.PostCode = KlantAdres.GeefPostcode()
-	Set Adres.Land = KlantAdres.GeefLandCode()
+	Set Adres.Land = KlantAdres.GeefLand().GeefCode()
 	Set dtoKlantId.Adres = Adres
 	
 	Quit dtoKlantId
Index: DOM/OV/impl/DataM/DataMAdres.cls.xml
===================================================================
diff -u -r1076 -r2423
--- DOM/OV/impl/DataM/DataMAdres.cls.xml	(.../DataMAdres.cls.xml)	(revision 1076)
+++ DOM/OV/impl/DataM/DataMAdres.cls.xml	(.../DataMAdres.cls.xml)	(revision 2423)
@@ -117,18 +117,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLandNr">
-<ReturnType>%Integer</ReturnType>
-<Implementation><![CDATA[	Quit ..LandNr
+<Method name="GeefLand">
+<ReturnType>DOM.common.Land</ReturnType>
+<Implementation><![CDATA[
+	Set LocatieAPI = ##class(DOM.DomeinContext).Instance().GeefLocatieAPI()
+	Quit LocatieAPI.GeefLand(..LandNr)
 ]]></Implementation>
 </Method>
 
-<Method name="GeefLandCode">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit $$LAND^vhRtn1(..GeefLandNr(),1)
-]]></Implementation>
-</Method>
-
 <Method name="GeefTaal">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[	Quit ..Taal