Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71649 -r71650
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71650)
@@ -48,31 +48,26 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTweedePersonality">
-<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
-<ReturnType>DOM.common.Personality</ReturnType>
+<Method name="GeefPersonalityIdOpNiveau">
+<FormalSpec>OorsprongKettingString:%String,Niveau:%Integer,FallBackPersonalityId:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim Personality As DOM.common.Personality
+	#dim PersonalityId As %String
 	
 	If (OorsprongKettingString = "") {
-		Set Personality = ..GeefFallBackPersonality(FallBackKlantId)
+		Set PersonalityId = FallBackPersonalityId
 	} Else {
 		Try {
 			#dim OorsprongKetting As %List = ..GeefOorsprongKettingLijst(OorsprongKettingString)
-			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - 1),",", 1)
-			
-			If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
-				Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
-			}
-			Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
+			Set PersonalityId = $Piece($List(OorsprongKetting, $ListLength(OorsprongKetting) - Niveau),",", 1)
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 			Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
 			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
 		}
 	}
 	
-	Quit Personality
+	Quit PersonalityId
 ]]></Implementation>
 </Method>
 
Index: vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71649 -r71650
--- vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
+++ vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71650)
@@ -22,10 +22,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefTweedePersonality">
-<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
-<ReturnType>DOM.common.Personality</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefTweedePersonality",OorsprongKettingString,FallBackKlantId)
+<Method name="GeefPersonalityIdOpNiveau">
+<FormalSpec>OorsprongKettingString:%String,Niveau:%Integer,FallBackPersonalityId:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefPersonalityIdOpNiveau",OorsprongKettingString,Niveau,FallBackPersonalityId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r71649 -r71650
--- vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71649)
+++ vhTest/Fake/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 71650)
@@ -14,6 +14,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPersonalityIdOpNiveau">
+<FormalSpec>OorsprongKettingString:%String,Niveau:%Integer,FallBackPersonalityId:%String=""</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+
 <Method name="GeefPieceUitOorsprongKetting">
 <FormalSpec>OorsprongKettingString:%String,WelkePiece:%Integer=1,WelkNiveau:%Integer=1</FormalSpec>
 <ReturnType>%String</ReturnType>