Index: WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml
===================================================================
diff -u -r37277 -r37420
--- WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 37277)
+++ WSimpl/Unishop/BeschikbareLandenBepaler.cls.xml	(.../BeschikbareLandenBepaler.cls.xml)	(revision 37420)
@@ -51,12 +51,12 @@
 </Method>
 
 <Method name="Bepaal">
-<FormalSpec>Taal:DOM.enu.Taal,PersonalityID:%String="",KlantID:DOM.common.PartijID=""</FormalSpec>
+<FormalSpec>Taal:DOM.enu.Taal,Sessie:WSimpl.Unishop.dto.Sessie</FormalSpec>
 <ReturnType>WS.EC.ExterneVerkoop.dto.Landen</ReturnType>
 <Implementation><![CDATA[
 	Do ..ZetVertaler(Taal)
 	#dim Landen As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
-	#dim BeschikbareLandCodes As TECH.Iterator = ..LandenBepalerFactory.GeefLandenBepaler(PersonalityID, KlantID).GeefLandCodes()
+	#dim BeschikbareLandCodes As TECH.Iterator = ..LandenBepalerFactory.GeefLandenBepaler(Sessie).GeefLandCodes()
 	
 	While BeschikbareLandCodes.HasNext()
 	{	
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml
===================================================================
diff -u -r37277 -r37420
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37277)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory/GeefLandenBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 37420)
@@ -3,26 +3,144 @@
 <Class name="vhUnitTest.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory.GeefLandenBepaler.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="VanHoeckeLandenBepalerClassName">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HeinLandenBepalerClassName">
+<Type>%String</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##Super()
+	Set ..VanHoeckeLandenBepalerClassName = "WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler"
+	Set ..HeinLandenBepalerClassName = "WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler"
+]]></Implementation>
+</Method>
+
 <Method name="Test: geeft LandenBepaler hein als de context personality hein is">
 <Implementation><![CDATA[
 	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).Hein(),"").%ClassName(1),"WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler")
+	#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New(##class(DOM.common.enu.Personality).Hein(), "")
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(Sessie).%ClassName(1),..HeinLandenBepalerClassName)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: geeft LandenBepaler hein als de klant hein is">
 <Implementation><![CDATA[
 	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).VanHoecke(),##class(DOM.VKP.enu.Klant).Hein()).%ClassName(1),"WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler")
+	#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New(##class(DOM.common.enu.Personality).VanHoecke(), ##class(DOM.VKP.enu.Klant).Hein())
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(Sessie).%ClassName(1),..HeinLandenBepalerClassName)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: geeft LandenBepaler vanhoecke als het geen hein klant en geen hein personality is">
 <Implementation><![CDATA[
 	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(##class(DOM.common.enu.Personality).VanHoecke(),"").%ClassName(1),"WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler")
+	#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New(##class(DOM.common.enu.Personality).VanHoecke(), "")
+	Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(Sessie).%ClassName(1),..VanHoeckeLandenBepalerClassName)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: geeft LandenBepaler geeft de juiste LandenBepaler voor de overeenkomstige personality">
+<Implementation><![CDATA[
+	#dim VerwachteBepaler As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).VanHoecke())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).VanHoeckeVoorHalux())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).SFS())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Dupont())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Kisch())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Destil())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleBE())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).VanRaemdonck())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Noteborn())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).Daro())
+	Do VerwachteBepaler.InsertAt(..HeinLandenBepalerClassName,##class(DOM.common.enu.Personality).Hein())
+	Do VerwachteBepaler.InsertAt(..VanHoeckeLandenBepalerClassName,##class(DOM.common.enu.Personality).HaefeleNL()) 
+
+	#dim LandenBepalerFactory As WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory
+	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+
+	#dim PersonalityIterator As TECH.ListIterator = ##class(DOM.common.enu.Personality).ValueListIterator()
+	While PersonalityIterator.HasNext()
+	{
+		#dim PersonalityID As DOM.common.enu.Personality = PersonalityIterator.Next()
+		#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New(PersonalityID, "")
+		Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(Sessie).%ClassName(1), VerwachteBepaler.GetAt(PersonalityID))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Test: geeft TransportFirmaBepaler geeft de juiste TransportFirmaBepaler voor de overeenkomstige klant">
+<Implementation><![CDATA[
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Keller()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).VanHoecke()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).TestklantVanHoecke()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Bruynzeel()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).HaefeleBelgie()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).HaefeleNederland()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).OptimaPack()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).NordInox()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Halux()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).NewSobelwood()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).SFS()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Tulp()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DeceuninckDeforce()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).GroupNivelles()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).NevesBelgium()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DMLine()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).KastID()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).FranssenProducts()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).FranssenTrading()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).MeubelBeslagHolland()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DeDecker()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Hein()) = ..HeinLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).VanRaemdonck()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Noteborn()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).LijstPrijsKlant()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).RabatPrijsKlant()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).SpilPrijsKlant()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).ConsumentVoorVhisieKlant()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).HoutenLaden()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Planofurn()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Intracto()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).HeylenJos()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DKGDeKeukenfabriek()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).VanLaer()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).WilsInterieurbouw()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Jongen()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).VOLUX()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DiboDesign()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).SegersInterieur()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Uytterhoeven()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).ThononKitchencenter()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).DaroFactors()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).SeboKinteque()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).TheyssensKeukens()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).KvikNL()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).KvikBE()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).BlumPortugal()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).MiwaInterieurs()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).FransenMarius()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).Strakk()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).LenssenProduktie()) = ..VanHoeckeLandenBepalerClassName
+	Set VerwachteBepaler(##class(DOM.VKP.enu.Klant).MiBois()) = ..VanHoeckeLandenBepalerClassName
+
+	#dim LandenBepalerFactory As WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory
+	Set LandenBepalerFactory = ##class(WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
+
+	#dim KlantIterator As TECH.ListIterator = ##class(DOM.VKP.enu.Klant).ValueListIterator()
+	While KlantIterator.HasNext()
+	{
+		#dim KlantID As DOM.common.enu.Personality = KlantIterator.Next()
+		#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New("",KlantID)
+		Do $$$AssertEquals(LandenBepalerFactory.GeefLandenBepaler(Sessie).%ClassName(1), VerwachteBepaler(KlantID))
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: DOM/VKP/enu/Klant.cls.xml
===================================================================
diff -u -r36637 -r37420
--- DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 36637)
+++ DOM/VKP/enu/Klant.cls.xml	(.../Klant.cls.xml)	(revision 37420)
@@ -6,6 +6,10 @@
 Deze kan geconverteerd worden naar KlantNummer met behulp van de LegacyPartijAPI. </Description>
 <Super>TECH.Enumeration</Super>
 
+<Parameter name="VALUELIST">
+<Default>,K||1239,K||4682,K||1000,K||11708,K||4875,K||2671,K||6279,K||12130,K||7587,K||9365,K||12486,K||2523,K||1571,K||4451,K||4855,K||4830,K||9366,K||11211,K||12853,K||2999,K||6780,K||7833,K||1523,K||2669,K||6819,K||6820,K||6821,K||18455,K||9258,K||2009,K||23486,K||7606,K||23112,K||9382,K||18417,K||4073,K||1390,K||9197,K||3814,K||1387,K||8869,K||23968,K||11171,K||6261,K||24315,K||25868,K||24755,K||9905,K||10387,K||12983,K||9798,K||3145</Default>
+</Parameter>
+
 <Method name="Keller">
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.VKP.enu.Klant</ReturnType>
Index: WS/EC/ExterneVerkoopService.cls.xml
===================================================================
diff -u -r37401 -r37420
--- WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 37401)
+++ WS/EC/ExterneVerkoopService.cls.xml	(.../ExterneVerkoopService.cls.xml)	(revision 37420)
@@ -166,7 +166,9 @@
 <Method name="GeefBeschikbareLanden">
 <ReturnType>WS.EC.ExterneVerkoop.dto.Landen</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New().Bepaal(..GeefTaal(),..GeefPersonalityID() ,..GeefKlantID())
+<Implementation><![CDATA[
+	#dim Sessie As WSimpl.Unishop.dto.Sessie = ##class(WSimpl.Unishop.dto.Sessie).%New(..GeefPersonalityID() ,..GeefKlantID())
+	Quit ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New().Bepaal(..GeefTaal(),Sessie)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u -r37277 -r37420
--- vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37277)
+++ vhTest/Mock/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37420)
@@ -10,9 +10,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="GeefLandenBepaler">
-<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<FormalSpec>Sessie:WSimpl.Unishop.dto.Sessie</FormalSpec>
 <ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLandenBepaler",PersonalityID,KlantID)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefLandenBepaler",Sessie)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r37277 -r37420
--- vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 37277)
+++ vhUnitTest/WSimpl/Unishop/BeschikbareLandenBepaler/Bepaal/Test.cls.xml	(.../Test.cls.xml)	(revision 37420)
@@ -3,6 +3,18 @@
 <Class name="vhUnitTest.WSimpl.Unishop.BeschikbareLandenBepaler.Bepaal.Test">
 <Super>vhUnitTest.TestCase</Super>
 
+<Property name="SessieDummy">
+<Type>WSimpl.Unishop.dto.Sessie</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	Set ..SessieDummy = ##class(WSimpl.Unishop.dto.Sessie).%New("DummyPersonality","DummyKlant")
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bepaal geeft landen aan de hand van beschikbare landcodes ">
 <Implementation><![CDATA[
 	#dim Taal As DOM.enu.Taal = ##class(DOM.enu.Taal).Nederlands()
@@ -15,10 +27,10 @@
 	Do LandenBepalerMock.VerwachtMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
 
 	#dim LandenBepalerFactoryMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do LandenBepalerFactoryMock.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerMock)
+	Do LandenBepalerFactoryMock.IndienMethodCall("GeefLandenBepaler",..SessieDummy).DanReturn(LandenBepalerMock)
 	
 	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryMock, VertaalAPIStub)
-	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal",..SessieDummy)
 
 	Do LandenBepalerMock.Verifieer()
 ]]></Implementation>
@@ -36,10 +48,10 @@
 	Do LandenBepalerMock.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
 
 	#dim LandenBepalerFactoryMock As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do LandenBepalerFactoryMock.VerwachtMethodCall("GeefLandenBepaler","DummyPersonalityID","DummyKlantID").DanReturn(LandenBepalerMock)
+	Do LandenBepalerFactoryMock.VerwachtMethodCall("GeefLandenBepaler",..SessieDummy).DanReturn(LandenBepalerMock)
 	
 	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryMock, VertaalAPIStub)
-	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal","DummyPersonalityID","DummyKlantID")
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal",..SessieDummy)
 
 	Do LandenBepalerFactoryMock.Verifieer()
 ]]></Implementation>
@@ -57,10 +69,10 @@
 	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG","SE")))
 
 	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler",..SessieDummy).DanReturn(LandenBepalerStub)
 	
 	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIMock)
-	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal",..SessieDummy)
 
 	Do VertaalAPIMock.Verifieer()
 ]]></Implementation>
@@ -78,7 +90,7 @@
 	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 
 	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler",..SessieDummy).DanReturn(LandenBepalerStub)
 
 	#dim BeschikbareLandenList As WS.EC.ExterneVerkoop.dto.Landen = ##class(WS.EC.ExterneVerkoop.dto.Landen).%New()
 	Do BeschikbareLandenList.Insert(##class(WS.EC.ExterneVerkoop.dto.Land).%New("BG","[BG]"))
@@ -87,7 +99,7 @@
 	#dim SorterSpy As vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort = ##class(vhTest.Spy.WSimpl.Unishop.BeschikbareLandenSort).%New()
 	
 	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIStub, SorterSpy)
-	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal",..SessieDummy)
 
 	Do $$$AssertTrue(SorterSpy.IsSortOpgeroepen)
 	Do $$$AssertTrue(SorterSpy.IsBeschikbareLandenComparatorGebruikt)
@@ -106,10 +118,10 @@
 	Do LandenBepalerStub.IndienMethodCall("GeefLandCodes").DanReturn(##class(TECH.ListbuildIterator).%New($ListBuild("BG")))
 	
 	#dim LandenBepalerFactoryStub As vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory = ##class(vhTest.Mock.WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory).%New()
-	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler","","").DanReturn(LandenBepalerStub)
+	Do LandenBepalerFactoryStub.IndienMethodCall("GeefLandenBepaler",..SessieDummy).DanReturn(LandenBepalerStub)
 
 	#dim BeschikbareLandenBepaler As WSimpl.Unishop.BeschikbareLandenBepaler = ##class(WSimpl.Unishop.BeschikbareLandenBepaler).%New(LandenBepalerFactoryStub, VertaalAPIStub)
-	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal")
+	#dim EuropeseLanden As WS.EC.ExterneVerkoop.dto.Landen = BeschikbareLandenBepaler.Bepaal("DummyTaal",..SessieDummy)
 
 	Do $$$AssertEquals(EuropeseLanden.GetAt(1).Code,"BG")
 	Do $$$AssertEquals(EuropeseLanden.GetAt(1).Naam,"[BG]")
Index: vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u -r37277 -r37420
--- vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37277)
+++ vhTest/Fake/WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37420)
@@ -8,7 +8,7 @@
 <Super>WS.EC.Unishop.InternationaleZending.impl.LandenBepalerFactory</Super>
 
 <Method name="GeefLandenBepaler">
-<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<FormalSpec>Sessie:WSimpl.Unishop.dto.Sessie</FormalSpec>
 <ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
Index: WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml
===================================================================
diff -u -r37277 -r37420
--- WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37277)
+++ WS/EC/Unishop/InternationaleZending/impl/LandenBepalerFactory.cls.xml	(.../LandenBepalerFactory.cls.xml)	(revision 37420)
@@ -4,10 +4,10 @@
 <Super>TECH.Mockable</Super>
 
 <Method name="GeefLandenBepaler">
-<FormalSpec>PersonalityID:%String,KlantID:DOM.common.PartijID</FormalSpec>
+<FormalSpec>Sessie:WSimpl.Unishop.dto.Sessie</FormalSpec>
 <ReturnType>WS.EC.Unishop.InternationaleZending.LandenBepaler</ReturnType>
 <Implementation><![CDATA[
-	If (..IsHeinPersonality(PersonalityID) || ..IsHeinKlant(KlantID)) {
+	If (..IsHeinPersonality(Sessie.GeefPersonalityID()) || ..IsHeinKlant(Sessie.GeefKlantID())) {
 		Quit ##class(WS.EC.Unishop.InternationaleZending.Hein.impl.LandenBepaler).%New()
 	} else {
 		Quit ##class(WS.EC.Unishop.InternationaleZending.VanHoecke.impl.LandenBepaler).%New()