Index: EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml
===================================================================
diff -u -r33312 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml	(.../ProductEigenschappen.cls.xml)	(revision 33312)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/ProductEigenschappen.cls.xml	(.../ProductEigenschappen.cls.xml)	(revision 37159)
@@ -2,14 +2,15 @@
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.ProductEigenschappen">
 <Abstract>1</Abstract>
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject</Super>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLTYPE">
 <Default>ProductFeatures</Default>
 </Parameter>
 
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
+<StreamLocation>^EXT.Unisho82EB.ProductEige4374S</StreamLocation>
 </Storage>
 </Class>
 
FishEye: Tag 37159 refers to a dead (removed) revision in file `EXT/Unishop/PurchaseOrder001/CreateOrder/DataTransferObject.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Request.cls.xml
===================================================================
diff -u -r33312 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Request.cls.xml	(.../Request.cls.xml)	(revision 33312)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Request.cls.xml	(.../Request.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.Request">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject,EXT.Request</Super>
+<Super>%SerialObject,%XML.Adaptor,EXT.Request</Super>
 
 <Property name="Merkteken">
 <Type>%String</Type>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml
===================================================================
diff -u -r37155 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml	(.../OrderLijn.cls.xml)	(revision 37155)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/OrderLijn.cls.xml	(.../OrderLijn.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.OrderLijn">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject</Super>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLTYPE">
 <Default>PurchaseOrderLine</Default>
@@ -40,6 +40,7 @@
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>OrderLijnState</State>
+<StreamLocation>^EXT.Unishop.Purc82EB.OrderLijnS</StreamLocation>
 <Data name="OrderLijnState">
 <Subscript>"OrderLijn"</Subscript>
 <Value name="1">
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml
===================================================================
diff -u -r37155 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 37155)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Order.cls.xml	(.../Order.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.Order">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject</Super>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLNAME">
 <Default>PurchaseOrder</Default>
@@ -56,6 +56,7 @@
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>OrderState</State>
+<StreamLocation>^EXT.Unishop.Purchase82EB.OrderS</StreamLocation>
 <Data name="OrderState">
 <Subscript>"Order"</Subscript>
 <Value name="1">
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Aankoper.cls.xml
===================================================================
diff -u -r37158 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Aankoper.cls.xml	(.../Aankoper.cls.xml)	(revision 37158)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Aankoper.cls.xml	(.../Aankoper.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.Aankoper">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject</Super>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLTYPE">
 <Default>Buyer</Default>
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Verkoper.cls.xml
===================================================================
diff -u -r37158 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Verkoper.cls.xml	(.../Verkoper.cls.xml)	(revision 37158)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Verkoper.cls.xml	(.../Verkoper.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.Verkoper">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject</Super>
+<Super>%SerialObject,%XML.Adaptor</Super>
 
 <Parameter name="XMLTYPE">
 <Default>Vendor</Default>
@@ -20,6 +20,7 @@
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>VerkoperState</State>
+<StreamLocation>^EXT.Unishop.Purch82EB.VerkoperS</StreamLocation>
 <Data name="VerkoperState">
 <Subscript>"Verkoper"</Subscript>
 <Value name="1">
Index: EXT/Unishop/PurchaseOrder001/CreateOrder/Response.cls.xml
===================================================================
diff -u -r33312 -r37159
--- EXT/Unishop/PurchaseOrder001/CreateOrder/Response.cls.xml	(.../Response.cls.xml)	(revision 33312)
+++ EXT/Unishop/PurchaseOrder001/CreateOrder/Response.cls.xml	(.../Response.cls.xml)	(revision 37159)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="EXT.Unishop.PurchaseOrder001.CreateOrder.Response">
-<Super>EXT.Unishop.PurchaseOrder001.CreateOrder.DataTransferObject,EXT.Response</Super>
+<Super>%SerialObject,%XML.Adaptor,EXT.Response</Super>
 
 <Property name="OfferteID">
 <Type>%String</Type>
@@ -15,6 +15,7 @@
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>ResponseState</State>
+<StreamLocation>^EXT.Unishop.Purch82EB.ResponseS</StreamLocation>
 <Data name="ResponseState">
 <Subscript>"Response"</Subscript>
 <Value name="1">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt
===================================================================
diff -u -r37158 -r37159
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37158)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/EXT.Unishop.PurchaseOrder001.Service.txt	(.../EXT.Unishop.PurchaseOrder001.Service.txt)	(revision 37159)
@@ -10,72 +10,51 @@
                 </s:complexType>
             </s:element>
             <s:complexType name="Request">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="Token" type="s:string"/>
-                            <s:element minOccurs="0" name="PurchaseOrder" type="s0:PurchaseOrder"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="Token" type="s:string"/>
+                    <s:element minOccurs="0" name="PurchaseOrder" type="s0:PurchaseOrder"/>
+                </s:sequence>
             </s:complexType>
-            <s:complexType abstract="true" name="DataTransferObject"/>
             <s:complexType name="PurchaseOrder">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="PurchaseOrderNumber" type="s:string"/>
-                            <s:element minOccurs="0" name="PurchaseOrderReference" type="s:string"/>
-                            <s:element minOccurs="0" name="PurchaseOrderCommissionReference" type="s:string"/>
-                            <s:element minOccurs="0" name="RequestedDeliveryDate" type="s:string"/>
-                            <s:element minOccurs="0" name="Buyer" type="s0:Buyer"/>
-                            <s:element minOccurs="0" name="Vendor" type="s0:Vendor"/>
-                            <s:element name="PurchaseOrderLines" type="s0:ArrayOfPurchaseOrderLinePurchaseOrderLine"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="PurchaseOrderNumber" type="s:string"/>
+                    <s:element minOccurs="0" name="PurchaseOrderReference" type="s:string"/>
+                    <s:element minOccurs="0" name="PurchaseOrderCommissionReference" type="s:string"/>
+                    <s:element minOccurs="0" name="RequestedDeliveryDate" type="s:string"/>
+                    <s:element minOccurs="0" name="Buyer" type="s0:Buyer"/>
+                    <s:element minOccurs="0" name="Vendor" type="s0:Vendor"/>
+                    <s:element name="PurchaseOrderLines" type="s0:ArrayOfPurchaseOrderLinePurchaseOrderLine"/>
+                </s:sequence>
             </s:complexType>
             <s:complexType name="Buyer">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="BuyerName" type="s:string"/>
-                            <s:element minOccurs="0" name="BuyerCode" type="s:string"/>
-                            <s:element minOccurs="0" name="DeliveryName" type="s:string"/>
-                            <s:element minOccurs="0" name="DeliveryStreetNr" type="s:string"/>
-                            <s:element minOccurs="0" name="DeliveryZIPCode" type="s:string"/>
-                            <s:element minOccurs="0" name="DeliveryCity" type="s:string"/>
-                            <s:element minOccurs="0" name="DeliveryCountry" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="BuyerName" type="s:string"/>
+                    <s:element minOccurs="0" name="BuyerCode" type="s:string"/>
+                    <s:element minOccurs="0" name="DeliveryName" type="s:string"/>
+                    <s:element minOccurs="0" name="DeliveryStreetNr" type="s:string"/>
+                    <s:element minOccurs="0" name="DeliveryZIPCode" type="s:string"/>
+                    <s:element minOccurs="0" name="DeliveryCity" type="s:string"/>
+                    <s:element minOccurs="0" name="DeliveryCountry" type="s:string"/>
+                </s:sequence>
             </s:complexType>
             <s:complexType name="Vendor">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="VendorName" type="s:string"/>
-                            <s:element minOccurs="0" name="VendorCode" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="VendorName" type="s:string"/>
+                    <s:element minOccurs="0" name="VendorCode" type="s:string"/>
+                </s:sequence>
             </s:complexType>
             <s:complexType name="ArrayOfPurchaseOrderLinePurchaseOrderLine">
                 <s:sequence>
                     <s:element maxOccurs="unbounded" minOccurs="0" name="PurchaseOrderLine" nillable="true" type="s0:PurchaseOrderLine"/>
                 </s:sequence>
             </s:complexType>
             <s:complexType name="PurchaseOrderLine">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="PurchaseOrderLineNumber" type="s:string"/>
-                            <s:element minOccurs="0" name="PurchaseOrderLineReference" type="s:string"/>
-                            <s:element minOccurs="0" name="Quantity" type="s:string"/>
-                            <s:element minOccurs="0" name="ProductFeatures" type="s0:ProductFeatures"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="PurchaseOrderLineNumber" type="s:string"/>
+                    <s:element minOccurs="0" name="PurchaseOrderLineReference" type="s:string"/>
+                    <s:element minOccurs="0" name="Quantity" type="s:string"/>
+                    <s:element minOccurs="0" name="ProductFeatures" type="s0:ProductFeatures"/>
+                </s:sequence>
             </s:complexType>
             <s:complexType name="LBX">
                 <s:complexContent>
@@ -117,11 +96,7 @@
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
-            <s:complexType abstract="true" name="ProductFeatures">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject"/>
-                </s:complexContent>
-            </s:complexType>
+            <s:complexType abstract="true" name="ProductFeatures"/>
             <s:complexType name="NotRequiredForDeliveryLBX">
                 <s:sequence>
                     <s:element minOccurs="0" name="FrontAttachment" type="s:boolean"/>
@@ -345,14 +320,10 @@
                 </s:complexType>
             </s:element>
             <s:complexType name="Response">
-                <s:complexContent>
-                    <s:extension base="s0:DataTransferObject">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="ShoppingCartNumber" type="s:string"/>
-                            <s:element minOccurs="0" name="Exception" type="s0:Exception"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
+                <s:sequence>
+                    <s:element minOccurs="0" name="ShoppingCartNumber" type="s:string"/>
+                    <s:element minOccurs="0" name="Exception" type="s0:Exception"/>
+                </s:sequence>
             </s:complexType>
             <s:complexType name="Exception">
                 <s:sequence>