Index: vhTest/Fake/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml
===================================================================
diff -u -r38997 -r39220
--- vhTest/Fake/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 38997)
+++ vhTest/Fake/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 39220)
@@ -22,13 +22,11 @@
 </Method>
 
 <Method name="VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 
 <Method name="VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX">
-<Implementation><![CDATA[
-]]></Implementation>
+<Implementation><![CDATA[]]></Implementation>
 </Method>
 </Class>
 
Index: ECONimpl/PM/Maatwerk/EdiConverter/EdiNaarEcon.cls.xml
===================================================================
diff -u
--- ECONimpl/PM/Maatwerk/EdiConverter/EdiNaarEcon.cls.xml	(revision 0)
+++ ECONimpl/PM/Maatwerk/EdiConverter/EdiNaarEcon.cls.xml	(revision 39220)
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="ECONimpl.PM.Maatwerk.EdiConverter.EdiNaarEcon">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Converter">
+<Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConverterData">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Converter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	Set ..ConverterData = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Converteer">
+<FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
+<ReturnType>ECON.PM.Maatwerk.dto.TbxKenmerken</ReturnType>
+<Implementation><![CDATA[
+	Set Eigenschappen = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
+	Do ..Converter.Convert(Product,Eigenschappen,..LadeEigenschappenConverteerOptiesEdiNaarEconTBX)
+	
+	Set Eigenschappen.DwarsverdelingAantal = Product.AantalDwarsverdelingen
+	Set Eigenschappen.GreepEnMeenemer = $Case(Product.GreepEnMeenemer,"No":"Zonder","Handle":"Greep","HandleAndLatch":"Meenemer",:"Zonder")
+	Set Eigenschappen.ZijwandVerhogingType = $Case(Product.ZijwandVerhogingType,"NoGallery":"Laag","SimpleGallery":"Reling","DesignElement":"InschuifElement",:"Laag")
+	Set Eigenschappen.HeeftAfwijkendeRughoogte = $$$False
+	Set Eigenschappen.Toepassing = Product.Klasse
+	
+	Quit Eigenschappen
+]]></Implementation>
+</Method>
+
+<Property name="LadeEigenschappenConverteerOptiesEdiNaarEconTBX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="LadeEigenschappenConverteerOptiesEdiNaarEconTBXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	Set r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX = $$$LazyLoad(r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX,..VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX())
+	Quit r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX
+]]></Implementation>
+</Method>
+
+<Method name="VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX">
+<Implementation><![CDATA[
+	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties("ECON.PM.Maatwerk.dto.TbxKenmerken")
+	Set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
+	While PropertyIterator.HasNext() {
+		#dim PropertyName As %String = PropertyIterator.Next()
+		Continue:PropertyName="DwarsverdelingAantal"
+		Continue:PropertyName="Familie"
+		Continue:PropertyName="FrontHouderKleur"
+		Continue:PropertyName="FrontOndersteuningType"
+		Continue:PropertyName="HangmapBoringAantal"
+		Continue:PropertyName="HeeftAfwijkendeRughoogte"
+		Continue:PropertyName="LadeDesign"
+		Continue:PropertyName="PlaatMateriaal"
+		Continue:PropertyName="ProductieWijze"
+		Continue:PropertyName="RugKleur"
+		Continue:PropertyName="RughouderKleur"
+		Continue:PropertyName="Toepassing"
+		Continue:PropertyName="Variant"
+		Continue:PropertyName="ZijwandVerhogingInschuifelementKleur"
+		Continue:PropertyName="ZijwandVerhogingRelingKleur"
+		
+		Do ..ConverterData.Add(PropertyName,PropertyName)
+	}
+	Do ..ConverterData.Add("ZijwandVerhogingKleur","ZijwandVerhogingRelingKleur")
+	
+	Quit ..ConverterData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml
===================================================================
diff -u -r38997 -r39220
--- vhTest/Mock/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 38997)
+++ vhTest/Mock/ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 39220)
@@ -22,16 +22,6 @@
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("ConverteerEdiNaarEcon",Product)
 ]]></Implementation>
 </Method>
-
-<Method name="VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX")
-]]></Implementation>
-</Method>
-
-<Method name="VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX">
-<Implementation><![CDATA[	do ..VerwerkMethodCall("VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX")
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: ECONimpl/PM/Maatwerk/EdiConverter/EconNaarEdi.cls.xml
===================================================================
diff -u
--- ECONimpl/PM/Maatwerk/EdiConverter/EconNaarEdi.cls.xml	(revision 0)
+++ ECONimpl/PM/Maatwerk/EdiConverter/EconNaarEdi.cls.xml	(revision 39220)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="ECONimpl.PM.Maatwerk.EdiConverter.EconNaarEdi">
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="Converter">
+<Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConverterData">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Converter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
+	Set ..ConverterData = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Converteer">
+<FormalSpec>Product:ECON.PM.Maatwerk.dto.TbxKenmerken</FormalSpec>
+<ReturnType>APPS.EDI.common.dto.v001.LadeTBX</ReturnType>
+<Implementation><![CDATA[
+	Set Eigenschappen = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
+	Do ..Converter.Convert(Product,Eigenschappen,..LadeEigenschappenConverteerOptiesEconNaarEdiTBX)
+	
+	Set Eigenschappen.HeeftDwarsverdeling = $$$If(+Product.DwarsverdelingAantal>0,$$$True,$$$False)
+	Set Eigenschappen.HeeftMat = $$$If($$$HasLength(Product.MatMateriaal),$$$True,$$$False)
+	Set Eigenschappen.Klasse = Product.Toepassing
+	Set Eigenschappen.Type = "TBX"
+	Set Eigenschappen.GreepEnMeenemer = $Case(Product.GreepEnMeenemer,"Zonder":"No","Greep":"Handle","Meenemer":"HandleAndLatch",:"No")
+	Set Eigenschappen.ZijwandVerhogingType = $Case(Product.ZijwandVerhogingType,"Laag":"NoGallery","Reling":"SimpleGallery","InschuifElement":"DesignElement",:"NoGallery")
+	Set Eigenschappen.AantalDwarsverdelingen = Product.DwarsverdelingAantal
+	
+	Quit Eigenschappen
+]]></Implementation>
+</Method>
+
+<Property name="LadeEigenschappenConverteerOptiesEconNaarEdiTBX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="LadeEigenschappenConverteerOptiesEconNaarEdiTBXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	Set r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX = $$$LazyLoad(r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX,..VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX())
+	Quit r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX
+]]></Implementation>
+</Method>
+
+<Method name="VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX">
+<Implementation><![CDATA[
+	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties("APPS.EDI.common.dto.v001.LadeTBX")
+	Set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
+	While PropertyIterator.HasNext() {
+		#dim PropertyName As %String = PropertyIterator.Next()
+		Continue:PropertyName="AantalDwarsverdelingen"
+		Continue:PropertyName="HeeftDwarsverdeling"
+		Continue:PropertyName="HeeftMat"
+		Continue:PropertyName="Klasse"
+		Continue:PropertyName="TussenrugMateriaal"
+		Continue:PropertyName="Type"
+		Continue:PropertyName="UitsparingDataAantalUitsparingen"
+		Continue:PropertyName="UitsparingDataBreedteM"
+		Continue:PropertyName="UitsparingDataBreedteX"
+		Continue:PropertyName="UitsparingDataBreedteY"
+		Continue:PropertyName="UitsparingDataBreedteZ1"
+		Continue:PropertyName="UitsparingDataBreedteZ2"
+		Continue:PropertyName="ZijwandVerhogingKleur"
+		Continue:PropertyName="ZijwandVerhogingRelingKleur"
+		
+		Do ..ConverterData.Add(PropertyName,PropertyName)
+	}
+	Do ..ConverterData.Add("ZijwandVerhogingRelingKleur","ZijwandVerhogingKleur")
+	
+	Quit ..ConverterData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: ECONimpl/PM/Maatwerk/EdiConverter.cls.xml
===================================================================
diff -u -r38997 -r39220
--- ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 38997)
+++ ECONimpl/PM/Maatwerk/EdiConverter.cls.xml	(.../EdiConverter.cls.xml)	(revision 39220)
@@ -3,150 +3,25 @@
 <Class name="ECONimpl.PM.Maatwerk.EdiConverter">
 <Super>TECH.Mockable</Super>
 
-<Property name="Converter">
-<Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ConverterData">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	Set ..Converter = ##class(TECH.ObjectUtils.impl.ObjectConverter).%New()
-	Set ..ConverterData = ##class(TECH.ObjectUtils.ObjectConvertData).%New()
-	Quit $$$OK
-]]></Implementation>
-</Method>
-
 <Method name="ConverteerEconNaarEdi">
 <FormalSpec>Product:ECON.PM.Maatwerk.dto.TbxKenmerken</FormalSpec>
 <ReturnType>APPS.EDI.common.dto.v001.LadeTBX</ReturnType>
 <Implementation><![CDATA[
-	Set Eigenschappen = ##class(APPS.EDI.common.dto.v001.LadeTBX).%New()
-	Do ..Converter.Convert(Product,Eigenschappen,..LadeEigenschappenConverteerOptiesEconNaarEdiTBX)
+	Set EconNaarEdiConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter.EconNaarEdi).%New()
 	
-	Set Eigenschappen.HeeftDwarsverdeling = $$$If(+Product.DwarsverdelingAantal>0,$$$True,$$$False)
-	Set Eigenschappen.HeeftMat = $$$If($$$HasLength(Product.MatMateriaal),$$$True,$$$False)
-	Set Eigenschappen.Klasse = Product.Toepassing
-	Set Eigenschappen.Type = "TBX"
-	Set Eigenschappen.GreepEnMeenemer = $Case(Product.GreepEnMeenemer,"Zonder":"No","Greep":"Handle","Meenemer":"HandleAndLatch",:"No")
-	Set Eigenschappen.ZijwandVerhogingType = $Case(Product.ZijwandVerhogingType,"Laag":"NoGallery","Reling":"SimpleGallery","InschuifElement":"DesignElement",:"NoGallery")
-	Set Eigenschappen.AantalDwarsverdelingen = Product.DwarsverdelingAantal
-	
-	Quit Eigenschappen
+	Quit EconNaarEdiConverter.Converteer(Product)
 ]]></Implementation>
 </Method>
 
 <Method name="ConverteerEdiNaarEcon">
 <FormalSpec>Product:APPS.EDI.common.dto.v001.LadeTBX</FormalSpec>
 <ReturnType>ECON.PM.Maatwerk.dto.TbxKenmerken</ReturnType>
 <Implementation><![CDATA[
-	Set Eigenschappen = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
-	Do ..Converter.Convert(Product,Eigenschappen,..LadeEigenschappenConverteerOptiesEdiNaarEconTBX)
+	Set EdiNaarEconConverter = ##class(ECONimpl.PM.Maatwerk.EdiConverter.EdiNaarEcon).%New()
 	
-	Set Eigenschappen.DwarsverdelingAantal = Product.AantalDwarsverdelingen
-	Set Eigenschappen.GreepEnMeenemer = $Case(Product.GreepEnMeenemer,"No":"Zonder","Handle":"Greep","HandleAndLatch":"Meenemer",:"Zonder")
-	Set Eigenschappen.ZijwandVerhogingType = $Case(Product.ZijwandVerhogingType,"NoGallery":"Laag","SimpleGallery":"Reling","DesignElement":"InschuifElement",:"Laag")
-	Set Eigenschappen.HeeftAfwijkendeRughoogte = $$$False
-	Set Eigenschappen.Toepassing = Product.Klasse
-	
-	Quit Eigenschappen
+	Quit EdiNaarEconConverter.Converteer(Product)
 ]]></Implementation>
 </Method>
-
-<Property name="LadeEigenschappenConverteerOptiesEconNaarEdiTBX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="LadeEigenschappenConverteerOptiesEconNaarEdiTBXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	Set r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX = $$$LazyLoad(r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX,..VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX())
-	Quit r%LadeEigenschappenConverteerOptiesEconNaarEdiTBX
-]]></Implementation>
-</Method>
-
-<Method name="VerzamelLadeEigenschappenConverteerOptiesEconNaarEdiTBX">
-<Implementation><![CDATA[
-	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties("APPS.EDI.common.dto.v001.LadeTBX")
-	Set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
-	While PropertyIterator.HasNext() {
-		#dim PropertyName As %String = PropertyIterator.Next()
-		Continue:PropertyName="AantalDwarsverdelingen"
-		Continue:PropertyName="HeeftDwarsverdeling"
-		Continue:PropertyName="HeeftMat"
-		Continue:PropertyName="Klasse"
-		Continue:PropertyName="TussenrugMateriaal"
-		Continue:PropertyName="Type"
-		Continue:PropertyName="UitsparingDataAantalUitsparingen"
-		Continue:PropertyName="UitsparingDataBreedteM"
-		Continue:PropertyName="UitsparingDataBreedteX"
-		Continue:PropertyName="UitsparingDataBreedteY"
-		Continue:PropertyName="UitsparingDataBreedteZ1"
-		Continue:PropertyName="UitsparingDataBreedteZ2"
-		Continue:PropertyName="ZijwandVerhogingKleur"
-		Continue:PropertyName="ZijwandVerhogingRelingKleur"
-		
-		Do ..ConverterData.Add(PropertyName,PropertyName)
-	}
-	Do ..ConverterData.Add("ZijwandVerhogingRelingKleur","ZijwandVerhogingKleur")
-	
-	Quit ..ConverterData
-]]></Implementation>
-</Method>
-
-<Property name="LadeEigenschappenConverteerOptiesEdiNaarEconTBX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="LadeEigenschappenConverteerOptiesEdiNaarEconTBXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	Set r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX = $$$LazyLoad(r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX,..VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX())
-	Quit r%LadeEigenschappenConverteerOptiesEdiNaarEconTBX
-]]></Implementation>
-</Method>
-
-<Method name="VerzamelLadeEigenschappenConverteerOptiesEdiNaarEconTBX">
-<Implementation><![CDATA[
-	#dim Properties As %ListOfDataTypes = ##class(TECH.ClassUtils).GeefProperties("ECON.PM.Maatwerk.dto.TbxKenmerken")
-	Set PropertyIterator = ##class(TECH.ListIterator).%New(Properties)
-	While PropertyIterator.HasNext() {
-		#dim PropertyName As %String = PropertyIterator.Next()
-		Continue:PropertyName="DwarsverdelingAantal"
-		Continue:PropertyName="Familie"
-		Continue:PropertyName="FrontHouderKleur"
-		Continue:PropertyName="FrontOndersteuningType"
-		Continue:PropertyName="HangmapBoringAantal"
-		Continue:PropertyName="HeeftAfwijkendeRughoogte"
-		Continue:PropertyName="LadeDesign"
-		Continue:PropertyName="PlaatMateriaal"
-		Continue:PropertyName="ProductieWijze"
-		Continue:PropertyName="RugKleur"
-		Continue:PropertyName="RughouderKleur"
-		Continue:PropertyName="Toepassing"
-		Continue:PropertyName="Variant"
-		Continue:PropertyName="ZijwandVerhogingInschuifelementKleur"
-		Continue:PropertyName="ZijwandVerhogingRelingKleur"
-		
-		Do ..ConverterData.Add(PropertyName,PropertyName)
-	}
-	Do ..ConverterData.Add("ZijwandVerhogingKleur","ZijwandVerhogingRelingKleur")
-	
-	Quit ..ConverterData
-]]></Implementation>
-</Method>
 </Class>