Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r45479 -r45480
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45479)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45480)
@@ -66,7 +66,7 @@
 <Method name="Decrypteer">
 <FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
-<Implementation><![CDATA[	Quit ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).Decrypteer(DecrypteerRequest)
+<Implementation><![CDATA[	Quit ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New().Decrypteer(DecrypteerRequest)
 ]]></Implementation>
 </Method>
 
@@ -140,7 +140,7 @@
 <Method name="GeefHandelKlantDataVoorRegistreer">
 <FormalSpec>KlantId:DOM.VKP.VanHoeckeKlantID,RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
 <Private>1</Private>
-<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
+<ReturnType>DOM.VKP.impl.HandelKlantData</ReturnType>
 <Implementation><![CDATA[
 	#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = ..HandelKlantDataRepository.Maak()
 	
@@ -160,27 +160,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefHandelKlantDataVoorDecrypteer">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
-<Implementation><![CDATA[
-	#dim HandelLoginParameters As WSimpl.Unishop.Login.ParametersHandel = LoginParameters	
-	Set KlantData = ##class(DOM.common.dto.HandelKlantData).%New()
-	Set KlantData.Naam = HandelLoginParameters.KlantNaam
-	Set KlantData.ID = LoginParameters.KlantID
-	Set KlantData.Taal = HandelLoginParameters.Taal
-	Set KlantData.EmailAdres = HandelLoginParameters.EmailAdres
-	Set KlantData.FaxNummer = HandelLoginParameters.FaxNummer
-	Set KlantData.Gemeente = HandelLoginParameters.Gemeente
-	Set KlantData.Postcode = HandelLoginParameters.Postcode
-	Set KlantData.StraatEnNr = HandelLoginParameters.StraatEnNr
-	Set KlantData.TelefoonNummer = HandelLoginParameters.TelefoonNummer
-	
-	Quit KlantData
-]]></Implementation>
-</Method>
-
 <Method name="BewaarKlant">
 <FormalSpec>Personality:DOM.common.Personality,KlantData:DOM.common.dto.HandelKlantData</FormalSpec>
 <Private>1</Private>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r45479 -r45480
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45479)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45480)
@@ -188,10 +188,10 @@
 <Method name="GeefHandelKlantDataVoorDecrypteer">
 <FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
 <Private>1</Private>
-<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
+<ReturnType>DOM.VKP.impl.HandelKlantData</ReturnType>
 <Implementation><![CDATA[
 	#dim HandelLoginParameters As WSimpl.Unishop.Login.ParametersHandel = LoginParameters	
-	Set KlantData = ##class(DOM.common.dto.HandelKlantData).%New()
+	Set KlantData = ##class(DOM.VKP.impl.HandelKlantData).%New()
 	Set KlantData.Naam = HandelLoginParameters.KlantNaam
 	Set KlantData.ID = LoginParameters.KlantID
 	Set KlantData.Taal = HandelLoginParameters.Taal