diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AbstraktesEreignisStatusAenderungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AbstraktesEreignisStatusAenderungType.java
index 6699db90..8d47776e 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AbstraktesEreignisStatusAenderungType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AbstraktesEreignisStatusAenderungType.java
@@ -3,9 +3,7 @@ package at.vvo.omds.types.omds3Types.r1_5_0.common;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SchadenStatusType;
 
 
 /**
@@ -28,9 +26,6 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SchadenStatusType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "AbstraktesEreignisStatusAenderung_Type")
-@XmlSeeAlso({
-    SchadenStatusType.class
-})
 public abstract class AbstraktesEreignisStatusAenderungType {
 
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AttributMetadatenEnumType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AttributMetadatenEnumType.java
index e003183b..609dc186 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AttributMetadatenEnumType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/AttributMetadatenEnumType.java
@@ -6,9 +6,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
@@ -23,7 +21,7 @@ import javax.xml.datatype.XMLGregorianCalendar;
  *   <complexContent>
  *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}AttributMetadaten_Type">
  *       <sequence>
- *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}date" minOccurs="0"/>
+ *         <element name="Default" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="Values" type="{urn:omds3CommonServiceTypes-1-1-0}EintragSchluesselliste_Type" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *     </extension>
@@ -43,8 +41,7 @@ public class AttributMetadatenEnumType
 {
 
     @XmlElement(name = "Default")
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar _default;
+    protected String _default;
     @XmlElement(name = "Values")
     protected List<EintragSchluessellisteType> values;
 
@@ -53,10 +50,10 @@ public class AttributMetadatenEnumType
      * 
      * @return
      *     possible object is
-     *     {@link XMLGregorianCalendar }
+     *     {@link String }
      *     
      */
-    public XMLGregorianCalendar getDefault() {
+    public String getDefault() {
         return _default;
     }
 
@@ -65,10 +62,10 @@ public class AttributMetadatenEnumType
      * 
      * @param value
      *     allowed object is
-     *     {@link XMLGregorianCalendar }
+     *     {@link String }
      *     
      */
-    public void setDefault(XMLGregorianCalendar value) {
+    public void setDefault(String value) {
         this._default = value;
     }
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/BasisProduktbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/BasisProduktbausteinType.java
index 652b09cb..4d42e784 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/BasisProduktbausteinType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/BasisProduktbausteinType.java
@@ -20,14 +20,14 @@ import javax.xml.bind.annotation.XmlType;
  * <pre>
  * &lt;complexType name="BasisProduktbaustein_Type"&gt;
  *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *     &lt;extension base="{urn:omds3CommonServiceTypes-1-1-0}Modellelement_Type"&gt;
  *       &lt;sequence&gt;
  *         &lt;element name="Id" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
  *         &lt;element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/&gt;
  *         &lt;element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
+ *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
  * </pre>
@@ -44,7 +44,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlSeeAlso({
     ProduktbausteinType.class
 })
-public abstract class BasisProduktbausteinType {
+public abstract class BasisProduktbausteinType
+    extends ModellelementType
+{
 
     @XmlElement(name = "Id")
     protected String id;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonRequestType.java
index 05befcf8..03e1ba0f 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonRequestType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonRequestType.java
@@ -56,11 +56,13 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimRequestType;
     "korrelationsId"
 })
 @XmlSeeAlso({
+    GetApplicationDocumentRequestType.class,
     CheckClaimRequestType.class,
     SubmitClaimRequestType.class,
     GetClaimRequestType.class,
-    CommonSearchRequestType.class,
-    GetApplicationDocumentRequestType.class,
+    GetPoliciesOfPartnerRequestType.class,
+    SetMailingAddressRequestType.class,
+    CollectionChangeRequestType.class,
     GetPartnerRequestType.class,
     CheckAddressRequestType.class,
     ChangePartnerMainAddressRequestType.class,
@@ -69,9 +71,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimRequestType;
     AddCommunicationObjectRequestType.class,
     DeleteCommunicationObjectRequestType.class,
     CommonProcessRequestType.class,
-    GetPoliciesOfPartnerRequestType.class,
-    SetMailingAddressRequestType.class,
-    CollectionChangeRequestType.class
+    CommonSearchRequestType.class
 })
 public abstract class CommonRequestType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonResponseType.java
index b74dc6fe..33a77582 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonResponseType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/CommonResponseType.java
@@ -48,11 +48,13 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimResponseType;
     "status"
 })
 @XmlSeeAlso({
+    GetApplicationDocumentResponseType.class,
     CheckClaimResponseType.class,
     SubmitClaimResponseType.class,
     GetClaimResponseType.class,
-    CommonSearchResponseType.class,
-    GetApplicationDocumentResponseType.class,
+    GetPoliciesOfPartnerResponseType.class,
+    SetMailingAddressResponseType.class,
+    CollectionChangeResponseType.class,
     GetPartnerResponseType.class,
     CheckAddressResponseType.class,
     ChangePartnerMainAddressResponseType.class,
@@ -60,9 +62,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimResponseType;
     AddCommunicationObjectResponseType.class,
     DeleteCommunicationObjectResponseType.class,
     CommonProcessResponseType.class,
-    GetPoliciesOfPartnerResponseType.class,
-    SetMailingAddressResponseType.class,
-    CollectionChangeResponseType.class,
+    CommonSearchResponseType.class,
     ChangeCommunicationObjectResponseType.class
 })
 public abstract class CommonResponseType {
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktGenerischType.java
index 32c907a7..2b264e52 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktGenerischType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktGenerischType.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.ElementarproduktLebenType;
+import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.TarifLebenType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.ElementarproduktRechtsschutzType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.ElementarproduktSachPrivatType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.LeistungsartUnfallType;
@@ -49,10 +49,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.LeistungsartUnfallTy
     "versicherungssumme"
 })
 @XmlSeeAlso({
-    ElementarproduktRechtsschutzType.class,
-    ElementarproduktSachPrivatType.class,
     LeistungsartUnfallType.class,
-    ElementarproduktLebenType.class
+    TarifLebenType.class,
+    ElementarproduktSachPrivatType.class,
+    ElementarproduktRechtsschutzType.class
 })
 public abstract class ElementarproduktGenerischType
     extends ElementarproduktType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktType.java
index 8ee2768e..8ca19637 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ElementarproduktType.java
@@ -15,7 +15,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.VerkehrsrechtsschutzKfz
 
 
 /**
- * Basistyp für ein Elementarprodukt
+ * Basistyp für ein Elementarprodukt (1. Generation, wird nur in Kfz verwendet)
  * 
  * <p>Java-Klasse für Elementarprodukt_Type complex type.
  * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjectFactory.java
index 2a8920df..0ad50131 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjectFactory.java
@@ -37,6 +37,14 @@ public class ObjectFactory {
     public ObjectFactory() {
     }
 
+    /**
+     * Create an instance of {@link GMSGType }
+     * 
+     */
+    public GMSGType createGMSGType() {
+        return new GMSGType();
+    }
+
     /**
      * Create an instance of {@link ZahlwegType }
      * 
@@ -45,14 +53,6 @@ public class ObjectFactory {
         return new ZahlwegType();
     }
 
-    /**
-     * Create an instance of {@link ServiceFault }
-     * 
-     */
-    public ServiceFault createServiceFault() {
-        return new ServiceFault();
-    }
-
     /**
      * Create an instance of {@link ObjektIdType }
      * 
@@ -61,6 +61,14 @@ public class ObjectFactory {
         return new ObjektIdType();
     }
 
+    /**
+     * Create an instance of {@link ResponseStatusType }
+     * 
+     */
+    public ResponseStatusType createResponseStatusType() {
+        return new ResponseStatusType();
+    }
+
     /**
      * Create an instance of {@link PersonType }
      * 
@@ -69,6 +77,14 @@ public class ObjectFactory {
         return new PersonType();
     }
 
+    /**
+     * Create an instance of {@link ServiceFault }
+     * 
+     */
+    public ServiceFault createServiceFault() {
+        return new ServiceFault();
+    }
+
     /**
      * Create an instance of {@link AdresseType }
      * 
@@ -94,11 +110,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ResponseStatusType }
+     * Create an instance of {@link PersonPersonenspartenType }
      * 
      */
-    public ResponseStatusType createResponseStatusType() {
-        return new ResponseStatusType();
+    public PersonPersonenspartenType createPersonPersonenspartenType() {
+        return new PersonPersonenspartenType();
     }
 
     /**
@@ -117,6 +133,22 @@ public class ObjectFactory {
         return new KontierungType();
     }
 
+    /**
+     * Create an instance of {@link ZusatzproduktGenerischType }
+     * 
+     */
+    public ZusatzproduktGenerischType createZusatzproduktGenerischType() {
+        return new ZusatzproduktGenerischType();
+    }
+
+    /**
+     * Create an instance of {@link Gruppe }
+     * 
+     */
+    public Gruppe createGruppe() {
+        return new Gruppe();
+    }
+
     /**
      * Create an instance of {@link BeteiligtePersonVertragType }
      * 
@@ -501,6 +533,166 @@ public class ObjectFactory {
         return new EintragSchluessellisteType();
     }
 
+    /**
+     * Create an instance of {@link AttributStringType }
+     * 
+     */
+    public AttributStringType createAttributStringType() {
+        return new AttributStringType();
+    }
+
+    /**
+     * Create an instance of {@link AttributIntType }
+     * 
+     */
+    public AttributIntType createAttributIntType() {
+        return new AttributIntType();
+    }
+
+    /**
+     * Create an instance of {@link AttributDezimalType }
+     * 
+     */
+    public AttributDezimalType createAttributDezimalType() {
+        return new AttributDezimalType();
+    }
+
+    /**
+     * Create an instance of {@link AttributDoubleType }
+     * 
+     */
+    public AttributDoubleType createAttributDoubleType() {
+        return new AttributDoubleType();
+    }
+
+    /**
+     * Create an instance of {@link AttributDatumType }
+     * 
+     */
+    public AttributDatumType createAttributDatumType() {
+        return new AttributDatumType();
+    }
+
+    /**
+     * Create an instance of {@link AttributEnumType }
+     * 
+     */
+    public AttributEnumType createAttributEnumType() {
+        return new AttributEnumType();
+    }
+
+    /**
+     * Create an instance of {@link AttributMultiEnumType }
+     * 
+     */
+    public AttributMultiEnumType createAttributMultiEnumType() {
+        return new AttributMultiEnumType();
+    }
+
+    /**
+     * Create an instance of {@link SicherstellungType }
+     * 
+     */
+    public SicherstellungType createSicherstellungType() {
+        return new SicherstellungType();
+    }
+
+    /**
+     * Create an instance of {@link AbtretungType }
+     * 
+     */
+    public AbtretungType createAbtretungType() {
+        return new AbtretungType();
+    }
+
+    /**
+     * Create an instance of {@link VerpfaendungType }
+     * 
+     */
+    public VerpfaendungType createVerpfaendungType() {
+        return new VerpfaendungType();
+    }
+
+    /**
+     * Create an instance of {@link PfandglaeubigerType }
+     * 
+     */
+    public PfandglaeubigerType createPfandglaeubigerType() {
+        return new PfandglaeubigerType();
+    }
+
+    /**
+     * Create an instance of {@link VinkulierungPersonenType }
+     * 
+     */
+    public VinkulierungPersonenType createVinkulierungPersonenType() {
+        return new VinkulierungPersonenType();
+    }
+
+    /**
+     * Create an instance of {@link GlaeubigerSicherstellungType }
+     * 
+     */
+    public GlaeubigerSicherstellungType createGlaeubigerSicherstellungType() {
+        return new GlaeubigerSicherstellungType();
+    }
+
+    /**
+     * Create an instance of {@link ZustimmungGesundheitsdatenType }
+     * 
+     */
+    public ZustimmungGesundheitsdatenType createZustimmungGesundheitsdatenType() {
+        return new ZustimmungGesundheitsdatenType();
+    }
+
+    /**
+     * Create an instance of {@link FATCAType }
+     * 
+     */
+    public FATCAType createFATCAType() {
+        return new FATCAType();
+    }
+
+    /**
+     * Create an instance of {@link FATCANatPersonType }
+     * 
+     */
+    public FATCANatPersonType createFATCANatPersonType() {
+        return new FATCANatPersonType();
+    }
+
+    /**
+     * Create an instance of {@link FATCASonstPersonType }
+     * 
+     */
+    public FATCASonstPersonType createFATCASonstPersonType() {
+        return new FATCASonstPersonType();
+    }
+
+    /**
+     * Create an instance of {@link PEPType }
+     * 
+     */
+    public PEPType createPEPType() {
+        return new PEPType();
+    }
+
+    /**
+     * Create an instance of {@link TreuhaenderfrageType }
+     * 
+     */
+    public TreuhaenderfrageType createTreuhaenderfrageType() {
+        return new TreuhaenderfrageType();
+    }
+
+    /**
+     * Create an instance of {@link GMSGType.SteuerlichAnsaessig }
+     * 
+     */
+    public GMSGType.SteuerlichAnsaessig createGMSGTypeSteuerlichAnsaessig() {
+        return new GMSGType.SteuerlichAnsaessig();
+    }
+
     /**
      * Create an instance of {@link ZahlwegType.Kundenkonto }
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjektSpezifikationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjektSpezifikationType.java
index 70047f31..a9c2e500 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjektSpezifikationType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ObjektSpezifikationType.java
@@ -29,9 +29,9 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SchadenmelderVermittlerTyp
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ObjektSpezifikation_Type")
 @XmlSeeAlso({
+    SchadenmelderVermittlerType.class,
     PolizzenObjektSpezifikationType.class,
-    SchadenObjektSpezifikationType.class,
-    SchadenmelderVermittlerType.class
+    SchadenObjektSpezifikationType.class
 })
 public abstract class ObjektSpezifikationType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/PersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/PersonType.java
index 09586c6f..48c7a76b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/PersonType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/PersonType.java
@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import at.vvo.omds.types.omds2Types.v2_11.ELAnzahlType;
 import at.vvo.omds.types.omds2Types.v2_11.ELEinstufungType;
@@ -68,6 +69,9 @@ import at.vvo.omds.types.omds2Types.v2_11.SONSTIGEPERSONType;
     "elIdentifizierung",
     "elText"
 })
+@XmlSeeAlso({
+    PersonPersonenspartenType.class
+})
 public class PersonType {
 
     @XmlElement(name = "ObjektId")
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktGenerischType.java
index 3e1a8568..0eb854cc 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktGenerischType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktGenerischType.java
@@ -8,7 +8,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.ProduktLebenType;
+import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.VersichertePersonLebenType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.ProduktRechtsschutzType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.ProduktSachPrivatType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.VersichertePersonUnfallType;
@@ -46,10 +46,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.VersichertePersonUnf
     "beschreibungTxt"
 })
 @XmlSeeAlso({
-    ProduktRechtsschutzType.class,
-    ProduktSachPrivatType.class,
     VersichertePersonUnfallType.class,
-    ProduktLebenType.class
+    VersichertePersonLebenType.class,
+    ProduktSachPrivatType.class,
+    ProduktRechtsschutzType.class
 })
 public abstract class ProduktGenerischType
     extends ProduktType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktType.java
index 9b1ccabf..169cdfc3 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktType.java
@@ -15,7 +15,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.ZusatzproduktKfzType;
 
 
 /**
- * Basistyp für ein Produkt
+ * Basistyp für ein Produkt (1. Generation, wird nur in Kfz verwendet)
  * 
  * <p>Java-Klasse für Produkt_Type complex type.
  * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktbausteinType.java
index 8449e1e6..85097617 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktbausteinType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/ProduktbausteinType.java
@@ -46,7 +46,8 @@ import javax.xml.datatype.XMLGregorianCalendar;
     ProduktbausteinGenerischType.class,
     VerkaufsproduktType.class,
     ProduktType.class,
-    ElementarproduktType.class
+    ElementarproduktType.class,
+    ZusatzproduktType.class
 })
 public abstract class ProduktbausteinType
     extends BasisProduktbausteinType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktGenerischType.java
index e5801125..898d595a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktGenerischType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktGenerischType.java
@@ -46,10 +46,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.VerkaufsproduktUnfal
     "beschreibungTxt"
 })
 @XmlSeeAlso({
-    VerkaufsproduktRechtsschutzType.class,
-    VerkaufsproduktSachPrivatType.class,
     VerkaufsproduktUnfallType.class,
-    VerkaufsproduktLebenType.class
+    VerkaufsproduktLebenType.class,
+    VerkaufsproduktSachPrivatType.class,
+    VerkaufsproduktRechtsschutzType.class
 })
 public abstract class VerkaufsproduktGenerischType
     extends VerkaufsproduktType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktType.java
index fb6f0b93..c304ced9 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VerkaufsproduktType.java
@@ -15,7 +15,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.VerkaufsproduktKfzType;
 
 
 /**
- * Basistyp für ein Produktbündel
+ * Basistyp für ein Produktbündel (1. Generation, wird nur in Kfz verwendet)
  * 
  * <p>Java-Klasse für Verkaufsprodukt_Type complex type.
  * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertePersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertePersonType.java
index c0b06915..f4b25ac8 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertePersonType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertePersonType.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresseMitAttributMetadaten_Type"&gt;
  *       &lt;sequence&gt;
- *         &lt;element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Type"/&gt;
+ *         &lt;element name="Person" type="{urn:omds3CommonServiceTypes-1-1-0}Person_Personensparten_Type"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -37,17 +37,17 @@ public class VersichertePersonType
 {
 
     @XmlElement(name = "Person", required = true)
-    protected PersonType person;
+    protected PersonPersonenspartenType person;
 
     /**
      * Ruft den Wert der person-Eigenschaft ab.
      * 
      * @return
      *     possible object is
-     *     {@link PersonType }
+     *     {@link PersonPersonenspartenType }
      *     
      */
-    public PersonType getPerson() {
+    public PersonPersonenspartenType getPerson() {
         return person;
     }
 
@@ -56,10 +56,10 @@ public class VersichertePersonType
      * 
      * @param value
      *     allowed object is
-     *     {@link PersonType }
+     *     {@link PersonPersonenspartenType }
      *     
      */
-    public void setPerson(PersonType value) {
+    public void setPerson(PersonPersonenspartenType value) {
         this.person = value;
     }
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertesInteresseMitAttributMetadatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertesInteresseMitAttributMetadatenType.java
index 7fc1326e..50659054 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertesInteresseMitAttributMetadatenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VersichertesInteresseMitAttributMetadatenType.java
@@ -39,13 +39,13 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.VersichertesObje
     "attributMetadaten"
 })
 @XmlSeeAlso({
+    VersichertesObjektSachPrivatType.class,
+    RisikoHaushaltType.class,
+    RisikoGebaeudeType.class,
     VersichertePersonType.class,
     VersicherteVeranstaltungType.class,
     VersicherterBetriebType.class,
-    VersicherteLiegenschaftType.class,
-    VersichertesObjektSachPrivatType.class,
-    RisikoHaushaltType.class,
-    RisikoGebaeudeType.class
+    VersicherteLiegenschaftType.class
 })
 public abstract class VersichertesInteresseMitAttributMetadatenType
     extends VersichertesInteresseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenDetailType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenDetailType.java
index 98a819a0..2c3e815c 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenDetailType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenDetailType.java
@@ -55,8 +55,8 @@ import javax.xml.bind.annotation.XmlType;
     "zusaetzlicheVorversicherungsdaten"
 })
 @XmlSeeAlso({
-    VorversicherungType.class,
-    at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.VorversicherungenKfzType.VorversicherungKfz.class
+    at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.VorversicherungenKfzType.VorversicherungKfz.class,
+    VorversicherungType.class
 })
 public class VorversicherungenDetailType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenType.java
index 3dd916b8..0fdad672 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/common/VorversicherungenType.java
@@ -29,8 +29,8 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.VorversicherungenKfzTyp
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "Vorversicherungen_Type")
 @XmlSeeAlso({
-    VorversicherungenImplType.class,
-    VorversicherungenKfzType.class
+    VorversicherungenKfzType.class,
+    VorversicherungenImplType.class
 })
 public abstract class VorversicherungenType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateRequestGenType.java
index b6b458c4..1a09cd58 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateRequestGenType.java
@@ -38,10 +38,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CalculateUnfallReque
     "produktmetadaten"
 })
 @XmlSeeAlso({
-    CalculateRechtsschutzRequestType.class,
-    CalculateSachPrivatRequestType.class,
     CalculateUnfallRequestType.class,
-    CalculateLebenRequestType.class
+    CalculateLebenRequestType.class,
+    CalculateSachPrivatRequestType.class,
+    CalculateRechtsschutzRequestType.class
 })
 public abstract class CalculateRequestGenType
     extends CalculateRequestType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateResponseGenType.java
index 1d97a199..7c83384a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CalculateResponseGenType.java
@@ -32,10 +32,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CalculateUnfallRespo
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "CalculateResponseGen_Type")
 @XmlSeeAlso({
-    CalculateRechtsschutzResponseType.class,
-    CalculateSachPrivatResponseType.class,
     CalculateUnfallResponseType.class,
-    CalculateLebenResponseType.class
+    CalculateLebenResponseType.class,
+    CalculateSachPrivatResponseType.class,
+    CalculateRechtsschutzResponseType.class
 })
 public abstract class CalculateResponseGenType
     extends CalculateResponseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationRequestGenType.java
index f9df22f4..dc2e80b2 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationRequestGenType.java
@@ -38,10 +38,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CreateApplicationUnf
     "produktmetadaten"
 })
 @XmlSeeAlso({
-    CreateApplicationRechtsschutzRequestType.class,
-    CreateApplicationSachPrivatRequestType.class,
     CreateApplicationUnfallRequestType.class,
-    CreateApplicationLebenRequestType.class
+    CreateApplicationLebenRequestType.class,
+    CreateApplicationSachPrivatRequestType.class,
+    CreateApplicationRechtsschutzRequestType.class
 })
 public abstract class CreateApplicationRequestGenType
     extends CreateApplicationRequestType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationResponseGenType.java
index ff93b7d1..75d73d90 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateApplicationResponseGenType.java
@@ -32,10 +32,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CreateApplicationUnf
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "CreateApplicationResponseGen_Type")
 @XmlSeeAlso({
-    CreateApplicationRechtsschutzResponseType.class,
-    CreateApplicationSachPrivatResponseType.class,
     CreateApplicationUnfallResponseType.class,
-    CreateApplicationLebenResponseType.class
+    CreateApplicationLebenResponseType.class,
+    CreateApplicationSachPrivatResponseType.class,
+    CreateApplicationRechtsschutzResponseType.class
 })
 public abstract class CreateApplicationResponseGenType
     extends CreateApplicationResponseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferRequestGenType.java
index 88a949e9..d2c3a3cd 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferRequestGenType.java
@@ -38,10 +38,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CreateOfferUnfallReq
     "produktmetadaten"
 })
 @XmlSeeAlso({
-    CreateOfferRechtsschutzRequestType.class,
-    CreateOfferSachPrivatRequestType.class,
     CreateOfferUnfallRequestType.class,
-    CreateOfferLebenRequestType.class
+    CreateOfferLebenRequestType.class,
+    CreateOfferSachPrivatRequestType.class,
+    CreateOfferRechtsschutzRequestType.class
 })
 public abstract class CreateOfferRequestGenType
     extends CreateOfferRequestType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferResponseGenType.java
index 08bc4e4f..3433905b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/CreateOfferResponseGenType.java
@@ -32,10 +32,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.CreateOfferUnfallRes
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "CreateOfferResponseGen_Type")
 @XmlSeeAlso({
-    CreateOfferRechtsschutzResponseType.class,
-    CreateOfferSachPrivatResponseType.class,
     CreateOfferUnfallResponseType.class,
-    CreateOfferLebenResponseType.class
+    CreateOfferLebenResponseType.class,
+    CreateOfferSachPrivatResponseType.class,
+    CreateOfferRechtsschutzResponseType.class
 })
 public abstract class CreateOfferResponseGenType
     extends CreateOfferResponseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezAntragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezAntragType.java
index 2b40a8f6..8042b930 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezAntragType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezAntragType.java
@@ -1,27 +1,13 @@
 
 package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.AbgelehnteRisikenType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.AntragsartType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.BeteiligtePersonVertragType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.DatenverwendungType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.ErsatzpolizzenType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.KontierungType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.PolizzenversandType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.VertragspersonType;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.VinkularglaeubigerType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.VorversicherungenType;
-import at.vvo.omds.types.omds3Types.r1_5_0.common.ZahlungsdatenType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.SpezAntragKfzType;
-import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.SpezAntragLebenType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.SpezAntragRechtsschutzType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.AntragSachPrivatType;
 import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SpezAntragUnfallType;
@@ -37,27 +23,11 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SpezAntragUnfallType
  * <pre>
  * &lt;complexType name="SpezAntrag_Type"&gt;
  *   &lt;complexContent&gt;
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
+ *     &lt;extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntragBasis_Type"&gt;
  *       &lt;sequence&gt;
- *         &lt;element name="Antragsart" type="{urn:omds3CommonServiceTypes-1-1-0}Antragsart_Type" minOccurs="0"/&gt;
- *         &lt;element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}BeteiligtePersonVertrag_Type" maxOccurs="unbounded"/&gt;
- *         &lt;element name="Versicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/&gt;
- *         &lt;element name="AbweichenderPraemienzahler" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/&gt;
- *         &lt;element name="WeitereVersicherungsnehmer" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;element name="WeitereVertragspersonen" type="{urn:omds3CommonServiceTypes-1-1-0}Vertragsperson_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;element name="AbgelehnteRisiken" type="{urn:omds3CommonServiceTypes-1-1-0}AbgelehnteRisiken_Type" minOccurs="0"/&gt;
- *         &lt;element name="Vorversicherungen" type="{urn:omds3CommonServiceTypes-1-1-0}Vorversicherungen_Type" minOccurs="0"/&gt;
- *         &lt;element name="Zahlungsdaten" type="{urn:omds3CommonServiceTypes-1-1-0}Zahlungsdaten_Type"/&gt;
- *         &lt;element name="Sepa" type="{urn:omds3CommonServiceTypes-1-1-0}SepaCd_Type" minOccurs="0"/&gt;
  *         &lt;element name="Vinkulierung" type="{urn:omds3CommonServiceTypes-1-1-0}Vinkularglaeubiger_Type" minOccurs="0"/&gt;
- *         &lt;element name="Polizzenversand" type="{urn:omds3CommonServiceTypes-1-1-0}PolizzenversandType" minOccurs="0"/&gt;
- *         &lt;element name="Datenschutzbestimmungen" type="{urn:omds3CommonServiceTypes-1-1-0}Datenverwendung_Type"/&gt;
- *         &lt;element name="Kontierung" type="{urn:omds3CommonServiceTypes-1-1-0}Kontierung_Type" maxOccurs="3" minOccurs="0"/&gt;
- *         &lt;element name="Ersatzpolizzennummer" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizzen_Type" minOccurs="0"/&gt;
- *         &lt;element name="ZusendungWeitereDokumente" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/&gt;
- *         &lt;element name="ZusaetzlicheAntragsdaten" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}ZusaetzlicheAntragsdaten_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
- *     &lt;/restriction&gt;
+ *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
  * </pre>
@@ -66,320 +36,20 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SpezAntragUnfallType
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SpezAntrag_Type", propOrder = {
-    "antragsart",
-    "personen",
-    "versicherungsnehmer",
-    "abweichenderPraemienzahler",
-    "weitereVersicherungsnehmer",
-    "weitereVertragspersonen",
-    "abgelehnteRisiken",
-    "vorversicherungen",
-    "zahlungsdaten",
-    "sepa",
-    "vinkulierung",
-    "polizzenversand",
-    "datenschutzbestimmungen",
-    "kontierung",
-    "ersatzpolizzennummer",
-    "zusendungWeitereDokumente",
-    "zusaetzlicheAntragsdaten"
+    "vinkulierung"
 })
 @XmlSeeAlso({
-    SpezAntragRechtsschutzType.class,
-    AntragSachPrivatType.class,
     SpezAntragUnfallType.class,
     SpezAntragKfzType.class,
-    SpezAntragLebenType.class
+    AntragSachPrivatType.class,
+    SpezAntragRechtsschutzType.class
 })
-public abstract class SpezAntragType {
+public abstract class SpezAntragType
+    extends SpezAntragBasisType
+{
 
-    @XmlElement(name = "Antragsart")
-    @XmlSchemaType(name = "string")
-    protected AntragsartType antragsart;
-    @XmlElement(name = "Personen", required = true)
-    protected List<BeteiligtePersonVertragType> personen;
-    @XmlElement(name = "Versicherungsnehmer")
-    @XmlSchemaType(name = "unsignedShort")
-    protected int versicherungsnehmer;
-    @XmlElement(name = "AbweichenderPraemienzahler")
-    @XmlSchemaType(name = "unsignedShort")
-    protected Integer abweichenderPraemienzahler;
-    @XmlElement(name = "WeitereVersicherungsnehmer", type = Integer.class)
-    @XmlSchemaType(name = "unsignedShort")
-    protected List<Integer> weitereVersicherungsnehmer;
-    @XmlElement(name = "WeitereVertragspersonen")
-    protected List<VertragspersonType> weitereVertragspersonen;
-    @XmlElement(name = "AbgelehnteRisiken")
-    protected AbgelehnteRisikenType abgelehnteRisiken;
-    @XmlElement(name = "Vorversicherungen")
-    protected VorversicherungenType vorversicherungen;
-    @XmlElement(name = "Zahlungsdaten", required = true)
-    protected ZahlungsdatenType zahlungsdaten;
-    @XmlElement(name = "Sepa")
-    @XmlSchemaType(name = "unsignedByte")
-    protected Short sepa;
     @XmlElement(name = "Vinkulierung")
     protected VinkularglaeubigerType vinkulierung;
-    @XmlElement(name = "Polizzenversand")
-    @XmlSchemaType(name = "string")
-    protected PolizzenversandType polizzenversand;
-    @XmlElement(name = "Datenschutzbestimmungen", required = true)
-    protected DatenverwendungType datenschutzbestimmungen;
-    @XmlElement(name = "Kontierung")
-    protected List<KontierungType> kontierung;
-    @XmlElement(name = "Ersatzpolizzennummer")
-    protected ErsatzpolizzenType ersatzpolizzennummer;
-    @XmlElement(name = "ZusendungWeitereDokumente")
-    protected List<String> zusendungWeitereDokumente;
-    @XmlElement(name = "ZusaetzlicheAntragsdaten")
-    protected List<ZusaetzlicheAntragsdatenType> zusaetzlicheAntragsdaten;
-
-    /**
-     * Ruft den Wert der antragsart-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AntragsartType }
-     *     
-     */
-    public AntragsartType getAntragsart() {
-        return antragsart;
-    }
-
-    /**
-     * Legt den Wert der antragsart-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AntragsartType }
-     *     
-     */
-    public void setAntragsart(AntragsartType value) {
-        this.antragsart = value;
-    }
-
-    /**
-     * Gets the value of the personen property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the personen property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPersonen().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link BeteiligtePersonVertragType }
-     * 
-     * 
-     */
-    public List<BeteiligtePersonVertragType> getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList<BeteiligtePersonVertragType>();
-        }
-        return this.personen;
-    }
-
-    /**
-     * Ruft den Wert der versicherungsnehmer-Eigenschaft ab.
-     * 
-     */
-    public int getVersicherungsnehmer() {
-        return versicherungsnehmer;
-    }
-
-    /**
-     * Legt den Wert der versicherungsnehmer-Eigenschaft fest.
-     * 
-     */
-    public void setVersicherungsnehmer(int value) {
-        this.versicherungsnehmer = value;
-    }
-
-    /**
-     * Ruft den Wert der abweichenderPraemienzahler-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Integer }
-     *     
-     */
-    public Integer getAbweichenderPraemienzahler() {
-        return abweichenderPraemienzahler;
-    }
-
-    /**
-     * Legt den Wert der abweichenderPraemienzahler-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Integer }
-     *     
-     */
-    public void setAbweichenderPraemienzahler(Integer value) {
-        this.abweichenderPraemienzahler = value;
-    }
-
-    /**
-     * Gets the value of the weitereVersicherungsnehmer property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the weitereVersicherungsnehmer property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWeitereVersicherungsnehmer().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Integer }
-     * 
-     * 
-     */
-    public List<Integer> getWeitereVersicherungsnehmer() {
-        if (weitereVersicherungsnehmer == null) {
-            weitereVersicherungsnehmer = new ArrayList<Integer>();
-        }
-        return this.weitereVersicherungsnehmer;
-    }
-
-    /**
-     * Gets the value of the weitereVertragspersonen property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the weitereVertragspersonen property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWeitereVertragspersonen().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link VertragspersonType }
-     * 
-     * 
-     */
-    public List<VertragspersonType> getWeitereVertragspersonen() {
-        if (weitereVertragspersonen == null) {
-            weitereVertragspersonen = new ArrayList<VertragspersonType>();
-        }
-        return this.weitereVertragspersonen;
-    }
-
-    /**
-     * Ruft den Wert der abgelehnteRisiken-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AbgelehnteRisikenType }
-     *     
-     */
-    public AbgelehnteRisikenType getAbgelehnteRisiken() {
-        return abgelehnteRisiken;
-    }
-
-    /**
-     * Legt den Wert der abgelehnteRisiken-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AbgelehnteRisikenType }
-     *     
-     */
-    public void setAbgelehnteRisiken(AbgelehnteRisikenType value) {
-        this.abgelehnteRisiken = value;
-    }
-
-    /**
-     * Ruft den Wert der vorversicherungen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link VorversicherungenType }
-     *     
-     */
-    public VorversicherungenType getVorversicherungen() {
-        return vorversicherungen;
-    }
-
-    /**
-     * Legt den Wert der vorversicherungen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link VorversicherungenType }
-     *     
-     */
-    public void setVorversicherungen(VorversicherungenType value) {
-        this.vorversicherungen = value;
-    }
-
-    /**
-     * Ruft den Wert der zahlungsdaten-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public ZahlungsdatenType getZahlungsdaten() {
-        return zahlungsdaten;
-    }
-
-    /**
-     * Legt den Wert der zahlungsdaten-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ZahlungsdatenType }
-     *     
-     */
-    public void setZahlungsdaten(ZahlungsdatenType value) {
-        this.zahlungsdaten = value;
-    }
-
-    /**
-     * Ruft den Wert der sepa-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Short }
-     *     
-     */
-    public Short getSepa() {
-        return sepa;
-    }
-
-    /**
-     * Legt den Wert der sepa-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Short }
-     *     
-     */
-    public void setSepa(Short value) {
-        this.sepa = value;
-    }
 
     /**
      * Ruft den Wert der vinkulierung-Eigenschaft ab.
@@ -405,163 +75,4 @@ public abstract class SpezAntragType {
         this.vinkulierung = value;
     }
 
-    /**
-     * Ruft den Wert der polizzenversand-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PolizzenversandType }
-     *     
-     */
-    public PolizzenversandType getPolizzenversand() {
-        return polizzenversand;
-    }
-
-    /**
-     * Legt den Wert der polizzenversand-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PolizzenversandType }
-     *     
-     */
-    public void setPolizzenversand(PolizzenversandType value) {
-        this.polizzenversand = value;
-    }
-
-    /**
-     * Ruft den Wert der datenschutzbestimmungen-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DatenverwendungType }
-     *     
-     */
-    public DatenverwendungType getDatenschutzbestimmungen() {
-        return datenschutzbestimmungen;
-    }
-
-    /**
-     * Legt den Wert der datenschutzbestimmungen-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DatenverwendungType }
-     *     
-     */
-    public void setDatenschutzbestimmungen(DatenverwendungType value) {
-        this.datenschutzbestimmungen = value;
-    }
-
-    /**
-     * Gets the value of the kontierung property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the kontierung property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getKontierung().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link KontierungType }
-     * 
-     * 
-     */
-    public List<KontierungType> getKontierung() {
-        if (kontierung == null) {
-            kontierung = new ArrayList<KontierungType>();
-        }
-        return this.kontierung;
-    }
-
-    /**
-     * Ruft den Wert der ersatzpolizzennummer-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ErsatzpolizzenType }
-     *     
-     */
-    public ErsatzpolizzenType getErsatzpolizzennummer() {
-        return ersatzpolizzennummer;
-    }
-
-    /**
-     * Legt den Wert der ersatzpolizzennummer-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ErsatzpolizzenType }
-     *     
-     */
-    public void setErsatzpolizzennummer(ErsatzpolizzenType value) {
-        this.ersatzpolizzennummer = value;
-    }
-
-    /**
-     * Gets the value of the zusendungWeitereDokumente property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the zusendungWeitereDokumente property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getZusendungWeitereDokumente().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getZusendungWeitereDokumente() {
-        if (zusendungWeitereDokumente == null) {
-            zusendungWeitereDokumente = new ArrayList<String>();
-        }
-        return this.zusendungWeitereDokumente;
-    }
-
-    /**
-     * Gets the value of the zusaetzlicheAntragsdaten property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the zusaetzlicheAntragsdaten property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getZusaetzlicheAntragsdaten().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ZusaetzlicheAntragsdatenType }
-     * 
-     * 
-     */
-    public List<ZusaetzlicheAntragsdatenType> getZusaetzlicheAntragsdaten() {
-        if (zusaetzlicheAntragsdaten == null) {
-            zusaetzlicheAntragsdaten = new ArrayList<ZusaetzlicheAntragsdatenType>();
-        }
-        return this.zusaetzlicheAntragsdaten;
-    }
-
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezBerechnungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezBerechnungType.java
index 80b80b92..0fe7e188 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezBerechnungType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezBerechnungType.java
@@ -33,11 +33,11 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SpezBerechnungUnfall
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SpezBerechnung_Type")
 @XmlSeeAlso({
-    SpezBerechnungRechtsschutzType.class,
-    BerechnungSachPrivatType.class,
     SpezBerechnungUnfallType.class,
+    SpezBerechnungLebenType.class,
     SpezBerechnungKfzType.class,
-    SpezBerechnungLebenType.class
+    BerechnungSachPrivatType.class,
+    SpezBerechnungRechtsschutzType.class
 })
 public abstract class SpezBerechnungType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezOffertType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezOffertType.java
index 55111b62..37b5bd0d 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezOffertType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SpezOffertType.java
@@ -48,11 +48,11 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SpezOffertUnfallType
     "versicherungsnehmer"
 })
 @XmlSeeAlso({
-    SpezOffertRechtsschutzType.class,
-    OffertSachPrivatType.class,
     SpezOffertUnfallType.class,
+    SpezOffertLebenType.class,
     SpezOffertKfzType.class,
-    SpezOffertLebenType.class
+    OffertSachPrivatType.class,
+    SpezOffertRechtsschutzType.class
 })
 public abstract class SpezOffertType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationRequestGenType.java
index b5b8c00f..0213885e 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationRequestGenType.java
@@ -38,10 +38,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SubmitApplicationUnf
     "produktmetadaten"
 })
 @XmlSeeAlso({
-    SubmitApplicationRechtsschutzRequestType.class,
-    SubmitApplicationSachPrivatRequestType.class,
     SubmitApplicationUnfallRequestType.class,
-    SubmitApplicationLebenRequestType.class
+    SubmitApplicationLebenRequestType.class,
+    SubmitApplicationSachPrivatRequestType.class,
+    SubmitApplicationRechtsschutzRequestType.class
 })
 public abstract class SubmitApplicationRequestGenType
     extends SubmitApplicationRequestType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java
index 36d68f1a..647390e1 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/common/SubmitApplicationResponseGenType.java
@@ -32,10 +32,10 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.SubmitApplicationUnf
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SubmitApplicationResponseGen_Type")
 @XmlSeeAlso({
-    SubmitApplicationRechtsschutzResponseType.class,
-    SubmitApplicationSachPrivatResponseType.class,
     SubmitApplicationUnfallResponseType.class,
-    SubmitApplicationLebenResponseType.class
+    SubmitApplicationLebenResponseType.class,
+    SubmitApplicationSachPrivatResponseType.class,
+    SubmitApplicationRechtsschutzResponseType.class
 })
 public abstract class SubmitApplicationResponseGenType
     extends SubmitApplicationResponseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/CalculateLebenResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/CalculateLebenResponseType.java
index bd123e3d..269eb493 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/CalculateLebenResponseType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/CalculateLebenResponseType.java
@@ -1,6 +1,8 @@
 
 package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -21,6 +23,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.CalculateResponseGen
  *     &lt;extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}CalculateResponseGen_Type"&gt;
  *       &lt;sequence&gt;
  *         &lt;element name="Berechnungsantwort" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezBerechnungLeben_Type"/&gt;
+ *         &lt;element name="Upsellingvarianten" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}SpezBerechnungLeben_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -31,7 +34,8 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.CalculateResponseGen
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "CalculateLebenResponse_Type", propOrder = {
-    "berechnungsantwort"
+    "berechnungsantwort",
+    "upsellingvarianten"
 })
 public class CalculateLebenResponseType
     extends CalculateResponseGenType
@@ -39,6 +43,8 @@ public class CalculateLebenResponseType
 
     @XmlElement(name = "Berechnungsantwort", required = true)
     protected SpezBerechnungLebenType berechnungsantwort;
+    @XmlElement(name = "Upsellingvarianten")
+    protected List<SpezBerechnungLebenType> upsellingvarianten;
 
     /**
      * Ruft den Wert der berechnungsantwort-Eigenschaft ab.
@@ -64,4 +70,33 @@ public class CalculateLebenResponseType
         this.berechnungsantwort = value;
     }
 
+    /**
+     * Gets the value of the upsellingvarianten property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the upsellingvarianten property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getUpsellingvarianten().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link SpezBerechnungLebenType }
+     * 
+     * 
+     */
+    public List<SpezBerechnungLebenType> getUpsellingvarianten() {
+        if (upsellingvarianten == null) {
+            upsellingvarianten = new ArrayList<SpezBerechnungLebenType>();
+        }
+        return this.upsellingvarianten;
+    }
+
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/ObjectFactory.java
index b38817cd..ade192a0 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/ObjectFactory.java
@@ -32,6 +32,7 @@ public class ObjectFactory {
     private final static QName _CreateApplicationLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "CreateApplicationLebenResponse");
     private final static QName _SubmitApplicationLebenRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "SubmitApplicationLebenRequest");
     private final static QName _SubmitApplicationLebenResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "SubmitApplicationLebenResponse");
+    private final static QName _ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", "Versicherungssumme");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben
@@ -105,19 +106,83 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ProduktLebenType }
+     * Create an instance of {@link VersichertePersonLebenType }
      * 
      */
-    public ProduktLebenType createProduktLebenType() {
-        return new ProduktLebenType();
+    public VersichertePersonLebenType createVersichertePersonLebenType() {
+        return new VersichertePersonLebenType();
     }
 
     /**
-     * Create an instance of {@link ElementarproduktLebenType }
+     * Create an instance of {@link TarifLebenType }
      * 
      */
-    public ElementarproduktLebenType createElementarproduktLebenType() {
-        return new ElementarproduktLebenType();
+    public TarifLebenType createTarifLebenType() {
+        return new TarifLebenType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungLebenType }
+     * 
+     */
+    public ZusatzversicherungLebenType createZusatzversicherungLebenType() {
+        return new ZusatzversicherungLebenType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungBerufsunfaehigkeitType }
+     * 
+     */
+    public ZusatzversicherungBerufsunfaehigkeitType createZusatzversicherungBerufsunfaehigkeitType() {
+        return new ZusatzversicherungBerufsunfaehigkeitType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungErwerbsunfaehigkeitType }
+     * 
+     */
+    public ZusatzversicherungErwerbsunfaehigkeitType createZusatzversicherungErwerbsunfaehigkeitType() {
+        return new ZusatzversicherungErwerbsunfaehigkeitType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungPraemienuebernahmeAblebenType }
+     * 
+     */
+    public ZusatzversicherungPraemienuebernahmeAblebenType createZusatzversicherungPraemienuebernahmeAblebenType() {
+        return new ZusatzversicherungPraemienuebernahmeAblebenType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungUnfalltodType }
+     * 
+     */
+    public ZusatzversicherungUnfalltodType createZusatzversicherungUnfalltodType() {
+        return new ZusatzversicherungUnfalltodType();
+    }
+
+    /**
+     * Create an instance of {@link ZusatzversicherungUnfallinvaliditaetType }
+     * 
+     */
+    public ZusatzversicherungUnfallinvaliditaetType createZusatzversicherungUnfallinvaliditaetType() {
+        return new ZusatzversicherungUnfallinvaliditaetType();
+    }
+
+    /**
+     * Create an instance of {@link RentenoptionType }
+     * 
+     */
+    public RentenoptionType createRentenoptionType() {
+        return new RentenoptionType();
+    }
+
+    /**
+     * Create an instance of {@link VersicherungssummeZusatzbausteinType }
+     * 
+     */
+    public VersicherungssummeZusatzbausteinType createVersicherungssummeZusatzbausteinType() {
+        return new VersicherungssummeZusatzbausteinType();
     }
 
     /**
@@ -224,4 +289,22 @@ public class ObjectFactory {
         return new JAXBElement<SubmitApplicationLebenResponseType>(_SubmitApplicationLebenResponse_QNAME, SubmitApplicationLebenResponseType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "Versicherungssumme", scope = ZusatzversicherungUnfallinvaliditaetType.class)
+    public JAXBElement<VersicherungssummeZusatzbausteinType> createZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme(VersicherungssummeZusatzbausteinType value) {
+        return new JAXBElement<VersicherungssummeZusatzbausteinType>(_ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME, VersicherungssummeZusatzbausteinType.class, ZusatzversicherungUnfallinvaliditaetType.class, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link VersicherungssummeZusatzbausteinType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", name = "Versicherungssumme", scope = ZusatzversicherungUnfalltodType.class)
+    public JAXBElement<VersicherungssummeZusatzbausteinType> createZusatzversicherungUnfalltodTypeVersicherungssumme(VersicherungssummeZusatzbausteinType value) {
+        return new JAXBElement<VersicherungssummeZusatzbausteinType>(_ZusatzversicherungUnfallinvaliditaetTypeVersicherungssumme_QNAME, VersicherungssummeZusatzbausteinType.class, ZusatzversicherungUnfalltodType.class, value);
+    }
+
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/SpezAntragLebenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/SpezAntragLebenType.java
index 9912e87e..7782f5bf 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/SpezAntragLebenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/SpezAntragLebenType.java
@@ -1,14 +1,11 @@
 
 package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds2Types.v2_11.ELBezugsberechtigungType;
-import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SpezAntragType;
+import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SpezAntragPersonenType;
 
 
 /**
@@ -21,9 +18,8 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SpezAntragType;
  * <pre>
  * &lt;complexType name="SpezAntragLeben_Type"&gt;
  *   &lt;complexContent&gt;
- *     &lt;extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type"&gt;
+ *     &lt;extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntragPersonen_Type"&gt;
  *       &lt;sequence&gt;
- *         &lt;element ref="{urn:omds20}EL-Bezugsberechtigung" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="Verkaufsprodukt" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VerkaufsproduktLeben_Type"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
@@ -35,47 +31,15 @@ import at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.SpezAntragType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "SpezAntragLeben_Type", propOrder = {
-    "elBezugsberechtigung",
     "verkaufsprodukt"
 })
 public class SpezAntragLebenType
-    extends SpezAntragType
+    extends SpezAntragPersonenType
 {
 
-    @XmlElement(name = "EL-Bezugsberechtigung", namespace = "urn:omds20")
-    protected List<ELBezugsberechtigungType> elBezugsberechtigung;
     @XmlElement(name = "Verkaufsprodukt", required = true)
     protected VerkaufsproduktLebenType verkaufsprodukt;
 
-    /**
-     * Gets the value of the elBezugsberechtigung property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the elBezugsberechtigung property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getELBezugsberechtigung().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ELBezugsberechtigungType }
-     * 
-     * 
-     */
-    public List<ELBezugsberechtigungType> getELBezugsberechtigung() {
-        if (elBezugsberechtigung == null) {
-            elBezugsberechtigung = new ArrayList<ELBezugsberechtigungType>();
-        }
-        return this.elBezugsberechtigung;
-    }
-
     /**
      * Ruft den Wert der verkaufsprodukt-Eigenschaft ab.
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/VerkaufsproduktLebenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/VerkaufsproduktLebenType.java
index f63fc71b..f3862bb7 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/VerkaufsproduktLebenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/leben/VerkaufsproduktLebenType.java
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.VerkaufsproduktGenerischType;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertePersonType;
@@ -23,8 +24,9 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertePersonType;
  *   &lt;complexContent&gt;
  *     &lt;extension base="{urn:omds3CommonServiceTypes-1-1-0}VerkaufsproduktGenerisch_Type"&gt;
  *       &lt;sequence&gt;
- *         &lt;element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}ProduktLeben_Type" maxOccurs="unbounded"/&gt;
- *         &lt;element name="Personen" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertePerson_Type" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="VersichertePersonen" type="{urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben}VersichertePersonLeben_Type" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="Personendaten" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertePerson_Type" maxOccurs="unbounded"/&gt;
+ *         &lt;element name="RefSicherstellungLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -35,60 +37,64 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertePersonType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VerkaufsproduktLeben_Type", propOrder = {
-    "produkte",
-    "personen"
+    "versichertePersonen",
+    "personendaten",
+    "refSicherstellungLfnr"
 })
 public class VerkaufsproduktLebenType
     extends VerkaufsproduktGenerischType
 {
 
-    @XmlElement(name = "Produkte", required = true)
-    protected List<ProduktLebenType> produkte;
-    @XmlElement(name = "Personen", required = true)
-    protected List<VersichertePersonType> personen;
+    @XmlElement(name = "VersichertePersonen", required = true)
+    protected List<VersichertePersonLebenType> versichertePersonen;
+    @XmlElement(name = "Personendaten", required = true)
+    protected List<VersichertePersonType> personendaten;
+    @XmlElement(name = "RefSicherstellungLfnr")
+    @XmlSchemaType(name = "unsignedShort")
+    protected Integer refSicherstellungLfnr;
 
     /**
-     * Gets the value of the produkte property.
+     * Gets the value of the versichertePersonen property.
      * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the produkte property.
+     * This is why there is not a <CODE>set</CODE> method for the versichertePersonen property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getProdukte().add(newItem);
+     *    getVersichertePersonen().add(newItem);
      * </pre>
      * 
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link ProduktLebenType }
+     * {@link VersichertePersonLebenType }
      * 
      * 
      */
-    public List<ProduktLebenType> getProdukte() {
-        if (produkte == null) {
-            produkte = new ArrayList<ProduktLebenType>();
+    public List<VersichertePersonLebenType> getVersichertePersonen() {
+        if (versichertePersonen == null) {
+            versichertePersonen = new ArrayList<VersichertePersonLebenType>();
         }
-        return this.produkte;
+        return this.versichertePersonen;
     }
 
     /**
-     * Gets the value of the personen property.
+     * Gets the value of the personendaten property.
      * 
      * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
      * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the personen property.
+     * This is why there is not a <CODE>set</CODE> method for the personendaten property.
      * 
      * <p>
      * For example, to add a new item, do as follows:
      * <pre>
-     *    getPersonen().add(newItem);
+     *    getPersonendaten().add(newItem);
      * </pre>
      * 
      * 
@@ -98,11 +104,35 @@ public class VerkaufsproduktLebenType
      * 
      * 
      */
-    public List<VersichertePersonType> getPersonen() {
-        if (personen == null) {
-            personen = new ArrayList<VersichertePersonType>();
+    public List<VersichertePersonType> getPersonendaten() {
+        if (personendaten == null) {
+            personendaten = new ArrayList<VersichertePersonType>();
         }
-        return this.personen;
+        return this.personendaten;
+    }
+
+    /**
+     * Ruft den Wert der refSicherstellungLfnr-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    public Integer getRefSicherstellungLfnr() {
+        return refSicherstellungLfnr;
+    }
+
+    /**
+     * Legt den Wert der refSicherstellungLfnr-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setRefSicherstellungLfnr(Integer value) {
+        this.refSicherstellungLfnr = value;
     }
 
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java
index def2555f..e8f4c4c0 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktGebaeudeType.java
@@ -50,15 +50,15 @@ public class GenElementarproduktGebaeudeType
 {
 
     @XmlElementRefs({
+        @XmlElementRef(name = "Unterversicherungsverzicht", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Pauschalbetrag", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Sparte", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Nebenkosten", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Hoechsthaftungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "ProzentVersicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Vorsorge", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Selbstbehalt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Unterversicherungsverzicht", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "Hoechsthaftungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Vorsorge", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "ProzentVersicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Sparte", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Nebenkosten", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false)
     })
     protected List<JAXBElement<?>> rest;
 
@@ -68,8 +68,8 @@ public class GenElementarproduktGebaeudeType
      * <p>
      * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
      * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 298 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd
-     * Zeile 891 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3CommonServiceTypes.xsd
+     * Zeile 301 von file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd
+     * Zeile 936 von file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3CommonServiceTypes.xsd
      * <p>
      * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
      * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
@@ -90,15 +90,15 @@ public class GenElementarproduktGebaeudeType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link Long }{@code >}
-     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
      * {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
+     * {@link JAXBElement }{@code <}{@link Long }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
      * 
      * 
      */
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java
index 9d6907bb..e63ecc98 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/GenElementarproduktHaushaltType.java
@@ -50,15 +50,15 @@ public class GenElementarproduktHaushaltType
 {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "Vorsorge", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Sparte", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Unterversicherungsverzicht", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Selbstbehalt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Hoechsthaftungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Pauschalbetrag", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "ProzentVersicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "Vorsorge", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Nebenkosten", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
         @XmlElementRef(name = "Versicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Selbstbehalt", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Unterversicherungsverzicht", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false)
+        @XmlElementRef(name = "Sparte", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "ProzentVersicherungssumme", namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", type = JAXBElement.class, required = false)
     })
     protected List<JAXBElement<?>> rest;
 
@@ -68,8 +68,8 @@ public class GenElementarproduktHaushaltType
      * <p>
      * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
      * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 313 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd
-     * Zeile 891 von file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3CommonServiceTypes.xsd
+     * Zeile 316 von file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3_ON2_Antrag_SachPrivat.xsd
+     * Zeile 936 von file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3CommonServiceTypes.xsd
      * <p>
      * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
      * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
@@ -90,15 +90,15 @@ public class GenElementarproduktHaushaltType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link Long }{@code >}
-     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
      * {@link JAXBElement }{@code <}{@link Boolean }{@code >}
+     * {@link JAXBElement }{@code <}{@link SelbstbehaltType }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
+     * {@link JAXBElement }{@code <}{@link KostenFixOderProzentType }{@code >}
+     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link Long }{@code >}
      * 
      * 
      */
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/ProduktSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/ProduktSachPrivatType.java
index c790471b..1cbf5fbb 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/ProduktSachPrivatType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/ProduktSachPrivatType.java
@@ -1,12 +1,15 @@
 
 package at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat;
 
+import java.util.ArrayList;
+import java.util.List;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
+import at.vvo.omds.types.omds3Types.r1_5_0.common.Gruppe;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.ProduktGenerischType;
 
 
@@ -21,6 +24,8 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.ProduktGenerischType;
  *     &lt;extension base="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type"&gt;
  *       &lt;sequence&gt;
  *         &lt;element name="VersObjekteRefLfnr" type="{http://www.w3.org/2001/XMLSchema}unsignedShort"/&gt;
+ *         &lt;element name="Elementarprodukte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ElementarproduktSachPrivat_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="Gruppen" type="{urn:omds3CommonServiceTypes-1-1-0}Gruppe" maxOccurs="unbounded" minOccurs="0"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
  *   &lt;/complexContent&gt;
@@ -31,7 +36,9 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.ProduktGenerischType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ProduktSachPrivat_Type", propOrder = {
-    "versObjekteRefLfnr"
+    "versObjekteRefLfnr",
+    "elementarprodukte",
+    "gruppen"
 })
 @XmlSeeAlso({
     ProduktGebaeudeversicherungType.class,
@@ -44,6 +51,10 @@ public abstract class ProduktSachPrivatType
     @XmlElement(name = "VersObjekteRefLfnr")
     @XmlSchemaType(name = "unsignedShort")
     protected int versObjekteRefLfnr;
+    @XmlElement(name = "Elementarprodukte")
+    protected List<ElementarproduktSachPrivatType> elementarprodukte;
+    @XmlElement(name = "Gruppen")
+    protected List<Gruppe> gruppen;
 
     /**
      * Ruft den Wert der versObjekteRefLfnr-Eigenschaft ab.
@@ -61,4 +72,62 @@ public abstract class ProduktSachPrivatType
         this.versObjekteRefLfnr = value;
     }
 
+    /**
+     * Gets the value of the elementarprodukte property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the elementarprodukte property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getElementarprodukte().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link ElementarproduktSachPrivatType }
+     * 
+     * 
+     */
+    public List<ElementarproduktSachPrivatType> getElementarprodukte() {
+        if (elementarprodukte == null) {
+            elementarprodukte = new ArrayList<ElementarproduktSachPrivatType>();
+        }
+        return this.elementarprodukte;
+    }
+
+    /**
+     * Gets the value of the gruppen property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the gruppen property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGruppen().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Gruppe }
+     * 
+     * 
+     */
+    public List<Gruppe> getGruppen() {
+        if (gruppen == null) {
+            gruppen = new ArrayList<Gruppe>();
+        }
+        return this.gruppen;
+    }
+
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
index c205fb95..ceb6d323 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on2antrag/sachPrivat/VerkaufsproduktSachPrivatType.java
@@ -7,6 +7,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import at.vvo.omds.types.omds3Types.r1_5_0.common.Gruppe;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.ProduktGenerischType;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.VerkaufsproduktGenerischType;
 import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertesInteresseType;
@@ -26,6 +27,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertesInteresseType;
  *       &lt;sequence&gt;
  *         &lt;element name="Produkte" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}ProduktSachPrivat_Type" maxOccurs="unbounded"/&gt;
  *         &lt;element name="Zusatzprodukte" type="{urn:omds3CommonServiceTypes-1-1-0}ProduktGenerisch_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
+ *         &lt;element name="Gruppen" type="{urn:omds3CommonServiceTypes-1-1-0}Gruppe" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="VersicherteObjekte" type="{urn:omds3CommonServiceTypes-1-1-0}VersichertesInteresse_Type" maxOccurs="unbounded"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
@@ -39,6 +41,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.VersichertesInteresseType;
 @XmlType(name = "VerkaufsproduktSachPrivat_Type", propOrder = {
     "produkte",
     "zusatzprodukte",
+    "gruppen",
     "versicherteObjekte"
 })
 public class VerkaufsproduktSachPrivatType
@@ -49,6 +52,8 @@ public class VerkaufsproduktSachPrivatType
     protected List<ProduktSachPrivatType> produkte;
     @XmlElement(name = "Zusatzprodukte")
     protected List<ProduktGenerischType> zusatzprodukte;
+    @XmlElement(name = "Gruppen")
+    protected List<Gruppe> gruppen;
     @XmlElement(name = "VersicherteObjekte", required = true)
     protected List<VersichertesInteresseType> versicherteObjekte;
 
@@ -110,6 +115,35 @@ public class VerkaufsproduktSachPrivatType
         return this.zusatzprodukte;
     }
 
+    /**
+     * Gets the value of the gruppen property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the gruppen property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGruppen().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Gruppe }
+     * 
+     * 
+     */
+    public List<Gruppe> getGruppen() {
+        if (gruppen == null) {
+            gruppen = new ArrayList<Gruppe>();
+        }
+        return this.gruppen;
+    }
+
     /**
      * Gets the value of the versicherteObjekte property.
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java
index a1d6a1c6..df7fc15b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on4partner/ChangeCommunicationObjectRequestType.java
@@ -115,9 +115,9 @@ public class ChangeCommunicationObjectRequestType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
      * {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ELKommunikationType }{@code >}
      * 
      * 
      */
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/NatPersonType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/NatPersonType.java
index ab58b4a3..79ce4390 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/NatPersonType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/NatPersonType.java
@@ -9,6 +9,8 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
+ * Natuerliche Person
+ * 
  * <p>Java-Klasse für NatPerson_Type complex type.
  * 
  * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ObjectFactory.java
index 195bb05a..a475b1a9 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ObjectFactory.java
@@ -33,9 +33,9 @@ public class ObjectFactory {
     private final static QName _GetClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GetClaimResponse");
     private final static QName _SearchClaimRequest_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SearchClaimRequest");
     private final static QName _SearchClaimResponse_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "SearchClaimResponse");
-    private final static QName _Schadenzuordnung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "Schadenzuordnung");
     private final static QName _GeschaeftsfallSchadenereignis_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GeschaeftsfallSchadenereignis");
     private final static QName _GeschaeftsfallSchadenanlage_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "GeschaeftsfallSchadenanlage");
+    private final static QName _Schadenzuordnung_QNAME = new QName("urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", "Schadenzuordnung");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.vvo.omds.types.omds3Types.r1_5_0.on7schaden
@@ -356,15 +356,6 @@ public class ObjectFactory {
         return new JAXBElement<SearchClaimResponseType>(_SearchClaimResponse_QNAME, SearchClaimResponseType.class, null, value);
     }
 
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SchadenzuordnungType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "Schadenzuordnung")
-    public JAXBElement<SchadenzuordnungType> createSchadenzuordnung(SchadenzuordnungType value) {
-        return new JAXBElement<SchadenzuordnungType>(_Schadenzuordnung_QNAME, SchadenzuordnungType.class, null, value);
-    }
-
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ObjektIdType }{@code >}}
      * 
@@ -383,4 +374,13 @@ public class ObjectFactory {
         return new JAXBElement<ObjektIdType>(_GeschaeftsfallSchadenanlage_QNAME, ObjektIdType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SchadenzuordnungType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", name = "Schadenzuordnung")
+    public JAXBElement<SchadenzuordnungType> createSchadenzuordnung(SchadenzuordnungType value) {
+        return new JAXBElement<SchadenzuordnungType>(_Schadenzuordnung_QNAME, SchadenzuordnungType.class, null, value);
+    }
+
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java
index c2c5ebeb..a55b35f1 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/ReferenzAufBeteiligtePersonSchadenType.java
@@ -10,6 +10,8 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
+ * Das Zuordnungsobjekt, welches die fachliche Zuordnung eines Schadens ermöglicht
+ * 
  * <p>Java-Klasse für ReferenzAufBeteiligtePersonSchaden_Type complex type.
  * 
  * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SchadenereignisType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SchadenereignisType.java
index 31f40f3d..7dcd193f 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SchadenereignisType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SchadenereignisType.java
@@ -28,7 +28,7 @@ import at.vvo.omds.types.omds3Types.r1_5_0.common.PersBankverbindungType;
  *         &lt;element name="GeschaedigteInteressen" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}GeschaedigtesInteresse_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="Dokumente" type="{urn:omds3CommonServiceTypes-1-1-0}DokumentenReferenz_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="Schadenmelder" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schadenmelder_Type" minOccurs="0"/&gt;
- *         &lt;element name="Bankverbindung" type="{urn:omds3CommonServiceTypes-1-1-0}PersBankverbindung_Type" minOccurs="0"/&gt;
+ *         &lt;element name="Bankverbindung" type="{urn:omds3CommonServiceTypes-1-1-0}PersBankverbindung_Type" maxOccurs="unbounded" minOccurs="0"/&gt;
  *         &lt;element name="Schaeden" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden}Schaden_Type" maxOccurs="unbounded"/&gt;
  *       &lt;/sequence&gt;
  *     &lt;/extension&gt;
@@ -63,7 +63,7 @@ public class SchadenereignisType
     @XmlElement(name = "Schadenmelder")
     protected SchadenmelderType schadenmelder;
     @XmlElement(name = "Bankverbindung")
-    protected PersBankverbindungType bankverbindung;
+    protected List<PersBankverbindungType> bankverbindung;
     @XmlElement(name = "Schaeden", required = true)
     protected List<SchadenType> schaeden;
 
@@ -203,27 +203,32 @@ public class SchadenereignisType
     }
 
     /**
-     * Ruft den Wert der bankverbindung-Eigenschaft ab.
+     * Gets the value of the bankverbindung property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the bankverbindung property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBankverbindung().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PersBankverbindungType }
      * 
-     * @return
-     *     possible object is
-     *     {@link PersBankverbindungType }
-     *     
-     */
-    public PersBankverbindungType getBankverbindung() {
-        return bankverbindung;
-    }
-
-    /**
-     * Legt den Wert der bankverbindung-Eigenschaft fest.
      * 
-     * @param value
-     *     allowed object is
-     *     {@link PersBankverbindungType }
-     *     
      */
-    public void setBankverbindung(PersBankverbindungType value) {
-        this.bankverbindung = value;
+    public List<PersBankverbindungType> getBankverbindung() {
+        if (bankverbindung == null) {
+            bankverbindung = new ArrayList<PersBankverbindungType>();
+        }
+        return this.bankverbindung;
     }
 
     /**
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SearchClaimResponseResultType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SearchClaimResponseResultType.java
index aa8dc4bd..30abef78 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SearchClaimResponseResultType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/on7schaden/SearchClaimResponseResultType.java
@@ -11,6 +11,8 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
+ * Das Ergebnisobjekt der Schadensuche
+ * 
  * <p>Java-Klasse für SearchClaimResponseResult_Type complex type.
  * 
  * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsService.java
index 6f6c8dbf..79f33026 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsService.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsService.java
@@ -10,12 +10,12 @@ import javax.xml.ws.Service;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-11-14T08:41:36.190+01:00
+ * 2020-02-26T16:04:50.130+01:00
  * Generated source version: 3.2.0
  * 
  */
 @WebServiceClient(name = "omdsService", 
-                  wsdlLocation = "file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl",
+                  wsdlLocation = "file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl",
                   targetNamespace = "urn:omds3Services-1-4-0") 
 public class OmdsService extends Service {
 
@@ -26,11 +26,11 @@ public class OmdsService extends Service {
     static {
         URL url = null;
         try {
-            url = new URL("file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl");
+            url = new URL("file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl");
         } catch (MalformedURLException e) {
             java.util.logging.Logger.getLogger(OmdsService.class.getName())
                 .log(java.util.logging.Level.INFO, 
-                     "Can not initialize the default wsdl from {0}", "file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl");
+                     "Can not initialize the default wsdl from {0}", "file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl");
         }
         WSDL_LOCATION = url;
     }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortImpl.java
index 4bf0f2ae..fdae91fa 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortImpl.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortImpl.java
@@ -7,11 +7,16 @@
 package at.vvo.omds.types.omds3Types.r1_5_0.service;
 
 import java.util.logging.Logger;
-import javax.xml.ws.soap.MTOM;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-11-14T08:41:36.122+01:00
+ * 2020-02-26T16:04:50.048+01:00
  * Generated source version: 3.2.0
  * 
  */
@@ -20,10 +25,9 @@ import javax.xml.ws.soap.MTOM;
                       serviceName = "omdsService",
                       portName = "omdsServicePort",
                       targetNamespace = "urn:omds3Services-1-4-0",
-                      wsdlLocation = "file:/C:/Users/Jens/git/omdsservicedefinitions/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl",
+                      wsdlLocation = "file:/C:/Users/Jens/git/omds_unfall_leben/OMDSServiceDefinition/src/main/resources/def/r1_5_0/omds3Services.wsdl",
                       endpointInterface = "at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType")
-
-@MTOM(enabled = true, threshold = 1024)
+                      
 public class OmdsServicePortImpl implements OmdsServicePortType {
 
     private static final Logger LOG = Logger.getLogger(OmdsServicePortImpl.class.getName());
@@ -220,22 +224,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#initiateClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimResponseType initiateClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation initiateClaim");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
     /* (non-Javadoc)
      * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#submitClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimRequestType parameters)*
      */
@@ -284,22 +272,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getClaimLight(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseLightType getClaimLight(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getClaimLight");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseLightType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
     /* (non-Javadoc)
      * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getPoliciesOfPartner(at.vvo.omds.types.omds3Types.r1_5_0.on3vertrag.GetPoliciesOfPartnerRequestType parameters)*
      */
@@ -364,22 +336,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getChangedClaimsList(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListResponseType getChangedClaimsList(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getChangedClaimsList");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
     /* (non-Javadoc)
      * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getPartner(at.vvo.omds.types.omds3Types.r1_5_0.on4partner.GetPartnerRequestType parameters)*
      */
@@ -444,22 +400,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getLossEventList(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListResponseType getLossEventList(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation getLossEventList");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
     /* (non-Javadoc)
      * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.OMDSPackageListRequest parameters)*
      */
@@ -749,9 +689,9 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
     }
 
     /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters)*
+     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#getClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimRequestType parameters)*
      */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseType getClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters) throws ServiceFaultMsg   { 
+    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseType getClaim(at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimRequestType parameters) throws ServiceFaultMsg   { 
         LOG.info("Executing operation getClaim");
         System.out.println(parameters);
         try {
@@ -828,22 +768,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#declareEndpoint(at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointRequestType parameters)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointResponseType declareEndpoint(at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointRequestType parameters) throws ServiceFaultMsg   { 
-        LOG.info("Executing operation declareEndpoint");
-        System.out.println(parameters);
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointResponseType _return = null;
-            return _return;
-        } catch (java.lang.Exception ex) {
-            ex.printStackTrace();
-            throw new RuntimeException(ex);
-        }
-        //throw new ServiceFaultMsg("ServiceFaultMsg...");
-    }
-
     /* (non-Javadoc)
      * @see at.vvo.omds.types.omds3Types.r1_5_0.service.OmdsServicePortType#changePartnerMainAddress(at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ChangePartnerMainAddressRequestType parameters)*
      */
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType.java
index d695eba8..8aba6c97 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType.java
@@ -9,12 +9,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-11-14T08:41:36.155+01:00
+ * 2020-02-26T16:04:50.096+01:00
  * Generated source version: 3.2.0
  * 
  */
 @WebService(targetNamespace = "urn:omds3Services-1-4-0", name = "omdsServicePortType")
-@XmlSeeAlso({at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on1basis.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.ObjectFactory.class, at.vvo.omds.types.omds2Types.v2_11.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.common.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on3vertrag.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.ObjectFactory.class})
+@XmlSeeAlso({at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.rs.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.leben.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on1basis.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.unfall.ObjectFactory.class, at.vvo.omds.types.omds2Types.v2_11.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.common.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on3vertrag.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.sachPrivat.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.common.ObjectFactory.class, at.vvo.omds.types.omds3Types.r1_5_0.on2antrag.kfz.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 public interface OmdsServicePortType {
 
@@ -102,13 +102,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ChangePersonDataRequestType parameters
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:initiateClaim")
-    @WebResult(name = "InitiateClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimResponseType initiateClaim(
-        @WebParam(partName = "parameters", name = "InitiateClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimRequestType parameters
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:submitClaim")
     @WebResult(name = "SubmitClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SubmitClaimResponseType submitClaim(
@@ -130,13 +123,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_5_0.on1basis.GetDocumentsOfPeriodRequestType parameters
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:getClaimLight")
-    @WebResult(name = "GetClaimLightResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseLightType getClaimLight(
-        @WebParam(partName = "parameters", name = "GetClaimLightRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:changePersonData")
     @WebResult(name = "GetPoliciesOfPartnerResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on3vertrag", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.on3vertrag.GetPoliciesOfPartnerResponseType getPoliciesOfPartner(
@@ -165,13 +151,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.CheckClaimRequestType parameters
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:getChangedClaimsList")
-    @WebResult(name = "ChangedClaimsListResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListResponseType getChangedClaimsList(
-        @WebParam(partName = "parameters", name = "ChangedClaimsListRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListRequestType parameters
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:getPartner")
     @WebResult(name = "GetPartnerResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.on4partner.GetPartnerResponseType getPartner(
@@ -200,13 +179,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.ArcImageInfosRequest parameters
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:getLossEventList")
-    @WebResult(name = "LossEventListResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListResponseType getLossEventList(
-        @WebParam(partName = "parameters", name = "LossEventListRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListRequestType parameters
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:getOMDSPackageList")
     @WebResult(name = "getOMDSPackageListResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(
@@ -337,7 +309,7 @@ public interface OmdsServicePortType {
     @WebResult(name = "GetClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseType getClaim(
         @WebParam(partName = "parameters", name = "GetClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType parameters
+        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimRequestType parameters
     ) throws ServiceFaultMsg;
 
     @WebMethod(action = "urn:setMailingAddress")
@@ -368,13 +340,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.LoginRequestType parameters
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:declareEndpoint")
-    @WebResult(name = "DeclareEndpointResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "parameters")
-    public at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointResponseType declareEndpoint(
-        @WebParam(partName = "parameters", name = "DeclareEndpointRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointRequestType parameters
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:changePartnerMainAddress")
     @WebResult(name = "ChangePartnerMainAddressResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on4partner", partName = "parameters")
     public at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ChangePartnerMainAddressResponseType changePartnerMainAddress(
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType_OmdsServicePort_Client.java
index e3ada58d..ead0d1b6 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType_OmdsServicePort_Client.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/OmdsServicePortType_OmdsServicePort_Client.java
@@ -10,11 +10,16 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.soap.MTOMFeature;
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebResult;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-11-14T08:41:36.027+01:00
+ * 2020-02-26T16:04:49.948+01:00
  * Generated source version: 3.2.0
  * 
  */
@@ -39,12 +44,9 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
                 e.printStackTrace();
             }
         }
-
+      
         OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
-        OmdsServicePortType port = ss.getOmdsServicePort(new MTOMFeature(1024));
-
-//        OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
-//        OmdsServicePortType port = ss.getOmdsServicePort();
+        OmdsServicePortType port = ss.getOmdsServicePort();  
         
         {
         System.out.println("Invoking calculateLeben...");
@@ -185,18 +187,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_5_0.on4partner.ChangePersonDataResponseType _changePersonData__return = port.changePersonData(_changePersonData_parameters);
             System.out.println("changePersonData.result=" + _changePersonData__return);
 
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking initiateClaim...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimRequestType _initiateClaim_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.InitiateClaimResponseType _initiateClaim__return = port.initiateClaim(_initiateClaim_parameters);
-            System.out.println("initiateClaim.result=" + _initiateClaim__return);
-
         } catch (ServiceFaultMsg e) { 
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -233,18 +223,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_5_0.on1basis.GetDocumentsOfPeriodResponseType _getDocumentsOfPeriod__return = port.getDocumentsOfPeriod(_getDocumentsOfPeriod_parameters);
             System.out.println("getDocumentsOfPeriod.result=" + _getDocumentsOfPeriod__return);
 
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getClaimLight...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType _getClaimLight_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseLightType _getClaimLight__return = port.getClaimLight(_getClaimLight_parameters);
-            System.out.println("getClaimLight.result=" + _getClaimLight__return);
-
         } catch (ServiceFaultMsg e) { 
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -293,18 +271,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.CheckClaimResponseType _checkClaim__return = port.checkClaim(_checkClaim_parameters);
             System.out.println("checkClaim.result=" + _checkClaim__return);
 
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getChangedClaimsList...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListRequestType _getChangedClaimsList_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.ChangedClaimsListResponseType _getChangedClaimsList__return = port.getChangedClaimsList(_getChangedClaimsList_parameters);
-            System.out.println("getChangedClaimsList.result=" + _getChangedClaimsList__return);
-
         } catch (ServiceFaultMsg e) { 
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -353,18 +319,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.ArcImageInfosResponse _getArcImageInfos__return = port.getArcImageInfos(_getArcImageInfos_parameters);
             System.out.println("getArcImageInfos.result=" + _getArcImageInfos__return);
 
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking getLossEventList...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListRequestType _getLossEventList_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.LossEventListResponseType _getLossEventList__return = port.getLossEventList(_getLossEventList_parameters);
-            System.out.println("getLossEventList.result=" + _getLossEventList__return);
-
         } catch (ServiceFaultMsg e) { 
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -588,7 +542,7 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             }
         {
         System.out.println("Invoking getClaim...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.SpezifikationSchadenType _getClaim_parameters = null;
+        at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimRequestType _getClaim_parameters = null;
         try {
             at.vvo.omds.types.omds3Types.r1_5_0.on7schaden.GetClaimResponseType _getClaim__return = port.getClaim(_getClaim_parameters);
             System.out.println("getClaim.result=" + _getClaim__return);
@@ -641,18 +595,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_5_0.servicetypes.DeepLinkBusinessObjectResponse _login__return = port.login(_login_parameters);
             System.out.println("login.result=" + _login__return);
 
-        } catch (ServiceFaultMsg e) { 
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-            }
-        {
-        System.out.println("Invoking declareEndpoint...");
-        at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointRequestType _declareEndpoint_parameters = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_5_0.on1basis.DeclareEndpointResponseType _declareEndpoint__return = port.declareEndpoint(_declareEndpoint_parameters);
-            System.out.println("declareEndpoint.result=" + _declareEndpoint__return);
-
         } catch (ServiceFaultMsg e) { 
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/ServiceFaultMsg.java
index 2cdffaae..6154dcee 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/ServiceFaultMsg.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_5_0/service/ServiceFaultMsg.java
@@ -6,7 +6,7 @@ import javax.xml.ws.WebFault;
 
 /**
  * This class was generated by Apache CXF 3.2.0
- * 2019-11-14T08:41:36.104+01:00
+ * 2020-02-26T16:04:50.040+01:00
  * Generated source version: 3.2.0
  */