Index: WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter.cls.xml
===================================================================
diff -u -r39600 -r39616
--- WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter.cls.xml	(.../EconConfiguratieConverter.cls.xml)	(revision 39600)
+++ WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter.cls.xml	(.../EconConfiguratieConverter.cls.xml)	(revision 39616)
@@ -35,9 +35,9 @@
 	Set EconConfiguratieAsObject.IngegevenKenmerken = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
 	Do EconConfiguratieAsObject.IngegevenKenmerken.FromArray(EconConfiguratie)
 	
-	Set EconConfiguratieAsObject.Aantal = EconConfiguratie.GetAt("Lijn.Aantal")
-	Set EconConfiguratieAsObject.Referentie = EconConfiguratie.GetAt("Lijn.Referentie")
-	Set EconConfiguratieAsObject.GroeperingCode = EconConfiguratie.GetAt("Lijn.Groeperingcode")
+	Set EconConfiguratieAsObject.Aantal = EconConfiguratie.GetAt("Data.Lijn.Aantal")
+	Set EconConfiguratieAsObject.Referentie = EconConfiguratie.GetAt("Data.Lijn.Referentie")
+	Set EconConfiguratieAsObject.GroeperingCode = EconConfiguratie.GetAt("Data.Lijn.Groeperingcode")
 	
 	#dim EdiKenmerken As APPS.EDI.common.dto.v001.LadeTBX = ..EdiConverter.ConverteerEconNaarEdi(EconConfiguratieAsObject.IngegevenKenmerken)
 	
Index: ECONimpl/PM/Maatwerk/EconPropertyBuilder.cls.xml
===================================================================
diff -u
--- ECONimpl/PM/Maatwerk/EconPropertyBuilder.cls.xml	(revision 0)
+++ ECONimpl/PM/Maatwerk/EconPropertyBuilder.cls.xml	(revision 39616)
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="ECONimpl.PM.Maatwerk.EconPropertyBuilder">
+<IncludeCode>vhLib.Class,vhLib.Macro</IncludeCode>
+<ProcedureBlock>0</ProcedureBlock>
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="arrProperties">
+<FormalSpec>ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel</FormalSpec>
+<Implementation><![CDATA[
+ set flagRequired = $get(flagRequired , "A")
+ set flagCalculated = $get(flagCalculated , "A" )
+ set flagEmbeddedOnly = $get(flagEmbeddedOnly, 0 )
+ set flagDeeperLevel = $get(flagDeeperLevel, 1 )
+ 
+ set Node = flagRequired_flagCalculated_flagEmbeddedOnly_flagDeeperLevel
+ 
+ kill arrHULP($job)
+ Kill arrXmlHulp($job)
+ kill arrProperties
+
+ 
+ if $get(^tmp.ECONPROPERTIES(ClassName,Node)) '= ##class(TECH.CompiledClassUtils).GetCompiledTimeStamp(ClassName) {
+	 kill ^tmp.ECONPROPERTIES(ClassName,Node)
+ }
+ 
+ kill ^tmp.ECONPROPERTIES
+ 
+ if '$data(^tmp.ECONPROPERTIES(ClassName,Node))	{
+	 do ..BuildarrProperties(ClassName,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel)
+	 merge ^tmp.ECONPROPERTIES(ClassName,Node) = arrProperties
+	 set ^tmp.ECONPROPERTIES(ClassName,Node) = ##class(TECH.CompiledClassUtils).GetCompiledTimeStamp(ClassName)
+ }
+ merge arrProperties=^tmp.ECONPROPERTIES(ClassName,Node)
+ quit
+]]></Implementation>
+</Method>
+
+<Method name="BuildarrProperties">
+<FormalSpec>ClassName,arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel</FormalSpec>
+<Implementation><![CDATA[
+ new IdxProperty set IdxProperty = ""
+ new objCompiledClass , Counter
+ 
+ new PropertyName , PropertyType , flagCanSave
+ 
+ set flagRequired = $get(flagRequired , "A")
+ set flagCalculated = $get(flagCalculated , "A" )
+ set flagEmbeddedOnly = $get(flagEmbeddedOnly, 0 )
+ set flagDeeperLevel = $get(flagDeeperLevel , 1)
+ 
+ set arrHULP($job,"ClassName") = $get(arrHULP($job,"ClassName"))
+ set arrXmlHulp($job,"ClassName") = $get(arrXmlHulp($job,"ClassName"))
+         
+ set objCompiledClass = ##class(%Library.CompiledClass).%OpenId(ClassName)
+ if $length(objCompiledClass) { 
+ 	for Counter = 1 : 1 : objCompiledClass.Properties.Count() { 
+ 		set flagCanSave = 1
+       	set PropertyName = objCompiledClass.Properties.GetAt(Counter).Name
+       	set XmlName = objCompiledClass.Properties.GetAt(Counter).Parameters.GetAt("XMLNAME")
+       	set PropertyType = ..Type(ClassName,PropertyName)
+       	if flagRequired '= "A" set flagCanSave = ( flagRequired = ..IsRequired(ClassName,PropertyName))
+       	if flagCanSave set flagCanSave = $extract(PropertyName)'="%"
+	   	if flagCanSave { 
+	   		if ##class(TECH.ClassUtils).IsDataType(PropertyType) || ( ##class(TECH.ClassUtils).IsEnumeratie(PropertyType)) { 
+	   			if flagCalculated '= "A" set flagCanSave = ( flagCalculated = ..IsCalculated(ClassName,PropertyName))
+            	set PropertyName = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"")_PropertyName
+            	set XmlName = $select($length(arrXmlHulp($job,"ClassName")):arrXmlHulp($job,"ClassName")_".",1:"")_XmlName
+            	if flagCanSave set arrProperties(XmlName) = ..BuildarrPropertiesListBuild(ClassName,PropertyName) 
+        	}else { 
+	           set:flagDeeperLevel'="F" flagDeeperLevel = ( ..IsEmbedded(PropertyType) && ( '$length(..Collection(ClassName,PropertyName))))
+	           if 'flagDeeperLevel set arrProperties(PropertyName) = ..BuildarrPropertiesListBuild(ClassName,PropertyName)
+    	       if ( (flagDeeperLevel ) || ( flagDeeperLevel = "F" ) ) , '..IsSwizzled(ClassName,PropertyName)  , (ClassName'=PropertyType){ 
+	           	 	set arrHULP($job,"ClassName") = $select($length(arrHULP($job,"ClassName")):arrHULP($job,"ClassName")_".",1:"") _ PropertyName
+	           	 	set arrXmlHulp($job,"ClassName") = $select($length(arrXmlHulp($job,"ClassName")):arrXmlHulp($job,"ClassName")_".",1:"") _ XmlName
+             		do ..BuildarrProperties(PropertyType,.arrProperties,flagRequired,flagCalculated,flagEmbeddedOnly,flagDeeperLevel) 
+             	}
+            }
+         }
+     }
+   }
+ set arrHULP($job,"ClassName") = $piece(arrHULP($job,"ClassName"),".",1,$length(arrHULP($job,"ClassName"),".")-1)
+ set arrXmlHulp($job,"ClassName") = $piece(arrXmlHulp($job,"ClassName"),".",1,$length(arrXmlHulp($job,"ClassName"),".")-1)
+ quit
+]]></Implementation>
+</Method>
+
+<Method name="GetXmlName">
+<FormalSpec>pd:%Dictionary.CompiledProperty</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<Implementation><![CDATA[
+	write !,pd.Parameters.GetAt("XMLNAME")
+	quit ""
+]]></Implementation>
+</Method>
+
+<Method name="BuildarrPropertiesListBuild">
+<FormalSpec>ClassName,Property</FormalSpec>
+<Implementation><![CDATA[
+ new result set result = ""
+ 
+ set:Property["." Property = $piece(Property,".",$length(Property,"."))
+ new Type set Type = ..Type(ClassName,Property)
+ 
+ set $list(result,$$$fldClassName) = Type
+ set $list(result,$$$fldIsPersistent) = ..IsPersistent(Type)
+ set $list(result,$$$fldCollection) = ..Collection(ClassName,Property)
+ set $list(result,$$$fldIsPrivate) = ..IsPrivate(ClassName,Property)
+ 
+ quit result
+]]></Implementation>
+</Method>
+
+<Method name="Type">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[
+ new result set result = ..ParameterValue(CacheObject,PropertyName,"Type",1)
+ quit result
+]]></Implementation>
+</Method>
+
+<Method name="IsRequired">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[ quit ..ParameterValue(CacheObject,PropertyName,"Required",1)
+]]></Implementation>
+</Method>
+
+<Method name="IsPrivate">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[ quit ..ParameterValue(CacheObject,PropertyName,"Private",0)
+]]></Implementation>
+</Method>
+
+<Method name="IsCalculated">
+<FormalSpec>ClassName,Property</FormalSpec>
+<Implementation><![CDATA[ quit ..ParameterValue(ClassName,Property,"Calculated",0)
+]]></Implementation>
+</Method>
+
+<Method name="Collection">
+<FormalSpec>ClassName,Property</FormalSpec>
+<Implementation><![CDATA[
+ new PropertyDefinition,ReturnType 
+
+ set PropertyDefinition = ##class(%Dictionary.CompiledProperty).%OpenId(ClassName_"||"_Property)
+ set ReturnType = PropertyDefinition.Type
+ 
+ quit:##class(TECH.ClassUtils).ClassDerivesFrom(ReturnType,"%Collection.AbstractList") 1
+ quit:##class(TECH.ClassUtils).ClassDerivesFrom(ReturnType,"%Collection.AbstractArray") 1
+  
+ quit ..ParameterValue(ClassName,Property,"Collection",0)
+]]></Implementation>
+</Method>
+
+<Method name="IsMultiDimensional">
+<FormalSpec>ClassName,Property</FormalSpec>
+<Implementation><![CDATA[ quit ..ParameterValue(ClassName,Property,"MultiDimensional",0)
+]]></Implementation>
+</Method>
+
+<Method name="IsTransient">
+<FormalSpec>ClassName,Property</FormalSpec>
+<Implementation><![CDATA[ quit +..ParameterValue(ClassName,Property,"Transient",1)
+]]></Implementation>
+</Method>
+
+<Method name="Collation">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[ quit ..ParameterValue(CacheObject,PropertyName,"COLLATION",0)
+]]></Implementation>
+</Method>
+
+<Method name="IsSwizzled">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[
+ new result set result = 0
+ new PropertyClass set PropertyClass = ..Type(CacheObject,PropertyName)
+ if PropertyClass '[ "Library" && $length(PropertyClass) && ..IsPersistent(PropertyClass) set result = 1
+ quit result
+]]></Implementation>
+</Method>
+
+<Method name="IsPersistent">
+<FormalSpec>ClassName</FormalSpec>
+<Implementation><![CDATA[ quit ##class(%Library.CompiledClass).%OpenId(ClassName).Persistent
+]]></Implementation>
+</Method>
+
+<Method name="IsEmbedded">
+<FormalSpec>ClassName</FormalSpec>
+<Implementation><![CDATA[ quit ##class(%Library.CompiledClass).%OpenId(ClassName).Serial
+]]></Implementation>
+</Method>
+
+<Method name="MaxLength">
+<FormalSpec>CacheObject,PropertyName</FormalSpec>
+<Implementation><![CDATA[
+ new result 
+ set result = ..ParameterValue(CacheObject,PropertyName,"MAXLEN",1,0)
+ quit result
+]]></Implementation>
+</Method>
+
+<Method name="ParameterValue">
+<FormalSpec>ClassName,Property,Parameter,flagFirstOccuredPositif</FormalSpec>
+<Implementation><![CDATA[
+ new arrEmbeddedProperties , oRef, IdxEmbeddedProperty set IdxEmbeddedProperty = ""
+ new result , QuitFlag set QuitFlag = 0, result = ""
+         
+ set flagFirstOccuredPositif = $get(flagFirstOccuredPositif,0)
+ 
+ do ..arrEmbeddedProperties(ClassName,Property,.arrEmbeddedProperties)
+ 
+ for  set IdxEmbeddedProperty = $order(arrEmbeddedProperties(IdxEmbeddedProperty)) quit:IdxEmbeddedProperty=""  quit:QuitFlag  do
+ . set ClassName = $piece(arrEmbeddedProperties(IdxEmbeddedProperty),"#",1)
+ . set Property = $piece(arrEmbeddedProperties(IdxEmbeddedProperty),"#",2)
+ . set oRef = ##class(%Library.CompiledProperty).%OpenId(ClassName_"."_Property)
+ . set result = $zobjProperty(oRef,Parameter)
+ . if flagFirstOccuredPositif, result = 1 set QuitFlag = 1
+ . set oRef = ""
+ 
+ quit result
+]]></Implementation>
+</Method>
+
+<Method name="arrEmbeddedProperties">
+<FormalSpec>ClassName,Property,arrEmbeddedProperties</FormalSpec>
+<Implementation><![CDATA[
+ do ..BuildarrEmbeddedProperties(ClassName,Property,.arrEmbeddedProperties)
+ quit
+]]></Implementation>
+</Method>
+
+<Method name="BuildarrEmbeddedProperties">
+<FormalSpec>ClassName,Property,arrEmbeddedProperties</FormalSpec>
+<Implementation><![CDATA[
+ new QuitFlag set QuitFlag = 0
+ new Counter set Counter = 1
+ new objClass
+ 
+ while 'QuitFlag
+  { if ##class(%Library.CompiledProperty).%ExistsId(ClassName_"."_$piece(Property,".",Counter))
+     { set objClass = ##class(%Library.CompiledProperty).%OpenId(ClassName_"."_$piece(Property,".",Counter)) 
+       do ..add2arrEmbeddedProperties(ClassName,$piece(Property,".",Counter),.arrEmbeddedProperties)
+       if objClass.Type [ "Library" 
+        { set QuitFlag = 1 }
+       else 
+        { set ClassName = objClass.Type
+          set Counter = Counter + 1 
+          if $piece(Property,".",Counter)="" set QuitFlag = 1
+          if $length(Property,".") = 1  set QuitFlag = 1 
+        } 
+     }
+    else { set QuitFlag = 1 }
+  }
+ quit
+]]></Implementation>
+</Method>
+
+<Method name="add2arrEmbeddedProperties">
+<FormalSpec>ClassName,Property,arrEmbeddedProperties</FormalSpec>
+<Implementation><![CDATA[
+ new ItemIndex set ItemIndex = $order(arrEmbeddedProperties(""),-1) + 1
+ set arrEmbeddedProperties(ItemIndex) = ClassName _ "#" _ Property
+ quit
+]]></Implementation>
+</Method>
+
+<UDLText name="T">
+<Content><![CDATA[
+/* 
+CopyProperties(oRefFrom,oRefTo,arrProperties)
+ new IdxProperty set Property = ""
+ for  set Property = $order(arrProperties(Property)) quit:Property=""  do
+ . quit:$length($listget(arrProperties(Property),$$$fldCollection))  // voorlopig stoppen indien het gaat over een list of nen array
+ . do SetValueInMem(oRefTo,Property,$$ValueInMem(oRefFrom,Property))
+ quit
+ 
+ ;----------------------------------------------------------------------------------------------------  
+ 
+SetValueInMem(oRef,Property,Value)
+ if $length(oRef)
+  { if $$IsSwizzled(oRef.%ClassName(1),Property) { do $zobjMethod(oRef,Property_"SetObjectId",Value) }
+    else  { xecute "set oRef."_Property_" = Value" } }
+ quit
+ 
+ ; ------------------------------------------------------------------------------------------------
+ValueInMem(oRef,Property)
+ new result set result = ""
+ 
+ if $$IsSwizzled(oRef.%ClassName(1),Property) { set result = $zobjMethod(oRef,Property_"GetObjectId") }
+ else { if $length(Property,".") > 0 { xecute "set result = oRef."_Property }
+    else { set result = $zobjProperty(oRef,Property) }   }
+  
+ quit result 
+ 
+ 
+arrDerivedClasses(ClassName,arrClasses)
+	new itClasses , Class
+	set itClasses = $$itDerivedClasses(ClassName)
+	while itClasses.HasNext() {
+		set Class = itClasses.Next()
+		set arrClasses(Class)=Class
+	}
+	quit
+	
+itDerivedClasses(ClassName)
+	new qHandler , List
+	set List = ##class(%ListOfDataTypes).%New()
+	set qHandler = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
+	do qHandler.Execute(ClassName)
+	while qHandler.Next() { 
+		do List.Insert(qHandler.GetData(1))
+	}
+	quit ##class(TECH.ListIterator).%New(List)
+
+*/
+]]></Content>
+</UDLText>
+</Class>
+
+
+</Export>
Index: ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml
===================================================================
diff -u -r39541 -r39616
--- ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39541)
+++ ECON/PM/Maatwerk/dto/TbxKenmerken.cls.xml	(.../TbxKenmerken.cls.xml)	(revision 39616)
@@ -218,34 +218,37 @@
 <Parameter name="XMLNAME" value="Nietmeeleveren"/>
 </Property>
 
-<Property name="UitsparingData">
-<Type>ECON.PM.Maatwerk.dto.TbxKenmerken.Uitsparingdata</Type>
-<Parameter name="XMLNAME" value="Uitsparingdata"/>
-</Property>
+<UDLText name="T">
+<Content><![CDATA[
+// Property UitsparingData As ECON.PM.Maatwerk.dto.TbxKenmerken.Uitsparingdata(XMLNAME = "Uitsparingdata");
 
+]]></Content>
+</UDLText>
+
 <Method name="FromArray">
 <FormalSpec>KenmerkenArray:%ArrayOfDataTypes</FormalSpec>
+<ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	#dim KenmerkenIterator As TECH.Iterator = ##class(TECH.ListIterator).%New(KenmerkenArray)
-	While KenmerkenIterator.HasNext() {
-		#dim Value As %String = KenmerkenIterator.Next()
-		#dim Kenmerk As %String = KenmerkenIterator.Key()
-		#dim PropertyName As %String = ""
-		
-		If Kenmerk["Nietmeeleveren."{
-			Set PropertyName = ..GetPropertyName($piece(Kenmerk,".",2), "ECON.PM.Maatwerk.dto.TbxKenmerken.NietMeeleveren")
-			
-			If $length(PropertyName) {
-				Set $property($this.NietMeeleveren,PropertyName) = Value
-			}
-		} Else {
-			Set PropertyName = ..GetPropertyName(Kenmerk, "ECON.PM.Maatwerk.dto.TbxKenmerken")
-		
-			If $length(PropertyName) {
-				Set $property($this,PropertyName) = Value
-			}
-		}
+	new tmpKeys,Key,Keys,Properties,Property
+	
+	new Builder set Builder = ##class(ECONimpl.PM.Maatwerk.EconPropertyBuilder).%New()
+	do Builder.arrProperties("ECON.PM.Maatwerk.dto.TbxKenmerken",.tmpKeys,"A","A","A",1)
+	
+	set Property=""
+	for {  set Property = $order(tmpKeys(Property)) quit:Property=""
+		set Keys("Data."_Property) = tmpKeys(Property)
 	}
+
+	do arrProperties^vhLib.Class("ECON.PM.Maatwerk.dto.TbxKenmerken",.Properties,"A","A","A",1)
+	
+	set (Property,Key)=""
+	for { set Property=$order(Properties(Property)) quit:Property=""
+		set Key=$order(Keys(Key))
+		set Code = "set .."_Property_" = KenmerkenArray.GetAt("""_Key_""")"
+		xecute Code
+	}
+
+	Quit
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml
===================================================================
diff -u -r39515 -r39616
--- vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39515)
+++ vhUnitTest/ECON/PM/Maatwerk/dto/TbxKenmerken/FromArray/Test.cls.xml	(.../Test.cls.xml)	(revision 39616)
@@ -6,7 +6,7 @@
 <Method name="Test: Niet-hoofdletter gevoelige property">
 <Implementation><![CDATA[
 	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("Lade","Toepassing")
+	Do Array.SetAt("Lade","Data.Toepassing")
 	
 	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
 	Do Object.FromArray(Array)
@@ -18,7 +18,7 @@
 <Method name="Test: Hoofdletter gevoelige property">
 <Implementation><![CDATA[
 	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("18","Corpuswanddikte")
+	Do Array.SetAt("18","Data.Corpuswanddikte")
 	
 	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
 	Do Object.FromArray(Array)
@@ -30,8 +30,8 @@
 <Method name="Test: Meerdere properties">
 <Implementation><![CDATA[
 	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("18","Corpuswanddikte")
-	Do Array.SetAt("Lade","Toepassing")
+	Do Array.SetAt("18","Data.Corpuswanddikte")
+	Do Array.SetAt("Lade","Data.Toepassing")
 	
 	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
 	Do Object.FromArray(Array)
@@ -41,17 +41,17 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Embedded objects (type NietMeeleveren)">
+<Method name="Test: Embedded objects - bv NietMeeleveren">
 <Implementation><![CDATA[
 	Set Array = ##class(%ArrayOfDataTypes).%New()
-	Do Array.SetAt("0","Nietmeeleveren.Nietmeeleveren_afdekkap")
-	Do Array.SetAt("1","Nietmeeleveren.Nietmeeleveren_antislipmat")
+	Do Array.SetAt("false","Data.Nietmeeleveren.Nietmeeleveren_afdekkap")
+	Do Array.SetAt("true","Data.Nietmeeleveren.Nietmeeleveren_antislipmat")
 	
 	Set Object = ##class(ECON.PM.Maatwerk.dto.TbxKenmerken).%New()
 	Do Object.FromArray(Array)
 	
-	do $$$AssertFalse(Object.NietMeeleveren.Afdekkap)
-	do $$$AssertTrue(Object.NietMeeleveren.Antislipmat)
+	do $$$AssertEquals(Object.NietMeeleveren.Afdekkap,"false")
+	do $$$AssertEquals(Object.NietMeeleveren.Antislipmat,"true")
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter/Test.cls.xml
===================================================================
diff -u -r39600 -r39616
--- vhUnitTest/WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 39600)
+++ vhUnitTest/WSimpl/Vhisie4/Winkelkar/EconConfiguratieConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 39616)
@@ -17,9 +17,9 @@
 
 	Set EconConfiguratieConverter = ##class(WSimpl.Vhisie4.Winkelkar.EconConfiguratieConverter).%New(EdiConverterMock, LegacyConverterMock)
 	#dim EconConfiguratie As %ArrayOfDataTypes = ##class(vhTest.Utils.ECON.PM.Maatwerk.dto.TbxKenmerken).StandaardLade().ToArray()
-	Do EconConfiguratie.SetAt($$$DummyInteger,"Lijn.Aantal")
-	Do EconConfiguratie.SetAt($$$DummyString,"Lijn.Referentie")
-	Do EconConfiguratie.SetAt($$$DummyString,"Lijn.Groeperingcode")
+	Do EconConfiguratie.SetAt($$$DummyInteger,"Data.Lijn.Aantal")
+	Do EconConfiguratie.SetAt($$$DummyString,"Data.Lijn.Referentie")
+	Do EconConfiguratie.SetAt($$$DummyString,"Data.Lijn.Groeperingcode")
 	#dim MaatwerkLijn As APPS.EC.Winkelkar.dto.MaatwerkLijn = EconConfiguratieConverter.Convert(EconConfiguratie)
 	
 	Do $$$AssertObject(MaatwerkLijn.IngegevenKenmerken.LegacyKenmerken, LegacyKenmerken)