Index: vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt
===================================================================
diff -u -r32046 -r32231
--- vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt	(.../WS.VKP.Maatwerk.ConfiguratorService.txt)	(revision 32046)
+++ vhTestFiles/IntegratieTests/Webservices.WSDLControle/Test/WS.VKP.Maatwerk.ConfiguratorService.txt	(.../WS.VKP.Maatwerk.ConfiguratorService.txt)	(revision 32231)
@@ -863,23 +863,15 @@
                             <s:element minOccurs="0" name="ID" type="s:string"/>
                             <s:element minOccurs="0" name="Code" type="s:string"/>
                             <s:element minOccurs="0" name="Naam" type="s:string"/>
-                            <s:element minOccurs="0" name="KlantData" type="s0:KlantData"/>
+                            <s:element minOccurs="0" name="KlantData" type="s0:VanHoeckeKlantData"/>
                         </s:sequence>
                     </s:extension>
                 </s:complexContent>
             </s:complexType>
             <s:complexType abstract="true" name="Data"/>
-            <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">
@@ -908,54 +900,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:simpleType name="Familie">
                 <s:restriction base="s:string">
                     <s:maxLength value="50"/>
@@ -985,7 +929,7 @@
                 <s:complexContent>
                     <s:extension base="s0:Pad">
                         <s:sequence>
-                            <s:element minOccurs="0" name="KlantData" type="s0:KlantData"/>
+                            <s:element minOccurs="0" name="KlantData" type="s0:VanHoeckeKlantData"/>
                             <s:element minOccurs="0" name="KlantID" type="s:string"/>
                             <s:element minOccurs="0" name="PersonalityData" type="s0:PersonalityData"/>
                             <s:element minOccurs="0" name="PersonalityID" type="s:string"/>
@@ -1008,7 +952,7 @@
                 <s:complexContent>
                     <s:extension base="s0:Pad">
                         <s:sequence>
-                            <s:element minOccurs="0" name="KlantData" type="s0:KlantData"/>
+                            <s:element minOccurs="0" name="KlantData" type="s0:VanHoeckeKlantData"/>
                             <s:element minOccurs="0" name="KlantID" type="s:string"/>
                         </s:sequence>
                     </s:extension>
Index: APPS/VKP/Maatwerk/dto/TemplateExternPad.cls.xml
===================================================================
diff -u -r29059 -r32231
--- APPS/VKP/Maatwerk/dto/TemplateExternPad.cls.xml	(.../TemplateExternPad.cls.xml)	(revision 29059)
+++ APPS/VKP/Maatwerk/dto/TemplateExternPad.cls.xml	(.../TemplateExternPad.cls.xml)	(revision 32231)
@@ -6,7 +6,7 @@
 <Super>APPS.VKP.Maatwerk.dto.Pad</Super>
 
 <Property name="KlantData">
-<Type>DOM.common.dto.KlantData</Type>
+<Type>DOM.common.dto.VanHoeckeKlantData</Type>
 </Property>
 
 <Property name="KlantID">
Index: APPS/VKP/Maatwerk/dto/TemplateInternPad.cls.xml
===================================================================
diff -u -r29059 -r32231
--- APPS/VKP/Maatwerk/dto/TemplateInternPad.cls.xml	(.../TemplateInternPad.cls.xml)	(revision 29059)
+++ APPS/VKP/Maatwerk/dto/TemplateInternPad.cls.xml	(.../TemplateInternPad.cls.xml)	(revision 32231)
@@ -6,7 +6,7 @@
 <Super>APPS.VKP.Maatwerk.dto.Pad</Super>
 
 <Property name="KlantData">
-<Type>DOM.common.dto.KlantData</Type>
+<Type>DOM.common.dto.VanHoeckeKlantData</Type>
 </Property>
 
 <Property name="KlantID">