Index: DOM/common/enu/Land/AutoComplete.cls.xml
===================================================================
diff -u -r64473 -r68916
--- DOM/common/enu/Land/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 64473)
+++ DOM/common/enu/Land/AutoComplete.cls.xml	(.../AutoComplete.cls.xml)	(revision 68916)
@@ -79,12 +79,26 @@
 <ReadOnly>1</ReadOnly>
 </Property>
 
+<Property name="Noorwegen">
+<Type>%String</Type>
+<InitialExpression>"1158"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
+
 <Property name="Zweden">
 <Type>%String</Type>
 <InitialExpression>"1235"</InitialExpression>
 <Transient>1</Transient>
 <ReadOnly>1</ReadOnly>
 </Property>
+
+<Property name="Zwitserland">
+<Type>%String</Type>
+<InitialExpression>"1236"</InitialExpression>
+<Transient>1</Transient>
+<ReadOnly>1</ReadOnly>
+</Property>
 </Class>
 
 
Index: DOM/common/enu/Land.cls.xml
===================================================================
diff -u -r64473 -r68916
--- DOM/common/enu/Land.cls.xml	(.../Land.cls.xml)	(revision 64473)
+++ DOM/common/enu/Land.cls.xml	(.../Land.cls.xml)	(revision 68916)
@@ -5,11 +5,11 @@
 <Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
-<Default>;1019;1147;1120;1107;1031;1052;1235;1063;1096;1048;1064</Default>
+<Default>;1019;1147;1120;1107;1031;1052;1235;1063;1096;1048;1064;1236;1158</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;Belgie;Nederland;Luxemburg;Kenia;Bulgarije;Duitsland;Zweden;Finland;Italie;Denemarken;Frankrijk</Default>
+<Default>;Belgie;Nederland;Luxemburg;Kenia;Bulgarije;Duitsland;Zweden;Finland;Italie;Denemarken;Frankrijk;Zwitserland;Noorwegen</Default>
 </Parameter>
 
 <Method name="Belgie">
@@ -88,6 +88,20 @@
 <Implementation><![CDATA[	Quit "1064"
 ]]></Implementation>
 </Method>
+
+<Method name="Zwitserland">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Land</ReturnType>
+<Implementation><![CDATA[	Quit "1236"
+]]></Implementation>
+</Method>
+
+<Method name="Noorwegen">
+<ClassMethod>1</ClassMethod>
+<ReturnType>DOM.common.enu.Land</ReturnType>
+<Implementation><![CDATA[	Quit "1158"
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhTest/Utils/DOM/VKP/LeverAdres.cls.xml
===================================================================
diff -u -r67229 -r68916
--- vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 67229)
+++ vhTest/Utils/DOM/VKP/LeverAdres.cls.xml	(.../LeverAdres.cls.xml)	(revision 68916)
@@ -182,7 +182,7 @@
 <Implementation><![CDATA[
 	#dim LeverAdres As DOM.VKP.impl.LeverAdres = ##class(DOM.VKP.impl.LeverAdres).%New()
 	Do LeverAdres.ZetNaam("Noors adres")
-	Do LeverAdres.ZetLandNr(123456)
+	Do LeverAdres.ZetLandNr(1158)
 	Do LeverAdres.ZetPostcode("123456")
 	Do LeverAdres.ZetStraat("No Adress")
 	Do LeverAdres.ZetGemeente("Unknown")
Index: DOM/common/enu/Land/Verwerker.cls.xml
===================================================================
diff -u -r64473 -r68916
--- DOM/common/enu/Land/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 64473)
+++ DOM/common/enu/Land/Verwerker.cls.xml	(.../Verwerker.cls.xml)	(revision 68916)
@@ -32,8 +32,12 @@
 		Do ..VerwerkLuxemburg()
 	} ElseIf Land = "1147" {
 		Do ..VerwerkNederland()
+	} ElseIf Land = "1158" {
+		Do ..VerwerkNoorwegen()
 	} ElseIf Land = "1235" {
 		Do ..VerwerkZweden()
+	} ElseIf Land = "1236" {
+		Do ..VerwerkZwitserland()
 	} Else {
 		Set Exceptie = ##class(TECH.Exceptions.EnumerationException).%New(Land,"DOM.common.enu.Land",$classname())
 		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
@@ -101,11 +105,23 @@
 <Implementation><![CDATA[]]></Implementation>
 </Method>
 
+<Method name="VerwerkNoorwegen">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
+
 <Method name="VerwerkZweden">
 <Abstract>1</Abstract>
 <Private>1</Private>
 <Implementation><![CDATA[]]></Implementation>
 </Method>
+
+<Method name="VerwerkZwitserland">
+<Abstract>1</Abstract>
+<Private>1</Private>
+<Implementation><![CDATA[]]></Implementation>
+</Method>
 </Class>