Index: APPS/EC/Winkelkar/dto/Winkelkar.cls.xml
===================================================================
diff -u -r29059 -r32236
--- APPS/EC/Winkelkar/dto/Winkelkar.cls.xml	(.../Winkelkar.cls.xml)	(revision 29059)
+++ APPS/EC/Winkelkar/dto/Winkelkar.cls.xml	(.../Winkelkar.cls.xml)	(revision 32236)
@@ -41,7 +41,7 @@
 </Property>
 
 <Property name="Klant">
-<Type>DOM.common.dto.KlantData</Type>
+<Type>DOM.common.dto.VanHoeckeKlantData</Type>
 </Property>
 
 <Property name="Personality">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt
===================================================================
diff -u -r32046 -r32236
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt	(.../WS.APPS.VKP.VerkoopService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.APPS.VKP.VerkoopService.txt	(.../WS.APPS.VKP.VerkoopService.txt)	(revision 32236)
@@ -922,7 +922,7 @@
                     <s:element minOccurs="0" name="WinkelkarID" type="s:string"/>
                     <s:element minOccurs="0" name="Lijnen" type="s0:ArrayOfLijnLijn"/>
                     <s:element minOccurs="0" name="KlantID" type="s:string"/>
-                    <s:element minOccurs="0" name="Klant" type="s0:KlantData"/>
+                    <s:element minOccurs="0" name="Klant" type="s0:VanHoeckeKlantData"/>
                     <s:element minOccurs="0" name="Personality" type="s0:PersonalityData"/>
                 </s:sequence>
             </s:complexType>
@@ -972,17 +972,9 @@
                     <s:element maxOccurs="unbounded" minOccurs="0" name="InfoDiverseItem" nillable="true" type="s:string"/>
                 </s:sequence>
             </s:complexType>
-            <s:complexType name="HandelKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
+                    <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
             <s:complexType name="KlantData">
@@ -1012,54 +1004,6 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt
===================================================================
diff -u -r32046 -r32236
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt	(.../WS.EC.Winkelkar.WinkelkarService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.Winkelkar.WinkelkarService.txt	(.../WS.EC.Winkelkar.WinkelkarService.txt)	(revision 32236)
@@ -941,21 +941,13 @@
                     <s:element minOccurs="0" name="WinkelkarID" type="s:string"/>
                     <s:element minOccurs="0" name="Lijnen" type="s0:ArrayOfLijnLijn"/>
                     <s:element minOccurs="0" name="KlantID" type="s:string"/>
-                    <s:element minOccurs="0" name="Klant" type="s0:KlantData"/>
+                    <s:element minOccurs="0" name="Klant" type="s0:VanHoeckeKlantData"/>
                     <s:element minOccurs="0" name="Personality" type="s0:PersonalityData"/>
                 </s:sequence>
             </s:complexType>
-            <s:complexType name="HandelKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
+                    <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
             <s:complexType name="KlantData">
@@ -985,54 +977,6 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt
===================================================================
diff -u -r32046 -r32236
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt	(.../WS.EC.WebshopConfiguratorService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.WebshopConfiguratorService.txt	(.../WS.EC.WebshopConfiguratorService.txt)	(revision 32236)
@@ -1066,7 +1066,7 @@
                     <s:element minOccurs="0" name="WinkelkarID" type="s:string"/>
                     <s:element minOccurs="0" name="Lijnen" type="s0:ArrayOfLijnLijn"/>
                     <s:element minOccurs="0" name="KlantID" type="s:string"/>
-                    <s:element minOccurs="0" name="Klant" type="s0:KlantData"/>
+                    <s:element minOccurs="0" name="Klant" type="s0:VanHoeckeKlantData"/>
                     <s:element minOccurs="0" name="Personality" type="s0:PersonalityData"/>
                 </s:sequence>
             </s:complexType>
@@ -1116,17 +1116,9 @@
                     <s:element maxOccurs="unbounded" minOccurs="0" name="InfoDiverseItem" nillable="true" type="s:string"/>
                 </s:sequence>
             </s:complexType>
-            <s:complexType name="HandelKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
+                    <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
             <s:complexType name="KlantData">
@@ -1156,54 +1148,6 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt
===================================================================
diff -u -r32046 -r32236
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt	(.../WS.EC.ExterneVerkoopService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.ExterneVerkoopService.txt	(.../WS.EC.ExterneVerkoopService.txt)	(revision 32236)
@@ -197,7 +197,7 @@
                     <s:element minOccurs="0" name="WinkelkarID" type="s:string"/>
                     <s:element minOccurs="0" name="Lijnen" type="s0:ArrayOfLijnLijn"/>
                     <s:element minOccurs="0" name="KlantID" type="s:string"/>
-                    <s:element minOccurs="0" name="Klant" type="s0:KlantData"/>
+                    <s:element minOccurs="0" name="Klant" type="s0:VanHoeckeKlantData"/>
                     <s:element minOccurs="0" name="Personality" type="s0:PersonalityData"/>
                 </s:sequence>
             </s:complexType>
@@ -1072,17 +1072,9 @@
                     <s:enumeration value="4"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="HandelKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
+                    <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
             <s:complexType name="KlantData">
@@ -1112,54 +1104,6 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">
Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt
===================================================================
diff -u -r32046 -r32236
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt	(.../WS.EC.SessieLozeExterneVerkoopService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.EC.SessieLozeExterneVerkoopService.txt	(.../WS.EC.SessieLozeExterneVerkoopService.txt)	(revision 32236)
@@ -137,7 +137,7 @@
                     <s:element minOccurs="0" name="WinkelkarID" type="s:string"/>
                     <s:element minOccurs="0" name="Lijnen" type="s0:ArrayOfLijnLijn"/>
                     <s:element minOccurs="0" name="KlantID" type="s:string"/>
-                    <s:element minOccurs="0" name="Klant" type="s0:KlantData"/>
+                    <s:element minOccurs="0" name="Klant" type="s0:VanHoeckeKlantData"/>
                     <s:element minOccurs="0" name="Personality" type="s0:PersonalityData"/>
                 </s:sequence>
             </s:complexType>
@@ -1012,17 +1012,9 @@
                     <s:enumeration value="4"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="HandelKlantData">
+            <s:complexType name="VanHoeckeKlantData">
                 <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="StraatEnNr" type="s:string"/>
-                            <s:element minOccurs="0" name="Postcode" type="s:string"/>
-                            <s:element minOccurs="0" name="TelefoonNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="FaxNummer" type="s:string"/>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
+                    <s:extension base="s0:KlantData"/>
                 </s:complexContent>
             </s:complexType>
             <s:complexType name="KlantData">
@@ -1052,54 +1044,6 @@
                     <s:enumeration value="ES"/>
                 </s:restriction>
             </s:simpleType>
-            <s:complexType name="KischKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonckKlantData">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData">
-                        <s:sequence>
-                            <s:element minOccurs="0" name="EmailAdres" type="s:string"/>
-                        </s:sequence>
-                    </s:extension>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="BaseHandel">
-                <s:complexContent>
-                    <s:extension base="s0:HandelKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Destil">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Dupont">
-                <s:complexContent>
-                    <s:extension base="s0:BaseHandel"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="Kisch">
-                <s:complexContent>
-                    <s:extension base="s0:KischKlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="SFS">
-                <s:complexContent>
-                    <s:extension base="s0:KlantData"/>
-                </s:complexContent>
-            </s:complexType>
-            <s:complexType name="VanRaemdonck">
-                <s:complexContent>
-                    <s:extension base="s0:VanRaemdonckKlantData"/>
-                </s:complexContent>
-            </s:complexType>
             <s:complexType name="PersonalityData">
                 <s:complexContent>
                     <s:extension base="s0:Data">