Index: APPS/PM/Maatwerk/dto/VhConfig/Kost.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/Kost.cls.xml	(.../Kost.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/Kost.cls.xml	(.../Kost.cls.xml)	(revision 73118)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig.Kost">
-<ClassType>persistent</ClassType>
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="Groep">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Items">
@@ -14,22 +14,14 @@
 </Property>
 
 <Storage name="Default">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.Maatwerk.dto4025.KostD</DataLocation>
-<DefaultData>KostDefaultData</DefaultData>
-<IdLocation>^APPS.PM.Maatwerk.dto4025.KostD</IdLocation>
-<IndexLocation>^APPS.PM.Maatwerk.dto4025.KostI</IndexLocation>
+<Type>%Library.CacheSerialState</Type>
+<State>KostState</State>
 <StreamLocation>^APPS.PM.Maatwerk.dto4025.KostS</StreamLocation>
-<Data name="KostDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
+<Data name="KostState">
 <Value name="1">
-<Value>%%CLASSNAME</Value>
-</Value>
-<Value name="2">
 <Value>Groep</Value>
 </Value>
-<Value name="3">
+<Value name="2">
 <Value>Items</Value>
 </Value>
 </Data>
Index: APPS/PM/Maatwerk/dto/VhConfig/Halffabrikaat.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/Halffabrikaat.cls.xml	(.../Halffabrikaat.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/Halffabrikaat.cls.xml	(.../Halffabrikaat.cls.xml)	(revision 73118)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig.Halffabrikaat">
-<ClassType>persistent</ClassType>
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="Type">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Aantal">
@@ -33,19 +33,19 @@
 </Property>
 
 <Property name="ProductId">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Familie">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Variant">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Korttekst">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="BewerkingDimensies">
@@ -54,27 +54,25 @@
 </Property>
 
 <Property name="Kenmerken">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
 
 <Property name="PpsKenmerken">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
 
 <Property name="ProductieRoute">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="OmschrijvingVoorDocs">
-<Type>%String</Type>
-<Parameter name="MAXLEN" value="100"/>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="OmschrijvingVoorPicking">
-<Type>%String</Type>
-<Parameter name="MAXLEN" value="100"/>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="OpnemenInEindproduct">
@@ -90,90 +88,78 @@
 </Property>
 
 <Property name="RolnaamParent">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Storage name="Default">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.Maat4025.HalffabrikaatD</DataLocation>
-<DefaultData>HalffabrikaatDefaultData</DefaultData>
-<IdLocation>^APPS.PM.Maat4025.HalffabrikaatD</IdLocation>
-<IndexLocation>^APPS.PM.Maat4025.HalffabrikaatI</IndexLocation>
+<Type>%Library.CacheSerialState</Type>
+<State>HalffabrikaatState</State>
 <StreamLocation>^APPS.PM.Maat4025.HalffabrikaatS</StreamLocation>
-<Data name="BewerkingDimensies">
-<Attribute>BewerkingDimensies</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"BewerkingDimensies"</Subscript>
-</Data>
-<Data name="HalffabrikaatDefaultData">
+<Data name="HalffabrikaatState">
 <Value name="1">
-<Value>%%CLASSNAME</Value>
+<Value>Type</Value>
 </Value>
 <Value name="2">
-<Value>Type</Value>
+<Value>Aantal</Value>
 </Value>
 <Value name="3">
-<Value>Aantal</Value>
+<Value>TeBekomenAantal</Value>
 </Value>
 <Value name="4">
-<Value>TeBekomenAantal</Value>
+<Value>AfmetingTeBekomen</Value>
 </Value>
 <Value name="5">
-<Value>AfmetingTeBekomen</Value>
+<Value>BrutoAfmetingHalffabrikaat</Value>
 </Value>
 <Value name="6">
-<Value>BrutoAfmetingHalffabrikaat</Value>
+<Value>AfmetingMetBewerkingVerlies</Value>
 </Value>
 <Value name="7">
-<Value>AfmetingMetBewerkingVerlies</Value>
+<Value>AfmetingAangerekendPerStuk</Value>
 </Value>
 <Value name="8">
-<Value>AfmetingAangerekendPerStuk</Value>
+<Value>ProductId</Value>
 </Value>
 <Value name="9">
-<Value>ProductId</Value>
+<Value>Familie</Value>
 </Value>
 <Value name="10">
-<Value>Familie</Value>
+<Value>Variant</Value>
 </Value>
 <Value name="11">
-<Value>Variant</Value>
+<Value>Korttekst</Value>
 </Value>
 <Value name="12">
-<Value>Korttekst</Value>
+<Value>BewerkingDimensies</Value>
 </Value>
 <Value name="13">
-<Value>ProductieRoute</Value>
+<Value>Kenmerken</Value>
 </Value>
 <Value name="14">
-<Value>OmschrijvingVoorDocs</Value>
+<Value>PpsKenmerken</Value>
 </Value>
 <Value name="15">
-<Value>OmschrijvingVoorPicking</Value>
+<Value>ProductieRoute</Value>
 </Value>
 <Value name="16">
-<Value>OpnemenInEindproduct</Value>
+<Value>OmschrijvingVoorDocs</Value>
 </Value>
 <Value name="17">
-<Value>BuilderBepaaltOpnemenInEindproduct</Value>
+<Value>OmschrijvingVoorPicking</Value>
 </Value>
 <Value name="18">
-<Value>NettoAfmetingHalffabrikaat</Value>
+<Value>OpnemenInEindproduct</Value>
 </Value>
 <Value name="19">
+<Value>BuilderBepaaltOpnemenInEindproduct</Value>
+</Value>
+<Value name="20">
+<Value>NettoAfmetingHalffabrikaat</Value>
+</Value>
+<Value name="21">
 <Value>RolnaamParent</Value>
 </Value>
 </Data>
-<Data name="Kenmerken">
-<Attribute>Kenmerken</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"Kenmerken"</Subscript>
-</Data>
-<Data name="PpsKenmerken">
-<Attribute>PpsKenmerken</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"PpsKenmerken"</Subscript>
-</Data>
 </Storage>
 </Class>
 
Index: APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml	(.../BerekendeKenmerken.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/BerekendeKenmerken.cls.xml	(.../BerekendeKenmerken.cls.xml)	(revision 73118)
@@ -1,32 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig.BerekendeKenmerken">
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="AfbeeldingCode">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="GTIN">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="ItemId">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Korttekst">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="DossierCode">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Langtekst">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
+
+<Storage name="Default">
+<Type>%Library.CacheSerialState</Type>
+<State>BerekendeKenmerkenState</State>
+<StreamLocation>^APPS.PM.Ma4025.BerekendeKeC477S</StreamLocation>
+<Data name="BerekendeKenmerkenState">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>AfbeeldingCode</Value>
+</Value>
+<Value name="2">
+<Value>GTIN</Value>
+</Value>
+<Value name="3">
+<Value>ItemId</Value>
+</Value>
+<Value name="4">
+<Value>Korttekst</Value>
+</Value>
+<Value name="5">
+<Value>DossierCode</Value>
+</Value>
+<Value name="6">
+<Value>Langtekst</Value>
+</Value>
+</Data>
+</Storage>
 </Class>
 
 
Index: vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml
===================================================================
diff -u -r72963 -r73118
--- vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 72963)
+++ vhUnitTest/WSimpl/PM/Maatwerk/MaatwerkService/Encoway/EncowayJsonConverter/ParseMaatwerkDetailsResponse/Test.cls.xml	(.../Test.cls.xml)	(revision 73118)
@@ -22,7 +22,7 @@
 	
 	If ($$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse))) {
 		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.CID,"")
-		Do $$$AssertEquals(GeefMaatwerkDetailsResponse.VhConfig,"")
+		Do $$$AssertTrue($IsObject(GeefMaatwerkDetailsResponse.VhConfig))
 	}
 ]]></Implementation>
 </Method>
@@ -92,8 +92,9 @@
 			If $$$AssertTrue($IsObject(VhConfig.Lijn)) {
 				Do $$$AssertEquals(VhConfig.Lijn.Count(), 0)
 			}
-			Do $$$AssertEquals(VhConfig.MaatwerkDetails,"")
-			Do $$$AssertEquals(VhConfig.BerekendeKenmerken,"")
+			
+			Do $$$AssertTrue($IsObject(VhConfig.MaatwerkDetails))
+			Do $$$AssertTrue($IsObject(VhConfig.BerekendeKenmerken))
 		}
 	}
 ]]></Implementation>
Index: APPS/PM/Maatwerk/dto/VhConfig/LbxKenmerken.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/LbxKenmerken.cls.xml	(.../LbxKenmerken.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/LbxKenmerken.cls.xml	(.../LbxKenmerken.cls.xml)	(revision 73118)
@@ -47,10 +47,13 @@
 <Type>%String</Type>
 </Property>
 
-<Property name="InterneBreedte">
-<Type>%String</Type>
-</Property>
+<UDLText name="T">
+<Content><![CDATA[
+// Property InterneBreedte As %String;
 
+]]></Content>
+</UDLText>
+
 <Property name="IsBinnenlade">
 <Type>%String</Type>
 </Property>
Index: APPS/PM/Maatwerk/dto/VhConfig.cls.xml
===================================================================
diff -u -r73021 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig.cls.xml	(.../VhConfig.cls.xml)	(revision 73021)
+++ APPS/PM/Maatwerk/dto/VhConfig.cls.xml	(.../VhConfig.cls.xml)	(revision 73118)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig">
-<ClassType>persistent</ClassType>
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="IsValid">
 <Type>%Boolean</Type>
 </Property>
 
 <Property name="Model">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Context">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
 
 <Property name="Kenmerken">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
 
 <Property name="Lijn">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>array</Collection>
 </Property>
 
@@ -36,48 +36,30 @@
 </Property>
 
 <Storage name="Default">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.Maatwerk.dto.VhConfigD</DataLocation>
-<DefaultData>VhConfigDefaultData</DefaultData>
-<IdLocation>^APPS.PM.Maatwerk.dto.VhConfigD</IdLocation>
-<IndexLocation>^APPS.PM.Maatwerk.dto.VhConfigI</IndexLocation>
+<Type>%Library.CacheSerialState</Type>
+<State>VhConfigState</State>
 <StreamLocation>^APPS.PM.Maatwerk.dto.VhConfigS</StreamLocation>
-<Data name="Context">
-<Attribute>Context</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"Context"</Subscript>
-</Data>
-<Data name="Kenmerken">
-<Attribute>Kenmerken</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"Kenmerken"</Subscript>
-</Data>
-<Data name="Lijn">
-<Attribute>Lijn</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"Lijn"</Subscript>
-</Data>
-<Data name="VhConfigDefaultData">
+<Data name="VhConfigState">
 <Value name="1">
-<Value>%%CLASSNAME</Value>
+<Value>IsValid</Value>
 </Value>
 <Value name="2">
 <Value>Model</Value>
 </Value>
 <Value name="3">
-<Value>MaatwerkDetails</Value>
+<Value>Context</Value>
 </Value>
 <Value name="4">
-<Value>BerekendeKenmerken</Value>
+<Value>Kenmerken</Value>
 </Value>
 <Value name="5">
-<Value>isValid</Value>
+<Value>Lijn</Value>
 </Value>
 <Value name="6">
-<Value>isCalculated</Value>
+<Value>MaatwerkDetails</Value>
 </Value>
 <Value name="7">
-<Value>IsValid</Value>
+<Value>BerekendeKenmerken</Value>
 </Value>
 </Data>
 </Storage>
Index: APPS/PM/Maatwerk/dto/VhConfig/KostItem.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/KostItem.cls.xml	(.../KostItem.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/KostItem.cls.xml	(.../KostItem.cls.xml)	(revision 73118)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig.KostItem">
-<ClassType>persistent</ClassType>
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="Aantal">
 <Type>%Decimal</Type>
@@ -14,48 +14,42 @@
 </Property>
 
 <Property name="ProductId">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Korttekst">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Property name="Percentage">
 <Type>%Decimal</Type>
 </Property>
 
 <Property name="Scope">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 </Property>
 
 <Storage name="Default">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.Maatwerk4025.KostItemD</DataLocation>
-<DefaultData>KostItemDefaultData</DefaultData>
-<IdLocation>^APPS.PM.Maatwerk4025.KostItemD</IdLocation>
-<IndexLocation>^APPS.PM.Maatwerk4025.KostItemI</IndexLocation>
+<Type>%Library.CacheSerialState</Type>
+<State>KostItemState</State>
 <StreamLocation>^APPS.PM.Maatwerk4025.KostItemS</StreamLocation>
-<Data name="KostItemDefaultData">
+<Data name="KostItemState">
 <Value name="1">
-<Value>%%CLASSNAME</Value>
-</Value>
-<Value name="2">
 <Value>Aantal</Value>
 </Value>
-<Value name="3">
+<Value name="2">
 <Value>Naam</Value>
 </Value>
-<Value name="4">
+<Value name="3">
 <Value>ProductId</Value>
 </Value>
-<Value name="5">
+<Value name="4">
 <Value>Korttekst</Value>
 </Value>
-<Value name="6">
+<Value name="5">
 <Value>Percentage</Value>
 </Value>
-<Value name="7">
+<Value name="6">
 <Value>Scope</Value>
 </Value>
 </Data>
Index: APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml
===================================================================
diff -u -r72876 -r73118
--- APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 72876)
+++ APPS/PM/Maatwerk/dto/VhConfig/MaatwerkDetails.cls.xml	(.../MaatwerkDetails.cls.xml)	(revision 73118)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="APPS.PM.Maatwerk.dto.VhConfig.MaatwerkDetails">
-<ClassType>persistent</ClassType>
-<Super>TECH.Persistent</Super>
+<ClassType>serial</ClassType>
+<Super>%SerialObject</Super>
 
 <Property name="Halffabrikaten">
 <Type>APPS.PM.Maatwerk.dto.VhConfig.Halffabrikaat</Type>
@@ -15,27 +15,17 @@
 </Property>
 
 <Property name="VerwijderdeHalffabItems">
-<Type>%String</Type>
+<Type>TECH.String</Type>
 <Collection>list</Collection>
 </Property>
 
 <Storage name="Default">
-<Type>%Library.CacheStorage</Type>
-<DataLocation>^APPS.PM.Ma4025.MaatwerkDetD858D</DataLocation>
-<DefaultData>MaatwerkDetailsDefaultData</DefaultData>
-<IdLocation>^APPS.PM.Ma4025.MaatwerkDetD858D</IdLocation>
-<IndexLocation>^APPS.PM.Ma4025.MaatwerkDetD858I</IndexLocation>
+<Type>%Library.CacheSerialState</Type>
+<State>MaatwerkDetailsState</State>
 <StreamLocation>^APPS.PM.Ma4025.MaatwerkDetD858S</StreamLocation>
-<Data name="Halffabrikaten">
-<Attribute>Halffabrikaten</Attribute>
-<Structure>subnode</Structure>
-<Subscript>"Halffabrikaten"</Subscript>
-</Data>
-<Data name="MaatwerkDetailsDefaultData">
-<Structure>listnode</Structure>
-<Subscript/>
+<Data name="MaatwerkDetailsState">
 <Value name="1">
-<Value>%%CLASSNAME</Value>
+<Value>Halffabrikaten</Value>
 </Value>
 <Value name="2">
 <Value>Kosten</Value>