Index: vhTest/Mock/APPS/EDI/common/impl/ProductConverter.cls.xml
===================================================================
diff -u
--- vhTest/Mock/APPS/EDI/common/impl/ProductConverter.cls.xml	(revision 0)
+++ vhTest/Mock/APPS/EDI/common/impl/ProductConverter.cls.xml	(revision 36971)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.APPS.EDI.common.impl.ProductConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EDI.common.impl.ProductConverter,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Convert">
+<FormalSpec>Product:APPS.EDI.common.dto.Product,Opties:TECH.KeyValue.List</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Convert",Product,Opties)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml
===================================================================
diff -u -r36968 -r36971
--- vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 36968)
+++ vhUnitTest/APPS/EDI/common/impl/ProductConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 36971)
@@ -6,14 +6,13 @@
 <Method name="Test LBX, klant 1000">
 <Implementation><![CDATA[
 	#dim Product As APPS.EDI.common.dto.v001.LadeLBX = ##class(vhTest.Utils.APPS.EDI.common.dto.LadeLBX).StandaardLade()
-	Set Resultaat = ##class(APPS.PM.Maatwerk.dto.LBXKenmerken).%New()
 	
 	#dim ConvertOpties As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
 	Do ConvertOpties.InsertKeyValue("KlantID","K||1000")
 	Do ConvertOpties.InsertKeyValue("PersonalityID","1")
 	
 	Set ProductConverter = ##class(APPS.EDI.common.impl.ProductConverter).%New()
-	Set Resultaat = ProductConverter.Convert(Product,Resultaat,ConvertOpties)
+	#dim Resultaat As APPS.PM.Maatwerk.dto.LBXKenmerken = ProductConverter.Convert(Product,ConvertOpties)
 	
 	Set Enum = ##class(DOM.PM.Maatwerk.LBX.impl.BaseEnums).%New()
 	Do $$$AssertEquals(Resultaat.AantalDwarsverdelingen,"")
Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml
===================================================================
diff -u -r36815 -r36971
--- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 36815)
+++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml	(.../Test.cls.xml)	(revision 36971)
@@ -79,17 +79,18 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(1)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(1)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -106,17 +107,18 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(2)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(2)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -132,16 +134,17 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(0)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(0)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -158,16 +161,17 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(0)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(0)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -185,17 +189,18 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen	
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
 	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(1)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(1)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -215,17 +220,18 @@
 	#dim Aanvraag As APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag = ..GeefAanvraag()
 	Set Aanvraag.Order.Lijnen = Orderlijnen
 	
-	Set ProductConverterStub = ##class(vhTest.Mock.TECH.Object.ObjectConverter).%New()
+	Set ProductConverterStub = ##class(vhTest.Mock.APPS.EDI.common.impl.ProductConverter).%New()
 	Do ProductConverterStub.IndienMethodCall("Convert",$$$ElkeWaarde,$$$ElkeWaarde).DanReturn($$$NULLOREF)
-	Set OfferteServiceStub = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
-	#dim OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do OfferteServiceStub.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
-	Do OfferteServiceStub.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(3)
-	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceStub)
+	
+	Set OfferteServiceMock = ##class(vhTest.Mock.APPS.VKP.OfferteService).%New()
+	Set OfferteStub = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
+	Do OfferteServiceMock.VerwachtMethodCall("GeefOfferte","OfferteID").DanReturn(OfferteStub)
+	Do OfferteServiceMock.VerwachtMethodCall("VoegToeMaatwerk",OfferteStub,$$$ElkeWaarde,"","").ExactAantalKeer(3)
+	Set UnishopBesteller = ##class(APPS.EDI.Bestel.impl.BestelService.UnishopBesteller).%New(ExterneVerkoopServiceMock, ProductConverterStub, OfferteServiceMock)
 	#dim Resultaat As APPS.EDI.Bestel.BestelService.UnishopBesteller.PlaatsBestelling.Resultaat = UnishopBesteller.MaakOfferte(Aanvraag)
 	
 	Do ExterneVerkoopServiceMock.Verifieer()
-	Do OfferteServiceStub.Verifieer()
+	Do OfferteServiceMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml
===================================================================
diff -u -r36788 -r36971
--- APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 36788)
+++ APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml	(.../UnishopBesteller.cls.xml)	(revision 36971)
@@ -149,7 +149,7 @@
 	#dim ConvertOpties As TECH.KeyValue.List = ##class(TECH.KeyValue.List).%New()
 	Do ConvertOpties.InsertKeyValue("KlantID",..Aanvraag.Header.KlantID)
 	Do ConvertOpties.InsertKeyValue("PersonalityID",..Aanvraag.Header.PersonalityID)
-	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ProductConverter.Convert(Lijn.Product,,ConvertOpties)
+	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ProductConverter.Convert(Lijn.Product,ConvertOpties)
 	Do ..OfferteService.VoegToeMaatwerk(..OfferteService.GeefOfferte(OfferteID),IngegevenKenmerken,Lijn.Aantal,Lijn.Referentie)
 ]]></Implementation>
 </Method>
Index: vhTest/Fake/APPS/EDI/common/impl/ProductConverter.cls.xml
===================================================================
diff -u
--- vhTest/Fake/APPS/EDI/common/impl/ProductConverter.cls.xml	(revision 0)
+++ vhTest/Fake/APPS/EDI/common/impl/ProductConverter.cls.xml	(revision 36971)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.APPS.EDI.common.impl.ProductConverter">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>APPS.EDI.common.impl.ProductConverter</Super>
+
+<Method name="Convert">
+<FormalSpec>Product:APPS.EDI.common.dto.Product,Opties:TECH.KeyValue.List</FormalSpec>
+<ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: APPS/EDI/common/impl/ProductConverter.cls.xml
===================================================================
diff -u -r36966 -r36971
--- APPS/EDI/common/impl/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 36966)
+++ APPS/EDI/common/impl/ProductConverter.cls.xml	(.../ProductConverter.cls.xml)	(revision 36971)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.EDI.common.impl.ProductConverter">
-<Super>TECH.Object.ObjectConverter</Super>
+<Super>TECH.Mockable</Super>
 
 <Property name="ObjectConverter">
 <Type>TECH.ObjectUtils.impl.ObjectConverter</Type>
@@ -18,6 +18,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PersonalityID">
+<Type>DOM.common.enu.Personality</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
@@ -32,41 +37,8 @@
 ]]></Implementation>
 </Method>
 
-<Property name="PersonalityID">
-<Type>DOM.common.enu.Personality</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="ConvertDataTAX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ConvertDataTAXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	set r%ConvertDataTAX = $$$LazyLoad(r%ConvertDataTAX,..GeefConvertDataTAX())
-	quit r%ConvertDataTAX
-]]></Implementation>
-</Method>
-
-<Property name="ConvertDataLBX">
-<Type>TECH.ObjectUtils.ObjectConvertData</Type>
-<Private>1</Private>
-</Property>
-
-<Method name="ConvertDataLBXGet">
-<Private>1</Private>
-<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
-<Implementation><![CDATA[
-	set r%ConvertDataLBX = $$$LazyLoad(r%ConvertDataLBX,..GeefConvertDataLBX())
-	quit r%ConvertDataLBX
-]]></Implementation>
-</Method>
-
 <Method name="Convert">
-<FormalSpec><![CDATA[Product:APPS.EDI.common.dto.Product,&IngegevenKenmerken:APPS.PM.Maatwerk.dto.IngegevenKenmerken,Opties:TECH.KeyValue.List]]></FormalSpec>
+<FormalSpec>Product:APPS.EDI.common.dto.Product,Opties:TECH.KeyValue.List</FormalSpec>
 <ReturnType>APPS.PM.Maatwerk.dto.IngegevenKenmerken</ReturnType>
 <Implementation><![CDATA[
 	#dim KlantID As %String
@@ -82,7 +54,7 @@
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("Verkeerde PersonalityID"))
 	}
 	
-	Set IngegevenKenmerken  = ..ConverteerNaarIngegevenKenmerken(Product)
+	#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..ConverteerNaarIngegevenKenmerken(Product)
 	Do ..VervolledigIngegevenKenmerken(IngegevenKenmerken,KlantID)
 	Quit IngegevenKenmerken
 ]]></Implementation>
@@ -192,7 +164,6 @@
 <Implementation><![CDATA[
 	#dim ConvertData As TECH.ObjectUtils.ObjectConvertData = ..GeefConvertDataLadeCommon()
 	
-	// LadeTAX (specifiek) 
 	Do ConvertData.Add("LadeKleur","KantenbandKleur")
 	Do ConvertData.Add("LadeBinnenKleur",)
 	Do ConvertData.Add("FrontEindkapKleur",)
@@ -210,7 +181,6 @@
 <Implementation><![CDATA[
 	#dim ConvertData As TECH.ObjectUtils.ObjectConvertData = ..GeefConvertDataLadeCommon()
 	
-	// LadeLBX (specifiek) 
 	Do ConvertData.Add("Klasse",)
 	Do ConvertData.Add("ZijwandType","ZijWandType")
 	Do ConvertData.Add("VoorwandTypeVanCBinnenlade","VoorWandTypeVanCBinnenlade")
@@ -254,6 +224,34 @@
 	Quit ConvertData
 ]]></Implementation>
 </Method>
+
+<Property name="ConvertDataTAX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ConvertDataTAXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	set r%ConvertDataTAX = $$$LazyLoad(r%ConvertDataTAX,..GeefConvertDataTAX())
+	quit r%ConvertDataTAX
+]]></Implementation>
+</Method>
+
+<Property name="ConvertDataLBX">
+<Type>TECH.ObjectUtils.ObjectConvertData</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="ConvertDataLBXGet">
+<Private>1</Private>
+<ReturnType>TECH.ObjectUtils.ObjectConvertData</ReturnType>
+<Implementation><![CDATA[
+	set r%ConvertDataLBX = $$$LazyLoad(r%ConvertDataLBX,..GeefConvertDataLBX())
+	quit r%ConvertDataLBX
+]]></Implementation>
+</Method>
 </Class>