Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt
===================================================================
diff -u -r37160 -r37178
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37160)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37178)
@@ -96,7 +96,7 @@
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
-            <s:complexType abstract="true" name="ProductFeatures"/>
+            <s:complexType name="ProductFeatures"/>
             <s:complexType name="NotRequiredForDeliveryLBX">
                 <s:sequence>
                     <s:element minOccurs="0" name="FrontAttachment" type="s:boolean"/>
@@ -188,102 +188,21 @@
                             <s:element minOccurs="0" name="MatMaterial" type="s:string"/>
                             <s:element minOccurs="0" name="MatColour" type="s:string"/>
                             <s:element minOccurs="0" name="HasCrossDivider" type="s:boolean"/>
-                            <s:element minOccurs="0" name="NumberOfCrossDividers">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="1"/>
-                                        <s:enumeration value="2"/>
-                                        <s:enumeration value="3"/>
-                                        <s:enumeration value="4"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="NumberOfFrontSupports">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="1"/>
-                                        <s:enumeration value="2"/>
-                                        <s:enumeration value="3"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="InsideBoxSystemFrontHandle">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="No"/>
-                                        <s:enumeration value="Handle"/>
-                                        <s:enumeration value="HandleAndLatch"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="BoxSystemSideHeight">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="N"/>
-                                        <s:enumeration value="M"/>
-                                        <s:enumeration value="K"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="SideRaiseType">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="NoGallery"/>
-                                        <s:enumeration value="SimpleGallery"/>
-                                        <s:enumeration value="DesignElement"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="SideRaiseDesignElementMaterial">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="GL8"/>
-                                        <s:enumeration value="ALU8"/>
-                                        <s:enumeration value="CustomerFilling"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="SideRaiseDesignElementColour">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="FZ8"/>
-                                        <s:enumeration value="FG8"/>
-                                        <s:enumeration value="ALU.MG"/>
-                                        <s:enumeration value="ALU.SW"/>
-                                        <s:enumeration value="ALU.TS"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="NumberOfCutOuts">
-                                <s:simpleType>
-                                    <s:restriction base="s:long">
-                                        <s:enumeration value="0"/>
-                                        <s:enumeration value="1"/>
-                                        <s:enumeration value="2"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
+                            <s:element minOccurs="0" name="NumberOfCrossDividers" type="s:string"/>
+                            <s:element minOccurs="0" name="NumberOfFrontSupports" type="s:string"/>
+                            <s:element minOccurs="0" name="InsideBoxSystemFrontHandle" type="s:string"/>
+                            <s:element minOccurs="0" name="BoxSystemSideHeight" type="s:string"/>
+                            <s:element minOccurs="0" name="SideRaiseType" type="s:string"/>
+                            <s:element minOccurs="0" name="SideRaiseDesignElementMaterial" type="s:string"/>
+                            <s:element minOccurs="0" name="SideRaiseDesignElementColour" type="s:string"/>
+                            <s:element minOccurs="0" name="NumberOfCutOuts" type="s:long"/>
                             <s:element minOccurs="0" name="CutOutDataWidthLeftX" type="s:string"/>
                             <s:element minOccurs="0" name="CutOutDataWidthCapZ1" type="s:string"/>
                             <s:element minOccurs="0" name="CutOutDataWidthCentreM" type="s:string"/>
                             <s:element minOccurs="0" name="CutOutDataWidthCapZ2" type="s:string"/>
                             <s:element minOccurs="0" name="CutOutDataWidthRightY" type="s:string"/>
-                            <s:element minOccurs="0" name="CutOutBackMaterial">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="W"/>
-                                        <s:enumeration value="S"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
-                            <s:element minOccurs="0" name="SinkDrawerBackMaterial">
-                                <s:simpleType>
-                                    <s:restriction base="s:string">
-                                        <s:enumeration value="W"/>
-                                        <s:enumeration value="S"/>
-                                    </s:restriction>
-                                </s:simpleType>
-                            </s:element>
+                            <s:element minOccurs="0" name="CutOutBackMaterial" type="s:string"/>
+                            <s:element minOccurs="0" name="SinkDrawerBackMaterial" type="s:string"/>
                             <s:element minOccurs="0" name="NotRequiredForDelivery" type="s0:NotRequiredForDeliveryTBX"/>
                         </s:sequence>
                     </s:extension>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml
===================================================================
diff -u -r37156 -r37178
--- EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml	(.../LadeEigenschappenTBX.cls.xml)	(revision 37156)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/LadeEigenschappenTBX.cls.xml	(.../LadeEigenschappenTBX.cls.xml)	(revision 37178)
@@ -124,49 +124,41 @@
 
 <Property name="AantalDwarsverdelingen">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",1,2,3,4"/>
 <Parameter name="XMLNAME" value="NumberOfCrossDividers"/>
 </Property>
 
 <Property name="FrontOndersteuningAantal">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",1,2,3"/>
 <Parameter name="XMLNAME" value="NumberOfFrontSupports"/>
 </Property>
 
 <Property name="GreepEnMeenemer">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",No,Handle,HandleAndLatch"/>
 <Parameter name="XMLNAME" value="InsideBoxSystemFrontHandle"/>
 </Property>
 
 <Property name="ZijkantHoogte">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",N,M,K"/>
 <Parameter name="XMLNAME" value="BoxSystemSideHeight"/>
 </Property>
 
 <Property name="ZijwandVerhogingType">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",NoGallery,SimpleGallery,DesignElement"/>
 <Parameter name="XMLNAME" value="SideRaiseType"/>
 </Property>
 
 <Property name="ZijwandVerhogingMateriaal">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",GL8,ALU8,CustomerFilling"/>
 <Parameter name="XMLNAME" value="SideRaiseDesignElementMaterial"/>
 </Property>
 
 <Property name="ZijwandVerhogingKleur">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",FZ8,FG8,ALU.MG,ALU.SW,ALU.TS"/>
 <Parameter name="XMLNAME" value="SideRaiseDesignElementColour"/>
 </Property>
 
 <Property name="UitsparingDataAantalUitsparingen">
 <Type>%Integer</Type>
-<Parameter name="VALUELIST" value=",0,1,2"/>
 <Parameter name="XMLNAME" value="NumberOfCutOuts"/>
 </Property>
 
@@ -197,13 +189,11 @@
 
 <Property name="TussenrugMateriaal">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",W,S"/>
 <Parameter name="XMLNAME" value="CutOutBackMaterial"/>
 </Property>
 
 <Property name="RugwandMateriaal">
 <Type>%String</Type>
-<Parameter name="VALUELIST" value=",W,S"/>
 <Parameter name="XMLNAME" value="SinkDrawerBackMaterial"/>
 </Property>
 
@@ -216,7 +206,6 @@
 <Type>%Library.CacheSerialState</Type>
 <State>LadeEigenschappenTBXState</State>
 <Data name="LadeEigenschappenTBXState">
-<Structure>listnode</Structure>
 <Subscript>"LadeEigenschappenTBX"</Subscript>
 <Value name="1">
 <Value>Klasse</Value>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml
===================================================================
diff -u -r37161 -r37178
--- EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml	(.../ProductEigenschappen.cls.xml)	(revision 37161)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml	(.../ProductEigenschappen.cls.xml)	(revision 37178)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.ProductEigenschappen">
-<Abstract>1</Abstract>
 <Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLTYPE">