Index: APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml
===================================================================
diff -u -r38452 -r38486
--- APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 38452)
+++ APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 38486)
@@ -55,7 +55,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService,##class(APPS.EC.Verkoop.impl.Externe.VerkoopService).%New())
+	Set ..ExterneVerkoopService = $$$Inject(ExterneVerkoopService,##class(APPS.EC.Verkoop.impl.Edi.VerkoopService).%New())
 	Set ..ProductConverter = $$$Inject(ProductConverter,##class(APPS.EDI.common.impl.ProductConverter).%New())
 	Set ..OfferteService = $$$Inject(OfferteService, ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefOfferteService())
 	Set ..ProductRepository = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller.ProductRepository).%New()	
Index: DOM/EC/Winkelkar/ExterneWinkelkar.cls.xml
===================================================================
diff -u -r29059 -r38486
--- DOM/EC/Winkelkar/ExterneWinkelkar.cls.xml	(.../ExterneWinkelkar.cls.xml)	(revision 29059)
+++ DOM/EC/Winkelkar/ExterneWinkelkar.cls.xml	(.../ExterneWinkelkar.cls.xml)	(revision 38486)
@@ -37,15 +37,14 @@
 
 <Method name="GeefApplicatieType">
 <ReturnType>APPS.common.enu.ApplicatieType</ReturnType>
-<Implementation><![CDATA[	Quit ##class(APPS.common.enu.ApplicatieType).Extern()
+<Implementation><![CDATA[	Quit $$$If(##super()="",##class(APPS.common.enu.ApplicatieType).Extern(),##super())
 ]]></Implementation>
 </Method>
 
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DefaultData>ExterneWinkelkarDefaultData</DefaultData>
 <Data name="ExterneWinkelkarDefaultData">
-<Structure>listnode</Structure>
 <Subscript>"ExterneWinkelkar"</Subscript>
 <Value name="1">
 <Value>BewaarExpliciet</Value>
Index: DOM/EC/Winkelkar/impl/WinkelkarRepository.cls.xml
===================================================================
diff -u -r37493 -r38486
--- DOM/EC/Winkelkar/impl/WinkelkarRepository.cls.xml	(.../WinkelkarRepository.cls.xml)	(revision 37493)
+++ DOM/EC/Winkelkar/impl/WinkelkarRepository.cls.xml	(.../WinkelkarRepository.cls.xml)	(revision 38486)
@@ -13,10 +13,15 @@
 <ReturnType>TECH.Persistent</ReturnType>
 <Implementation><![CDATA[
 	If (Type = ##class(APPS.common.enu.ApplicatieType).Intern()) {
-		Quit ##class(DOM.EC.Winkelkar.InterneWinkelkar).%New(ApplicatieID)
+		Set Winkelkar = ##class(DOM.EC.Winkelkar.InterneWinkelkar).%New(ApplicatieID)
 	} ElseIf (Type = ##class(APPS.common.enu.ApplicatieType).Extern()) {
-		Quit ##class(DOM.EC.Winkelkar.ExterneWinkelkar).%New(ApplicatieID)
+		Set Winkelkar = ##class(DOM.EC.Winkelkar.ExterneWinkelkar).%New(ApplicatieID)
+	} ElseIf (Type = ##class(APPS.common.enu.ApplicatieType).Edi()) {
+		Set Winkelkar = ##class(DOM.EC.Winkelkar.ExterneWinkelkar).%New(ApplicatieID)
 	} 
+	Set Winkelkar.ApplicatieType = Type
+	Quit Winkelkar
+	
 	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Voor dit type winkelkar ("_Type_" "_ApplicatieID_") is nog geen implementatie voorzien."))
 ]]></Implementation>
 </Method>