Index: APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml
===================================================================
diff -u -r73543 -r74924
--- APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 73543)
+++ APPS/PM/Maatwerk/impl/VhConfigHelper.cls.xml	(.../VhConfigHelper.cls.xml)	(revision 74924)
@@ -39,17 +39,17 @@
 <Method name="GeefHalffabrikatenListIterator">
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	If $$$Not($$$HasLength(..VhConfig.CustomBuildDetails.Halffabrikaten)) {
+	If $$$Not($$$HasLength(..VhConfig.ConfiguredProductDetails.SemiFinishedProducts)) {
 		Quit ##class(TECH.ListIterator).%New(##class(%ArrayOfObjects).%New())
 	}
 	
-	Quit ##class(TECH.ListIterator).%New(..VhConfig.CustomBuildDetails.Halffabrikaten)
+	Quit ##class(TECH.ListIterator).%New(..VhConfig.ConfiguredProductDetails.SemiFinishedProducts)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefVerwijderdeHalffabItems">
 <ReturnType>%ListOfDataTypes</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.CustomBuildDetails.VerwijderdeHalffabItems
+<Implementation><![CDATA[	Quit ..VhConfig.ConfiguredProductDetails.RemovedSemiFinishedProducts
 ]]></Implementation>
 </Method>
 
@@ -61,6 +61,12 @@
 	If (..VhConfig.Model = "M_LBX") {
 		Set LbxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.LbxKenmerken).%New()
 		Set IngegevenKenmerken = LbxConverter.Converteer(..VhConfig)
+	} ElseIf (..VhConfig.Model = "M_MVX") {
+		Set MvxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.MvxKenmerken).%New()
+		Set IngegevenKenmerken = MvxConverter.Converteer(..VhConfig)
+	} ElseIf (..VhConfig.Model = "M_TBX") {
+		Set TbxConverter = ##class(APPS.PM.Maatwerk.impl.VhConfig.Converter.EncowayNaarDom.TbxKenmerken).%New()
+		Set IngegevenKenmerken = TbxConverter.Converteer(..VhConfig)
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw("Er is nog geen implementatie voor het ophalen van de kenmerken van model " _ ..VhConfig.Model _ ".")	
 	}
@@ -74,7 +80,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim LangtekstInTaal As %String = ""
-	Set TaalIterator = ##class(TECH.ListIterator).%New(..VhConfig.CalculatedCharacteristics.Langtekst)
+	Set TaalIterator = ##class(TECH.ListIterator).%New(..VhConfig.CalculatedCharacteristics.DescriptionLong)
 	
 	While (TaalIterator.HasNext() && (LangtekstInTaal = ""))
 	{
@@ -91,7 +97,7 @@
 
 <Method name="GeefKorttekst">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.Korttekst
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.DescriptionShort
 ]]></Implementation>
 </Method>
 
@@ -133,13 +139,13 @@
 
 <Method name="GeefGenerischProductId">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GeefIdentNummerVanHalffab(..VhConfig.CalculatedCharacteristics.GenerischProductId)
+<Implementation><![CDATA[	Quit ..GeefIdentNummerVanHalffab(..VhConfig.CalculatedCharacteristics.GenericProductId)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAfbeeldingCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.AfbeeldingCode
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.ImageCode
 ]]></Implementation>
 </Method>
 
@@ -151,7 +157,7 @@
 
 <Method name="GeefDossierCode">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.DossierCode
+<Implementation><![CDATA[	Quit ..VhConfig.CalculatedCharacteristics.ConfiguredProductCode
 ]]></Implementation>
 </Method>