From c07f5aac63b37acc06e5e11b171876329c2acfd4 Mon Sep 17 00:00:00 2001 From: JensBuehring Date: Thu, 2 Jun 2022 17:01:11 +0200 Subject: [PATCH] Variante zwei Konvertierungshilfe aus WSDL entfernt, Objekte nach CommonServiceTypes verschoben, Umbenennungen in den Bindings angepasst, Java neu generiert. --- .../common/BasisProduktbausteinType.java | 55 +- .../r1_8_0/common/CommonRequestType.java | 14 +- .../r1_8_0/common/CommonResponseType.java | 14 +- .../common/ElementarproduktGenerischType.java | 6 +- .../r1_8_0/common/ElementarproduktType.java | 4 +- .../r1_8_0/common/ErsatzpolizzeType.java | 1 - .../r1_8_0/common/KombinationenType.java | 32 ++ .../common/KonvertierungBaustein2Type.java | 106 ---- .../common/KonvertierungBausteinType.java | 89 ++- .../KonvertierungZusatzinformationType.java | 32 -- .../common/Konvertierungsaktion2Type.java | 70 --- .../KonvertierungsaktionBelassen2Type.java | 34 -- .../KonvertierungsaktionBelassenType.java | 4 +- .../KonvertierungsaktionStorno2Type.java | 34 -- .../KonvertierungsaktionStornoType.java | 4 +- .../common/KonvertierungsaktionType.java | 2 +- .../KonvertierungsaktionUebernehmen2Type.java | 73 --- .../KonvertierungsaktionUebernehmenType.java | 26 +- .../KonvertierungsumfangVertragType.java | 30 +- .../r1_8_0/common/ObjectFactory.java | 174 +++--- .../common/ObjektSpezifikationType.java | 4 +- .../r1_8_0/common/ProduktGenerischType.java | 2 +- .../omds3Types/r1_8_0/common/ProduktType.java | 4 +- .../r1_8_0/common/ServiceFault.java | 3 +- .../common/VerkaufsproduktGenerischType.java | 6 +- .../r1_8_0/common/VerkaufsproduktType.java | 4 +- ...rtesInteresseMitAttributMetadatenType.java | 6 +- .../common/VersichertesInteresseType.java | 28 + .../common/VorversicherungenDetailType.java | 4 +- .../r1_8_0/common/VorversicherungenType.java | 4 +- .../common/CalculateRequestGenType.java | 2 +- .../common/CalculateResponseGenType.java | 2 +- .../common/ConversionProposalRequest2.java | 74 --- .../common/ConversionProposalResponse2.java | 137 ----- .../common/ConversionScopeRequest2.java | 168 ------ .../common/ConversionScopeResponse2.java | 74 --- .../CreateApplicationRequestGenType.java | 2 +- .../CreateApplicationResponseGenType.java | 2 +- .../common/CreateOfferRequestGenType.java | 2 +- .../common/CreateOfferResponseGenType.java | 2 +- .../KonvertierungZusatzinformationType.java | 32 -- .../common/Konvertierungsumfang2Type.java | 72 --- .../common/KonvertierungsumfangType.java | 7 +- .../on2antrag/common/ObjectFactory.java | 88 --- .../on2antrag/common/SpezAntragType.java | 6 +- .../on2antrag/common/SpezBerechnungType.java | 10 +- .../on2antrag/common/SpezOffertType.java | 10 +- .../SubmitApplicationRequestGenType.java | 2 +- .../SubmitApplicationResponseGenType.java | 2 +- ...atzversicherungUnfallinvaliditaetType.java | 4 +- .../ZusatzversicherungUnfalltodType.java | 4 +- .../sachPrivat/RisikoGebaeudeType.java | 4 +- .../r1_8_0/service/OmdsServicePortImpl.java | 516 ++++++++---------- .../r1_8_0/service/OmdsServicePortType.java | 258 ++++----- ...ervicePortType_OmdsServicePort_Client.java | 418 +++++++------- .../r1_8_0/service/ServiceFaultMsg.java | 2 +- .../omds3_ON2_Antrag_Common_binding.xml | 15 - .../r1_8_0/omdsCommonServiceTypes_binding.xml | 23 + .../resources/def/r1_8_0/omds3Services.wsdl | 49 -- 59 files changed, 885 insertions(+), 1971 deletions(-) delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBaustein2Type.java rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungBausteinType.java (67%) delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungZusatzinformationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/Konvertierungsaktion2Type.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassen2Type.java rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungsaktionBelassenType.java (81%) delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStorno2Type.java rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungsaktionStornoType.java (81%) rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungsaktionType.java (96%) delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmen2Type.java rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungsaktionUebernehmenType.java (74%) rename OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/{on2antrag => }/common/KonvertierungsumfangVertragType.java (77%) delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest2.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalResponse2.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest2.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse2.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungZusatzinformationType.java delete mode 100644 OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/Konvertierungsumfang2Type.java diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/BasisProduktbausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/BasisProduktbausteinType.java index acd241cd..957a28f9 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/BasisProduktbausteinType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/BasisProduktbausteinType.java @@ -26,14 +26,13 @@ import javax.xml.bind.annotation.XmlType; * <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="Bedingungen" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/> * <element name="Meldungen" type="{urn:omds3CommonServiceTypes-1-1-0}ServiceFault" maxOccurs="unbounded" minOccurs="0"/> - * <element name="Kombinationen" type="{urn:omds3CommonServiceTypes-1-1-0}Kombinationen_Type" minOccurs="0"/> * <element name="Konvertierung" minOccurs="0"> * <complexType> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="ErsetztId" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="GewaehlteAktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type" minOccurs="0"/> + * <element name="Konvertierungsaktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -53,11 +52,9 @@ import javax.xml.bind.annotation.XmlType; "bezeichnung", "bedingungen", "meldungen", - "kombinationen", "konvertierung" }) @XmlSeeAlso({ - KonvertierungBaustein2Type.class, ProduktbausteinType.class }) public abstract class BasisProduktbausteinType { @@ -70,8 +67,6 @@ public abstract class BasisProduktbausteinType { protected List bedingungen; @XmlElement(name = "Meldungen") protected List meldungen; - @XmlElement(name = "Kombinationen") - protected KombinationenType kombinationen; @XmlElement(name = "Konvertierung") protected BasisProduktbausteinType.Konvertierung konvertierung; @@ -181,30 +176,6 @@ public abstract class BasisProduktbausteinType { return this.meldungen; } - /** - * Ruft den Wert der kombinationen-Eigenschaft ab. - * - * @return - * possible object is - * {@link KombinationenType } - * - */ - public KombinationenType getKombinationen() { - return kombinationen; - } - - /** - * Legt den Wert der kombinationen-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link KombinationenType } - * - */ - public void setKombinationen(KombinationenType value) { - this.kombinationen = value; - } - /** * Ruft den Wert der konvertierung-Eigenschaft ab. * @@ -241,7 +212,7 @@ public abstract class BasisProduktbausteinType { * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> * <element name="ErsetztId" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="GewaehlteAktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type" minOccurs="0"/> + * <element name="Konvertierungsaktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -253,14 +224,14 @@ public abstract class BasisProduktbausteinType { @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { "ersetztId", - "gewaehlteAktion" + "konvertierungsaktion" }) public static class Konvertierung { @XmlElement(name = "ErsetztId", required = true) protected String ersetztId; - @XmlElement(name = "GewaehlteAktion") - protected Konvertierungsaktion2Type gewaehlteAktion; + @XmlElement(name = "Konvertierungsaktion") + protected KonvertierungsaktionType konvertierungsaktion; /** * Ruft den Wert der ersetztId-Eigenschaft ab. @@ -287,27 +258,27 @@ public abstract class BasisProduktbausteinType { } /** - * Ruft den Wert der gewaehlteAktion-Eigenschaft ab. + * Ruft den Wert der konvertierungsaktion-Eigenschaft ab. * * @return * possible object is - * {@link Konvertierungsaktion2Type } + * {@link KonvertierungsaktionType } * */ - public Konvertierungsaktion2Type getGewaehlteAktion() { - return gewaehlteAktion; + public KonvertierungsaktionType getKonvertierungsaktion() { + return konvertierungsaktion; } /** - * Legt den Wert der gewaehlteAktion-Eigenschaft fest. + * Legt den Wert der konvertierungsaktion-Eigenschaft fest. * * @param value * allowed object is - * {@link Konvertierungsaktion2Type } + * {@link KonvertierungsaktionType } * */ - public void setGewaehlteAktion(Konvertierungsaktion2Type value) { - this.gewaehlteAktion = value; + public void setKonvertierungsaktion(KonvertierungsaktionType value) { + this.konvertierungsaktion = value; } } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonRequestType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonRequestType.java index 3f2e968a..064171d5 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonRequestType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonRequestType.java @@ -9,9 +9,7 @@ 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_8_0.on2antrag.common.ConversionProposalRequest; -import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest2; import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest; -import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest2; import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.GetApplicationDocumentRequestType; import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType; import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckCoverageRequest; @@ -54,18 +52,16 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitReceiptRequest; "korrelationsId" }) @XmlSeeAlso({ + GetApplicationDocumentRequestType.class, + CommonSearchRequestType.class, CheckClaimRequestType.class, SubmitClaimRequestType.class, GetClaimRequestType.class, - CommonSearchRequestType.class, - GetApplicationDocumentRequestType.class, - ConversionProposalRequest2 .class, - ConversionScopeRequest2 .class, + SubmitReceiptRequest.class, + CheckCoverageRequest.class, ConversionProposalRequest.class, ConversionScopeRequest.class, - CommonProcessRequestType.class, - SubmitReceiptRequest.class, - CheckCoverageRequest.class + CommonProcessRequestType.class }) public abstract class CommonRequestType { diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonResponseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonResponseType.java index 73f6b57a..a625caac 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonResponseType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/CommonResponseType.java @@ -11,9 +11,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import javax.xml.datatype.XMLGregorianCalendar; import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse; -import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse2; import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse; -import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse2; import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.GetApplicationDocumentResponseType; import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType; import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckCoverageResponse; @@ -54,18 +52,16 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitReceiptResponse; "beendet" }) @XmlSeeAlso({ + GetApplicationDocumentResponseType.class, + CommonSearchResponseType.class, CheckClaimResponseType.class, SubmitClaimResponseType.class, GetClaimResponseType.class, - CommonSearchResponseType.class, - GetApplicationDocumentResponseType.class, - ConversionProposalResponse2 .class, - ConversionScopeResponse2 .class, + SubmitReceiptResponse.class, + CheckCoverageResponse.class, ConversionProposalResponse.class, ConversionScopeResponse.class, - CommonProcessResponseType.class, - SubmitReceiptResponse.class, - CheckCoverageResponse.class + CommonProcessResponseType.class }) public abstract class CommonResponseType { diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktGenerischType.java index 0cd4e599..6b6da660 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktGenerischType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktGenerischType.java @@ -50,10 +50,10 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.LeistungsartUnfallTy "versicherungssumme" }) @XmlSeeAlso({ - LeistungsartUnfallType.class, - TarifLebenType.class, - ElementarproduktSachPrivatType.class, ElementarproduktRechtsschutzType.class, + LeistungsartUnfallType.class, + ElementarproduktSachPrivatType.class, + TarifLebenType.class, ElementarproduktKrankenType.class }) public abstract class ElementarproduktGenerischType diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktType.java index d4c52f0d..6b141183 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ElementarproduktType.java @@ -44,9 +44,9 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.VerkehrsrechtsschutzKfz "zusaetzlicheElementarproduktdaten" }) @XmlSeeAlso({ - ElementarproduktGenerischType.class, ElementarproduktKfzType.class, - VerkehrsrechtsschutzKfzType.class + VerkehrsrechtsschutzKfzType.class, + ElementarproduktGenerischType.class }) public abstract class ElementarproduktType extends ProduktbausteinType diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ErsatzpolizzeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ErsatzpolizzeType.java index 10be1dca..0c418357 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ErsatzpolizzeType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ErsatzpolizzeType.java @@ -6,7 +6,6 @@ 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_8_0.on2antrag.common.KonvertierungsumfangVertragType; /** diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java index c21449cc..bb80e01c 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KombinationenType.java @@ -5,6 +5,7 @@ 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.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -23,6 +24,7 @@ import javax.xml.bind.annotation.XmlType; * <sequence> * <element name="Kombination" type="{urn:omds3CommonServiceTypes-1-1-0}Kombination_Type" maxOccurs="unbounded"/> * </sequence> + * <attribute name="zulaessige" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> * </restriction> * </complexContent> * </complexType> @@ -38,6 +40,8 @@ public class KombinationenType { @XmlElement(name = "Kombination", required = true) protected List kombinationen; + @XmlAttribute(name = "zulaessige", namespace = "urn:omds3CommonServiceTypes-1-1-0") + protected Boolean zulaessige; /** *

Die Liste der zulässigen Kombinationen.

@@ -69,4 +73,32 @@ public class KombinationenType { return this.kombinationen; } + /** + * Ruft den Wert der zulaessige-Eigenschaft ab. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isZulaessige() { + if (zulaessige == null) { + return true; + } else { + return zulaessige; + } + } + + /** + * Legt den Wert der zulaessige-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setZulaessige(Boolean value) { + this.zulaessige = value; + } + } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBaustein2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBaustein2Type.java deleted file mode 100644 index 31d677c5..00000000 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBaustein2Type.java +++ /dev/null @@ -1,106 +0,0 @@ - -package at.vvo.omds.types.omds3Types.r1_8_0.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.XmlType; - - -/** - * Typ um die Behandlung der Unterbausteine in der Konvertierungshilfe zu spezifizieren - * - *

Java-Klasse für KonvertierungBaustein2_Type complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType name="KonvertierungBaustein2_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}BasisProduktbaustein_Type">
- *       <sequence>
- *         <element name="ZulaessigeAktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Zusatzinformation" type="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungZusatzinformation_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KonvertierungBaustein2_Type", propOrder = { - "zulaessigeAktion", - "zusatzinformation" -}) -public class KonvertierungBaustein2Type - extends BasisProduktbausteinType -{ - - @XmlElement(name = "ZulaessigeAktion") - protected List zulaessigeAktion; - @XmlElement(name = "Zusatzinformation") - protected List zusatzinformation; - - /** - * Gets the value of the zulaessigeAktion property. - * - *

- * 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 set method for the zulaessigeAktion property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getZulaessigeAktion().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Konvertierungsaktion2Type } - * - * - */ - public List getZulaessigeAktion() { - if (zulaessigeAktion == null) { - zulaessigeAktion = new ArrayList(); - } - return this.zulaessigeAktion; - } - - /** - * Gets the value of the zusatzinformation property. - * - *

- * 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 set method for the zusatzinformation property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getZusatzinformation().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link KonvertierungZusatzinformationType } - * - * - */ - public List getZusatzinformation() { - if (zusatzinformation == null) { - zusatzinformation = new ArrayList(); - } - return this.zusatzinformation; - } - -} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBausteinType.java similarity index 67% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBausteinType.java index d68ddbbe..a0003abf 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungBausteinType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungBausteinType.java @@ -1,5 +1,5 @@ -package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common; +package at.vvo.omds.types.omds3Types.r1_8_0.common; import java.util.ArrayList; import java.util.List; @@ -21,7 +21,8 @@ import javax.xml.bind.annotation.XmlType; * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="Id" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="ErsetztId" type="{http://www.w3.org/2001/XMLSchema}anyType"/> + * <element name="AntragsId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="Bezeichnung" minOccurs="0"> * <simpleType> * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> @@ -29,9 +30,8 @@ import javax.xml.bind.annotation.XmlType; * </restriction> * </simpleType> * </element> - * <element name="ZulaessigeAktion" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsaktion_Type" maxOccurs="unbounded" minOccurs="0"/> - * <element name="GewaehlteAktion" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsaktion_Type" minOccurs="0"/> - * <element name="Zusatzinformation" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}KonvertierungZusatzinformation_Type" maxOccurs="unbounded" minOccurs="0"/> + * <element name="ZulaessigeAktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type" maxOccurs="unbounded" minOccurs="0"/> + * <element name="GewaehlteAktion" type="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type" minOccurs="0"/> * </sequence> * </restriction> * </complexContent> @@ -42,47 +42,71 @@ import javax.xml.bind.annotation.XmlType; */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "KonvertierungBaustein_Type", propOrder = { - "id", + "ersetztId", + "antragsId", "bezeichnung", "zulaessigeAktionen", - "gewaehlteAktion", - "zusatzinformation" + "gewaehlteAktion" }) public class KonvertierungBausteinType { - @XmlElement(name = "Id", required = true) - protected String id; + @XmlElement(name = "ErsetztId", required = true) + protected Object ersetztId; + @XmlElement(name = "AntragsId") + protected String antragsId; @XmlElement(name = "Bezeichnung") protected String bezeichnung; @XmlElement(name = "ZulaessigeAktion") protected List zulaessigeAktionen; @XmlElement(name = "GewaehlteAktion") protected KonvertierungsaktionType gewaehlteAktion; - @XmlElement(name = "Zusatzinformation") - protected List zusatzinformation; /** - * Ruft den Wert der id-Eigenschaft ab. + * Ruft den Wert der ersetztId-Eigenschaft ab. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getErsetztId() { + return ersetztId; + } + + /** + * Legt den Wert der ersetztId-Eigenschaft fest. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setErsetztId(Object value) { + this.ersetztId = value; + } + + /** + * Ruft den Wert der antragsId-Eigenschaft ab. * * @return * possible object is * {@link String } * */ - public String getId() { - return id; + public String getAntragsId() { + return antragsId; } /** - * Legt den Wert der id-Eigenschaft fest. + * Legt den Wert der antragsId-Eigenschaft fest. * * @param value * allowed object is * {@link String } * */ - public void setId(String value) { - this.id = value; + public void setAntragsId(String value) { + this.antragsId = value; } /** @@ -165,33 +189,4 @@ public class KonvertierungBausteinType { this.gewaehlteAktion = value; } - /** - * Gets the value of the zusatzinformation property. - * - *

- * 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 set method for the zusatzinformation property. - * - *

- * For example, to add a new item, do as follows: - * 

-     *    getZusatzinformation().add(newItem);
-     *
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link KonvertierungZusatzinformationType } - * - * - */ - public List getZusatzinformation() { - if (zusatzinformation == null) { - zusatzinformation = new ArrayList(); - } - return this.zusatzinformation; - } - } diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungZusatzinformationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungZusatzinformationType.java deleted file mode 100644 index 6ce085ba..00000000 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungZusatzinformationType.java +++ /dev/null @@ -1,32 +0,0 @@ - -package at.vvo.omds.types.omds3Types.r1_8_0.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * Abstraktes Element für die Ableitung von Typen für VU-spezifische Zusatzinformationen - * - *

Java-Klasse für KonvertierungZusatzinformation_Type complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType name="KonvertierungZusatzinformation_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KonvertierungZusatzinformation_Type") -public abstract class KonvertierungZusatzinformationType { - - -} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/Konvertierungsaktion2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/Konvertierungsaktion2Type.java deleted file mode 100644 index 8ac52351..00000000 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/Konvertierungsaktion2Type.java +++ /dev/null @@ -1,70 +0,0 @@ - -package at.vvo.omds.types.omds3Types.r1_8_0.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - - -/** - * Aktion für einen Baustein - * - *

Java-Klasse für Konvertierungsaktion2_Type complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType name="Konvertierungsaktion2_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Art" type="{http://www.w3.org/2001/XMLSchema}anyType" minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Konvertierungsaktion2_Type", propOrder = { - "art" -}) -@XmlSeeAlso({ - KonvertierungsaktionBelassen2Type.class, - KonvertierungsaktionUebernehmen2Type.class, - KonvertierungsaktionStorno2Type.class -}) -public abstract class Konvertierungsaktion2Type { - - @XmlElement(name = "Art") - protected Object art; - - /** - * Ruft den Wert der art-Eigenschaft ab. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getArt() { - return art; - } - - /** - * Legt den Wert der art-Eigenschaft fest. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setArt(Object value) { - this.art = value; - } - -} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassen2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassen2Type.java deleted file mode 100644 index af3e8dba..00000000 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassen2Type.java +++ /dev/null @@ -1,34 +0,0 @@ - -package at.vvo.omds.types.omds3Types.r1_8_0.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * Belassen-Aktion (Keine Aktion, der Baustein bleibt weiter in altem Vertrag) - * - *

Java-Klasse für KonvertierungsaktionBelassen2_Type complex type. - * - *

Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist. - * - * 

- * <complexType name="KonvertierungsaktionBelassen2_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- *
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KonvertierungsaktionBelassen2_Type") -public class KonvertierungsaktionBelassen2Type - extends Konvertierungsaktion2Type -{ - - -} diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionBelassenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassenType.java similarity index 81% rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionBelassenType.java rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassenType.java index 8bfe60be..cabdd4d4 100644 --- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionBelassenType.java +++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionBelassenType.java @@ -1,5 +1,5 @@ -package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common; +package at.vvo.omds.types.omds3Types.r1_8_0.common; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlType; * 
  * <complexType name="KonvertierungsaktionBelassen_Type">
  *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsaktion_Type">
+ *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type">
  *     </extension>
  *   </complexContent>
  * </complexType>
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStorno2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStorno2Type.java
deleted file mode 100644
index 63b06605..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStorno2Type.java
+++ /dev/null
@@ -1,34 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_0.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Storno-Aktion (der Baustein wird im alten Vertrag storniert und nicht in den neuen übernommen)
- * 
- * 
Java-Klasse für KonvertierungsaktionStorno2_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="KonvertierungsaktionStorno2_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type">
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KonvertierungsaktionStorno2_Type")
-public class KonvertierungsaktionStorno2Type
-    extends Konvertierungsaktion2Type
-{
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionStornoType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStornoType.java
similarity index 81%
rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionStornoType.java
rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStornoType.java
index fc9bf165..6d3268ad 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionStornoType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionStornoType.java
@@ -1,5 +1,5 @@
 
-package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common;
+package at.vvo.omds.types.omds3Types.r1_8_0.common;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <complexType name="KonvertierungsaktionStorno_Type">
  *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsaktion_Type">
+ *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type">
  *     </extension>
  *   </complexContent>
  * </complexType>
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionType.java
similarity index 96%
rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionType.java
rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionType.java
index f03510d4..0c7b5b04 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionType.java
@@ -1,5 +1,5 @@
 
-package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common;
+package at.vvo.omds.types.omds3Types.r1_8_0.common;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmen2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmen2Type.java
deleted file mode 100644
index 641c38af..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmen2Type.java
+++ /dev/null
@@ -1,73 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_0.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.XmlType;
-
-
-/**
- * Uebernehmen-Aktion (der Baustein wird in den Folgevertrag uebernommen)
- * 
- * 
Java-Klasse für KonvertierungsaktionUebernehmen2_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="KonvertierungsaktionUebernehmen2_Type">
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion2_Type">
- *       <sequence>
- *         <element name="Baustein" type="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungBaustein2_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KonvertierungsaktionUebernehmen2_Type", propOrder = {
-    "baustein"
-})
-public class KonvertierungsaktionUebernehmen2Type
-    extends Konvertierungsaktion2Type
-{
-
-    @XmlElement(name = "Baustein")
-    protected List baustein;
-
-    /**
-     * Gets the value of the baustein property.
-     * 
-     * 

-     * 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 set method for the baustein property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getBaustein().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link KonvertierungBaustein2Type }
-     * 
-     * 
-     */
-    public List getBaustein() {
-        if (baustein == null) {
-            baustein = new ArrayList();
-        }
-        return this.baustein;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionUebernehmenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmenType.java
similarity index 74%
rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionUebernehmenType.java
rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmenType.java
index 22a151c7..a0884066 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsaktionUebernehmenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsaktionUebernehmenType.java
@@ -1,5 +1,5 @@
 
-package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common;
+package at.vvo.omds.types.omds3Types.r1_8_0.common;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,6 @@ 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_8_0.common.KombinationenType;
 
 
 /**
@@ -20,9 +19,9 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.KombinationenType;
  * 
  * <complexType name="KonvertierungsaktionUebernehmen_Type">
  *   <complexContent>
- *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsaktion_Type">
+ *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Konvertierungsaktion_Type">
  *       <sequence>
- *         <element name="Baustein" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}KonvertierungBaustein_Type" maxOccurs="unbounded" minOccurs="0"/>
+ *         <element name="Baustein" type="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungBaustein_Type" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="Kombinationen" type="{urn:omds3CommonServiceTypes-1-1-0}Kombinationen_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
@@ -34,7 +33,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.KombinationenType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "KonvertierungsaktionUebernehmen_Type", propOrder = {
-    "baustein",
+    "bausteine",
     "kombinationen"
 })
 public class KonvertierungsaktionUebernehmenType
@@ -42,23 +41,24 @@ public class KonvertierungsaktionUebernehmenType
 {
 
     @XmlElement(name = "Baustein")
-    protected List baustein;
+    protected List bausteine;
     @XmlElement(name = "Kombinationen")
     protected KombinationenType kombinationen;
 
     /**
-     * Gets the value of the baustein property.
+     * 
Die Liste der Bausteine, die in der Konvertierungsaktion behandelt werden.

+     * Gets the value of the bausteine property.
      * 
      * 

      * 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 set method for the baustein property.
+     * This is why there is not a set method for the bausteine property.
      * 
      * 

      * For example, to add a new item, do as follows:
      * 
-     *    getBaustein().add(newItem);
+     *    getBausteine().add(newItem);
      * 

      * 
      * 
@@ -68,11 +68,11 @@ public class KonvertierungsaktionUebernehmenType
      * 
      * 
      */
-    public List getBaustein() {
-        if (baustein == null) {
-            baustein = new ArrayList();
+    public List getBausteine() {
+        if (bausteine == null) {
+            bausteine = new ArrayList();
         }
-        return this.baustein;
+        return this.bausteine;
     }
 
     /**
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangVertragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsumfangVertragType.java
similarity index 77%
rename from OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangVertragType.java
rename to OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsumfangVertragType.java
index b3477a6f..20bf5731 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangVertragType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/KonvertierungsumfangVertragType.java
@@ -1,5 +1,5 @@
 
-package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common;
+package at.vvo.omds.types.omds3Types.r1_8_0.common;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,12 +8,10 @@ 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_8_0.common.ErsatzpolizzeType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.KombinationenType;
 
 
 /**
- * Spezifiziert die Konvertierung eines Vertrags
+ * Spezifiziert die Konvertierung eines Vertrags in einen neuen Vertrag
  * 
  * 
Java-Klasse für KonvertierungsumfangVertrag_Type complex type.
  * 
@@ -25,7 +23,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.KombinationenType;
  *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type">
  *       <sequence>
  *         <element name="Bezeichnung" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="Sparte" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}KonvertierungBaustein_Type" maxOccurs="unbounded"/>
+ *         <element name="Baustein" type="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungBaustein_Type" maxOccurs="unbounded"/>
  *         <element name="Kombinationen" type="{urn:omds3CommonServiceTypes-1-1-0}Kombinationen_Type" minOccurs="0"/>
  *       </sequence>
  *     </extension>
@@ -38,7 +36,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.KombinationenType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "KonvertierungsumfangVertrag_Type", propOrder = {
     "bezeichnung",
-    "sparten",
+    "bausteine",
     "kombinationen"
 })
 @XmlSeeAlso({
@@ -50,8 +48,8 @@ public class KonvertierungsumfangVertragType
 
     @XmlElement(name = "Bezeichnung")
     protected String bezeichnung;
-    @XmlElement(name = "Sparte", required = true)
-    protected List sparten;
+    @XmlElement(name = "Baustein", required = true)
+    protected List bausteine;
     @XmlElement(name = "Kombinationen")
     protected KombinationenType kombinationen;
 
@@ -80,19 +78,19 @@ public class KonvertierungsumfangVertragType
     }
 
     /**
-     * 
Die Liste der Sparten, die in der Konvertierungsanforderung behandelt werden.

-     * Gets the value of the sparten property.
+     * 
Die Liste der Bausteine, die in der Konvertierungsanforderung behandelt werden.

+     * Gets the value of the bausteine property.
      * 
      * 

      * 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 set method for the sparten property.
+     * This is why there is not a set method for the bausteine property.
      * 
      * 

      * For example, to add a new item, do as follows:
      * 
-     *    getSparten().add(newItem);
+     *    getBausteine().add(newItem);
      * 

      * 
      * 
@@ -102,11 +100,11 @@ public class KonvertierungsumfangVertragType
      * 
      * 
      */
-    public List getSparten() {
-        if (sparten == null) {
-            sparten = new ArrayList();
+    public List getBausteine() {
+        if (bausteine == null) {
+            bausteine = new ArrayList();
         }
-        return this.sparten;
+        return this.bausteine;
     }
 
     /**
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java
index 22907300..8cdf68ff 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjectFactory.java
@@ -45,6 +45,14 @@ public class ObjectFactory {
         return new GMSGType();
     }
 
+    /**
+     * Create an instance of {@link ZahlwegType }
+     * 
+     */
+    public ZahlwegType createZahlwegType() {
+        return new ZahlwegType();
+    }
+
     /**
      * Create an instance of {@link ProzessDokumentType }
      * 
@@ -54,11 +62,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ZahlwegType }
+     * Create an instance of {@link ServiceFault }
      * 
      */
-    public ZahlwegType createZahlwegType() {
-        return new ZahlwegType();
+    public ServiceFault createServiceFault() {
+        return new ServiceFault();
     }
 
     /**
@@ -69,14 +77,6 @@ public class ObjectFactory {
         return new ObjektIdType();
     }
 
-    /**
-     * Create an instance of {@link TechnicalKeyValueType }
-     * 
-     */
-    public TechnicalKeyValueType createTechnicalKeyValueType() {
-        return new TechnicalKeyValueType();
-    }
-
     /**
      * Create an instance of {@link PersonType }
      * 
@@ -85,38 +85,6 @@ public class ObjectFactory {
         return new PersonType();
     }
 
-    /**
-     * Create an instance of {@link ResponseStatusType }
-     * 
-     */
-    public ResponseStatusType createResponseStatusType() {
-        return new ResponseStatusType();
-    }
-
-    /**
-     * Create an instance of {@link DokumentInfoType }
-     * 
-     */
-    public DokumentInfoType createDokumentInfoType() {
-        return new DokumentInfoType();
-    }
-
-    /**
-     * Create an instance of {@link DateianhangType }
-     * 
-     */
-    public DateianhangType createDateianhangType() {
-        return new DateianhangType();
-    }
-
-    /**
-     * Create an instance of {@link ServiceFault }
-     * 
-     */
-    public ServiceFault createServiceFault() {
-        return new ServiceFault();
-    }
-
     /**
      * Create an instance of {@link AdresseType }
      * 
@@ -141,6 +109,14 @@ public class ObjectFactory {
         return new ElementIdType();
     }
 
+    /**
+     * Create an instance of {@link ResponseStatusType }
+     * 
+     */
+    public ResponseStatusType createResponseStatusType() {
+        return new ResponseStatusType();
+    }
+
     /**
      * Create an instance of {@link Referenz }
      * 
@@ -157,6 +133,14 @@ public class ObjectFactory {
         return new LegitimationType();
     }
 
+    /**
+     * Create an instance of {@link DateianhangType }
+     * 
+     */
+    public DateianhangType createDateianhangType() {
+        return new DateianhangType();
+    }
+
     /**
      * Create an instance of {@link DokumentBinaryDataType }
      * 
@@ -253,38 +237,6 @@ public class ObjectFactory {
         return new BeteiligtePersonVertragType();
     }
 
-    /**
-     * Create an instance of {@link KonvertierungBaustein2Type }
-     * 
-     */
-    public KonvertierungBaustein2Type createKonvertierungBaustein2Type() {
-        return new KonvertierungBaustein2Type();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionBelassen2Type }
-     * 
-     */
-    public KonvertierungsaktionBelassen2Type createKonvertierungsaktionBelassen2Type() {
-        return new KonvertierungsaktionBelassen2Type();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionUebernehmen2Type }
-     * 
-     */
-    public KonvertierungsaktionUebernehmen2Type createKonvertierungsaktionUebernehmen2Type() {
-        return new KonvertierungsaktionUebernehmen2Type();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionStorno2Type }
-     * 
-     */
-    public KonvertierungsaktionStorno2Type createKonvertierungsaktionStorno2Type() {
-        return new KonvertierungsaktionStorno2Type();
-    }
-
     /**
      * Create an instance of {@link PraemieType }
      * 
@@ -301,6 +253,14 @@ public class ObjectFactory {
         return new VersicherungssteuerType();
     }
 
+    /**
+     * Create an instance of {@link TechnicalKeyValueType }
+     * 
+     */
+    public TechnicalKeyValueType createTechnicalKeyValueType() {
+        return new TechnicalKeyValueType();
+    }
+
     /**
      * Create an instance of {@link VertragspersonType }
      * 
@@ -469,6 +429,54 @@ public class ObjectFactory {
         return new ErsatzpolizzeMitAendGrundType();
     }
 
+    /**
+     * Create an instance of {@link KonvertierungsumfangVertragType }
+     * 
+     */
+    public KonvertierungsumfangVertragType createKonvertierungsumfangVertragType() {
+        return new KonvertierungsumfangVertragType();
+    }
+
+    /**
+     * Create an instance of {@link KonvertierungBausteinType }
+     * 
+     */
+    public KonvertierungBausteinType createKonvertierungBausteinType() {
+        return new KonvertierungBausteinType();
+    }
+
+    /**
+     * Create an instance of {@link KonvertierungsaktionBelassenType }
+     * 
+     */
+    public KonvertierungsaktionBelassenType createKonvertierungsaktionBelassenType() {
+        return new KonvertierungsaktionBelassenType();
+    }
+
+    /**
+     * Create an instance of {@link KonvertierungsaktionUebernehmenType }
+     * 
+     */
+    public KonvertierungsaktionUebernehmenType createKonvertierungsaktionUebernehmenType() {
+        return new KonvertierungsaktionUebernehmenType();
+    }
+
+    /**
+     * Create an instance of {@link KonvertierungsaktionStornoType }
+     * 
+     */
+    public KonvertierungsaktionStornoType createKonvertierungsaktionStornoType() {
+        return new KonvertierungsaktionStornoType();
+    }
+
+    /**
+     * Create an instance of {@link DokumentInfoType }
+     * 
+     */
+    public DokumentInfoType createDokumentInfoType() {
+        return new DokumentInfoType();
+    }
+
     /**
      * Create an instance of {@link ZahlungsdatenType }
      * 
@@ -837,14 +845,6 @@ public class ObjectFactory {
         return new GMSGType.SteuerlichAnsaessig();
     }
 
-    /**
-     * Create an instance of {@link ProzessDokumentType.Autorisierungen }
-     * 
-     */
-    public ProzessDokumentType.Autorisierungen createProzessDokumentTypeAutorisierungen() {
-        return new ProzessDokumentType.Autorisierungen();
-    }
-
     /**
      * Create an instance of {@link ZahlwegType.Kundenkonto }
      * 
@@ -853,6 +853,14 @@ public class ObjectFactory {
         return new ZahlwegType.Kundenkonto();
     }
 
+    /**
+     * Create an instance of {@link ProzessDokumentType.Autorisierungen }
+     * 
+     */
+    public ProzessDokumentType.Autorisierungen createProzessDokumentTypeAutorisierungen() {
+        return new ProzessDokumentType.Autorisierungen();
+    }
+
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ServiceFault }{@code >}
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjektSpezifikationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjektSpezifikationType.java
index 9e3f6ad3..34d98a95 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjektSpezifikationType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ObjektSpezifikationType.java
@@ -29,9 +29,9 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SchadenmelderVermittlerTyp
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ObjektSpezifikation_Type")
 @XmlSeeAlso({
-    SchadenmelderVermittlerType.class,
     PolizzenObjektSpezifikationType.class,
-    SchadenObjektSpezifikationType.class
+    SchadenObjektSpezifikationType.class,
+    SchadenmelderVermittlerType.class
 })
 public abstract class ObjektSpezifikationType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktGenerischType.java
index 531ec10a..964dabad 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktGenerischType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktGenerischType.java
@@ -44,8 +44,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.ProduktSachPriva
     "beschreibungTxt"
 })
 @XmlSeeAlso({
-    ProduktSachPrivatType.class,
     ProduktRechtsschutzType.class,
+    ProduktSachPrivatType.class,
     ProduktMitVpType.class
 })
 public abstract class ProduktGenerischType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktType.java
index 1f8368ab..e7ee6685 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ProduktType.java
@@ -52,9 +52,9 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.ZusatzproduktKfzType;
     "zusaetzlicheProduktdaten"
 })
 @XmlSeeAlso({
-    ProduktGenerischType.class,
     ProduktKfzType.class,
-    ZusatzproduktKfzType.class
+    ZusatzproduktKfzType.class,
+    ProduktGenerischType.class
 })
 public abstract class ProduktType
     extends ProduktbausteinType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ServiceFault.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ServiceFault.java
index baeb4469..55a5c6b6 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ServiceFault.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/ServiceFault.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
  *             </restriction>
  *           </simpleType>
  *         </element>
- *         <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="errorCode" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="errorMsg" type="{http://www.w3.org/2001/XMLSchema}string"/>
  *         <element name="elementReference" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *       </sequence>
@@ -51,7 +51,6 @@ public class ServiceFault {
 
     @XmlElement(required = true)
     protected BigInteger errorType;
-    @XmlElement(required = true)
     protected BigInteger errorCode;
     @XmlElement(required = true)
     protected String errorMsg;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktGenerischType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktGenerischType.java
index afb8d7cb..f8fc397b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktGenerischType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktGenerischType.java
@@ -47,10 +47,10 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.VerkaufsproduktUnfal
     "beschreibungTxt"
 })
 @XmlSeeAlso({
-    VerkaufsproduktUnfallType.class,
-    VerkaufsproduktLebenType.class,
-    VerkaufsproduktSachPrivatType.class,
     VerkaufsproduktRechtsschutzType.class,
+    VerkaufsproduktUnfallType.class,
+    VerkaufsproduktSachPrivatType.class,
+    VerkaufsproduktLebenType.class,
     VerkaufsproduktKrankenType.class
 })
 public abstract class VerkaufsproduktGenerischType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktType.java
index 84f70ece..98f8ab3e 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VerkaufsproduktType.java
@@ -52,8 +52,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.VerkaufsproduktKfzType;
     "zusaetzlicheVerkaufproduktdaten"
 })
 @XmlSeeAlso({
-    VerkaufsproduktGenerischType.class,
-    VerkaufsproduktKfzType.class
+    VerkaufsproduktKfzType.class,
+    VerkaufsproduktGenerischType.class
 })
 public abstract class VerkaufsproduktType
     extends ProduktbausteinType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseMitAttributMetadatenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseMitAttributMetadatenType.java
index 1764be75..6eb87b3a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseMitAttributMetadatenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseMitAttributMetadatenType.java
@@ -39,11 +39,11 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.VersichertesObje
     "attributMetadaten"
 })
 @XmlSeeAlso({
+    VersichertePersonType.class,
+    VersicherteLiegenschaftType.class,
     VersichertesObjektSachPrivatType.class,
     RisikoHaushaltType.class,
-    RisikoGebaeudeType.class,
-    VersichertePersonType.class,
-    VersicherteLiegenschaftType.class
+    RisikoGebaeudeType.class
 })
 public abstract class VersichertesInteresseMitAttributMetadatenType
     extends VersichertesInteresseType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseType.java
index 0686047a..e9501d65 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VersichertesInteresseType.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlType;
  *   <complexContent>
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
+ *         <element name="ErsetztId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="ZusaetzlicheRisikodaten" type="{urn:omds3CommonServiceTypes-1-1-0}ZusaetzlicheRisikodaten_Type" maxOccurs="unbounded" minOccurs="0"/>
  *       </sequence>
  *       <attribute name="Lfnr" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
@@ -36,6 +37,7 @@ import javax.xml.bind.annotation.XmlType;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "VersichertesInteresse_Type", propOrder = {
+    "ersetztId",
     "zusaetzlicheRisikodaten"
 })
 @XmlSeeAlso({
@@ -44,12 +46,38 @@ import javax.xml.bind.annotation.XmlType;
 })
 public abstract class VersichertesInteresseType {
 
+    @XmlElement(name = "ErsetztId")
+    protected String ersetztId;
     @XmlElement(name = "ZusaetzlicheRisikodaten")
     protected List zusaetzlicheRisikodaten;
     @XmlAttribute(name = "Lfnr", namespace = "urn:omds3CommonServiceTypes-1-1-0", required = true)
     @XmlSchemaType(name = "unsignedShort")
     protected int lfnr;
 
+    /**
+     * Ruft den Wert der ersetztId-Eigenschaft ab.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getErsetztId() {
+        return ersetztId;
+    }
+
+    /**
+     * Legt den Wert der ersetztId-Eigenschaft fest.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setErsetztId(String value) {
+        this.ersetztId = value;
+    }
+
     /**
      * Gets the value of the zusaetzlicheRisikodaten property.
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenDetailType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenDetailType.java
index c49e559c..2dcca13b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenDetailType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenDetailType.java
@@ -55,8 +55,8 @@ import javax.xml.bind.annotation.XmlType;
     "zusaetzlicheVorversicherungsdaten"
 })
 @XmlSeeAlso({
-    VorversicherungType.class,
-    at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.VorversicherungenKfzType.VorversicherungKfz.class
+    at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.VorversicherungenKfzType.VorversicherungKfz.class,
+    VorversicherungType.class
 })
 public class VorversicherungenDetailType {
 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenType.java
index 53c10b26..e73fae59 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/common/VorversicherungenType.java
@@ -29,8 +29,8 @@ import at.vvo.omds.types.omds3Types.r1_8_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_8_0/on2antrag/common/CalculateRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateRequestGenType.java
index 62a478b2..0dae2286 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateRequestGenType.java
@@ -40,8 +40,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CalculateUnfallReque
 })
 @XmlSeeAlso({
     CalculateUnfallRequestType.class,
-    CalculateLebenRequestType.class,
     CalculateSachPrivatRequestType.class,
+    CalculateLebenRequestType.class,
     CalculateKrankenRequest.class,
     CalculateRechtsschutzRequest.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateResponseGenType.java
index 63198e4c..3946a977 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CalculateResponseGenType.java
@@ -34,8 +34,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CalculateUnfallRespo
 @XmlType(name = "CalculateResponseGen_Type")
 @XmlSeeAlso({
     CalculateUnfallResponseType.class,
-    CalculateLebenResponseType.class,
     CalculateSachPrivatResponseType.class,
+    CalculateLebenResponseType.class,
     CalculateKrankenResponse.class,
     CalculateRechtsschutzResponse.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest2.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest2.java
deleted file mode 100644
index 561b55ac..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalRequest2.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonRequestType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Konvertierungsplan" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "konvertierungsplan"
-})
-@XmlRootElement(name = "ConversionProposalRequest2")
-public class ConversionProposalRequest2
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Konvertierungsplan", required = true)
-    protected List konvertierungsplan;
-
-    /**
-     * Gets the value of the konvertierungsplan property.
-     * 
-     * 

-     * 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 set method for the konvertierungsplan property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getKonvertierungsplan().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link KonvertierungsumfangType }
-     * 
-     * 
-     */
-    public List getKonvertierungsplan() {
-        if (konvertierungsplan == null) {
-            konvertierungsplan = new ArrayList();
-        }
-        return this.konvertierungsplan;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalResponse2.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalResponse2.java
deleted file mode 100644
index 17e3e05f..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionProposalResponse2.java
+++ /dev/null
@@ -1,137 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonResponseType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.ErsatzpolizzeType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.ProzessDokHandoutType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Vorschlag" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}SpezAntrag_Type" minOccurs="0"/>
- *         <element name="Dokument" type="{urn:omds3CommonServiceTypes-1-1-0}ProzessDokHandout_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Ersatzpolizze" type="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "vorschlag",
-    "dokument",
-    "ersatzpolizze"
-})
-@XmlRootElement(name = "ConversionProposalResponse2")
-public class ConversionProposalResponse2
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Vorschlag")
-    protected SpezAntragType vorschlag;
-    @XmlElement(name = "Dokument")
-    protected List dokument;
-    @XmlElement(name = "Ersatzpolizze")
-    protected List ersatzpolizze;
-
-    /**
-     * Ruft den Wert der vorschlag-Eigenschaft ab.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SpezAntragType }
-     *     
-     */
-    public SpezAntragType getVorschlag() {
-        return vorschlag;
-    }
-
-    /**
-     * Legt den Wert der vorschlag-Eigenschaft fest.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SpezAntragType }
-     *     
-     */
-    public void setVorschlag(SpezAntragType value) {
-        this.vorschlag = value;
-    }
-
-    /**
-     * Gets the value of the dokument property.
-     * 
-     * 

-     * 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 set method for the dokument property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getDokument().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ProzessDokHandoutType }
-     * 
-     * 
-     */
-    public List getDokument() {
-        if (dokument == null) {
-            dokument = new ArrayList();
-        }
-        return this.dokument;
-    }
-
-    /**
-     * Gets the value of the ersatzpolizze property.
-     * 
-     * 

-     * 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 set method for the ersatzpolizze property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getErsatzpolizze().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ErsatzpolizzeType }
-     * 
-     * 
-     */
-    public List getErsatzpolizze() {
-        if (ersatzpolizze == null) {
-            ersatzpolizze = new ArrayList();
-        }
-        return this.ersatzpolizze;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest2.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest2.java
deleted file mode 100644
index 9388ed23..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest2.java
+++ /dev/null
@@ -1,168 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonRequestType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonRequest_Type">
- *       <sequence>
- *         <element name="Vertrag" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
- *                   <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
- *                 </sequence>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "vertrag"
-})
-@XmlRootElement(name = "ConversionScopeRequest2")
-public class ConversionScopeRequest2
-    extends CommonRequestType
-{
-
-    @XmlElement(name = "Vertrag", required = true)
-    protected List vertrag;
-
-    /**
-     * Gets the value of the vertrag property.
-     * 
-     * 

-     * 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 set method for the vertrag property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertrag().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link ConversionScopeRequest2 .Vertrag }
-     * 
-     * 
-     */
-    public List getVertrag() {
-        if (vertrag == null) {
-            vertrag = new ArrayList();
-        }
-        return this.vertrag;
-    }
-
-
-    /**
-     * 
Java-Klasse für anonymous complex type.
-     * 
-     * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
-     * 
-     * 
-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Polizzennr" type="{urn:omds20}Polizzennr"/>
-     *         <element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/>
-     *       </sequence>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 

-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "polizzennr",
-        "vertragsID"
-    })
-    public static class Vertrag {
-
-        @XmlElement(name = "Polizzennr", required = true)
-        protected String polizzennr;
-        @XmlElement(name = "VertragsID")
-        protected String vertragsID;
-
-        /**
-         * Ruft den Wert der polizzennr-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getPolizzennr() {
-            return polizzennr;
-        }
-
-        /**
-         * Legt den Wert der polizzennr-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setPolizzennr(String value) {
-            this.polizzennr = value;
-        }
-
-        /**
-         * Ruft den Wert der vertragsID-Eigenschaft ab.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getVertragsID() {
-            return vertragsID;
-        }
-
-        /**
-         * Legt den Wert der vertragsID-Eigenschaft fest.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setVertragsID(String value) {
-            this.vertragsID = value;
-        }
-
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse2.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse2.java
deleted file mode 100644
index 6e83df94..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeResponse2.java
+++ /dev/null
@@ -1,74 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_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.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonResponseType;
-
-
-/**
- * 
Java-Klasse für anonymous complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType>
- *   <complexContent>
- *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}CommonResponse_Type">
- *       <sequence>
- *         <element name="Scope" type="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}Konvertierungsumfang2_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
-    "scope"
-})
-@XmlRootElement(name = "ConversionScopeResponse2")
-public class ConversionScopeResponse2
-    extends CommonResponseType
-{
-
-    @XmlElement(name = "Scope", required = true)
-    protected List scope;
-
-    /**
-     * Gets the value of the scope property.
-     * 
-     * 

-     * 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 set method for the scope property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getScope().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link Konvertierungsumfang2Type }
-     * 
-     * 
-     */
-    public List getScope() {
-        if (scope == null) {
-            scope = new ArrayList();
-        }
-        return this.scope;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationRequestGenType.java
index 190369ed..2e0c33d6 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationRequestGenType.java
@@ -40,8 +40,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnf
 })
 @XmlSeeAlso({
     CreateApplicationUnfallRequestType.class,
-    CreateApplicationLebenRequestType.class,
     CreateApplicationSachPrivatRequestType.class,
+    CreateApplicationLebenRequestType.class,
     CreateApplicationKrankenRequest.class,
     CreateApplicationRechtsschutzRequest.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationResponseGenType.java
index 32dcd3dd..db6f0630 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateApplicationResponseGenType.java
@@ -34,8 +34,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnf
 @XmlType(name = "CreateApplicationResponseGen_Type")
 @XmlSeeAlso({
     CreateApplicationUnfallResponseType.class,
-    CreateApplicationLebenResponseType.class,
     CreateApplicationSachPrivatResponseType.class,
+    CreateApplicationLebenResponseType.class,
     CreateApplicationKrankenResponse.class,
     CreateApplicationRechtsschutzResponse.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferRequestGenType.java
index 20ce4686..939954bc 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferRequestGenType.java
@@ -40,8 +40,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallReq
 })
 @XmlSeeAlso({
     CreateOfferUnfallRequestType.class,
-    CreateOfferLebenRequestType.class,
     CreateOfferSachPrivatRequestType.class,
+    CreateOfferLebenRequestType.class,
     CreateOfferKrankenRequest.class,
     CreateOfferRechtsschutzRequest.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferResponseGenType.java
index e36b514d..1cea8b6b 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/CreateOfferResponseGenType.java
@@ -34,8 +34,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRes
 @XmlType(name = "CreateOfferResponseGen_Type")
 @XmlSeeAlso({
     CreateOfferUnfallResponseType.class,
-    CreateOfferLebenResponseType.class,
     CreateOfferSachPrivatResponseType.class,
+    CreateOfferLebenResponseType.class,
     CreateOfferKrankenResponse.class,
     CreateOfferRechtsschutzResponse.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungZusatzinformationType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungZusatzinformationType.java
deleted file mode 100644
index d462e1bf..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungZusatzinformationType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * Abstraktes Element für die Ableitung von Typen für VU-spezifische Zusatzinformationen
- * 
- * 
Java-Klasse für KonvertierungZusatzinformation_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="KonvertierungZusatzinformation_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KonvertierungZusatzinformation_Type")
-public abstract class KonvertierungZusatzinformationType {
-
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/Konvertierungsumfang2Type.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/Konvertierungsumfang2Type.java
deleted file mode 100644
index e473b899..00000000
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/Konvertierungsumfang2Type.java
+++ /dev/null
@@ -1,72 +0,0 @@
-
-package at.vvo.omds.types.omds3Types.r1_8_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.XmlType;
-import at.vvo.omds.types.omds3Types.r1_8_0.common.KonvertierungBaustein2Type;
-
-
-/**
- * Spezifiziert die Konvertierung mehrerer Verträge in einen Vertrag
- * 
- * 
Java-Klasse für Konvertierungsumfang2_Type complex type.
- * 
- * 
Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
- * 
- * 
- * <complexType name="Konvertierungsumfang2_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Vertrag" type="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungBaustein2_Type" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 

- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Konvertierungsumfang2_Type", propOrder = {
-    "vertrag"
-})
-public class Konvertierungsumfang2Type {
-
-    @XmlElement(name = "Vertrag", required = true)
-    protected List vertrag;
-
-    /**
-     * Gets the value of the vertrag property.
-     * 
-     * 

-     * 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 set method for the vertrag property.
-     * 
-     * 

-     * For example, to add a new item, do as follows:
-     * 
-     *    getVertrag().add(newItem);
-     * 

-     * 
-     * 
-     * 

-     * Objects of the following type(s) are allowed in the list
-     * {@link KonvertierungBaustein2Type }
-     * 
-     * 
-     */
-    public List getVertrag() {
-        if (vertrag == null) {
-            vertrag = new ArrayList();
-        }
-        return this.vertrag;
-    }
-
-}
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangType.java
index 84e49caf..a0076b8e 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/KonvertierungsumfangType.java
@@ -7,10 +7,11 @@ 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_8_0.common.KonvertierungsumfangVertragType;
 
 
 /**
- * Spezifiziert die Konvertierung mehrerer Verträge in einen Vertrag
+ * Spezifiziert die Konvertierung mehrerer Verträge in einen neuen Vertrag
  * 
  * 
Java-Klasse für Konvertierungsumfang_Type complex type.
  * 
@@ -24,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
  *         <element name="Vertrag" maxOccurs="unbounded">
  *           <complexType>
  *             <complexContent>
- *               <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}KonvertierungsumfangVertrag_Type">
+ *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungsumfangVertrag_Type">
  *               </extension>
  *             </complexContent>
  *           </complexType>
@@ -85,7 +86,7 @@ public class KonvertierungsumfangType {
      * 
      * <complexType>
      *   <complexContent>
-     *     <extension base="{urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common}KonvertierungsumfangVertrag_Type">
+     *     <extension base="{urn:omds3CommonServiceTypes-1-1-0}KonvertierungsumfangVertrag_Type">
      *     </extension>
      *   </complexContent>
      * </complexType>
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ObjectFactory.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ObjectFactory.java
index b0306137..db8ff4ca 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ObjectFactory.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ObjectFactory.java
@@ -42,14 +42,6 @@ public class ObjectFactory {
         return new ConversionScopeRequest();
     }
 
-    /**
-     * Create an instance of {@link ConversionScopeRequest2 }
-     * 
-     */
-    public ConversionScopeRequest2 createConversionScopeRequest2() {
-        return new ConversionScopeRequest2();
-    }
-
     /**
      * Create an instance of {@link KonvertierungsumfangType }
      * 
@@ -122,46 +114,6 @@ public class ObjectFactory {
         return new ConversionProposalResponse();
     }
 
-    /**
-     * Create an instance of {@link ConversionScopeRequest2 .Vertrag }
-     * 
-     */
-    public ConversionScopeRequest2 .Vertrag createConversionScopeRequest2Vertrag() {
-        return new ConversionScopeRequest2 .Vertrag();
-    }
-
-    /**
-     * Create an instance of {@link ConversionScopeResponse2 }
-     * 
-     */
-    public ConversionScopeResponse2 createConversionScopeResponse2() {
-        return new ConversionScopeResponse2();
-    }
-
-    /**
-     * Create an instance of {@link Konvertierungsumfang2Type }
-     * 
-     */
-    public Konvertierungsumfang2Type createKonvertierungsumfang2Type() {
-        return new Konvertierungsumfang2Type();
-    }
-
-    /**
-     * Create an instance of {@link ConversionProposalRequest2 }
-     * 
-     */
-    public ConversionProposalRequest2 createConversionProposalRequest2() {
-        return new ConversionProposalRequest2();
-    }
-
-    /**
-     * Create an instance of {@link ConversionProposalResponse2 }
-     * 
-     */
-    public ConversionProposalResponse2 createConversionProposalResponse2() {
-        return new ConversionProposalResponse2();
-    }
-
     /**
      * Create an instance of {@link SpezBOASchrittType }
      * 
@@ -170,46 +122,6 @@ public class ObjectFactory {
         return new SpezBOASchrittType();
     }
 
-    /**
-     * Create an instance of {@link KonvertierungsumfangVertragType }
-     * 
-     */
-    public KonvertierungsumfangVertragType createKonvertierungsumfangVertragType() {
-        return new KonvertierungsumfangVertragType();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungBausteinType }
-     * 
-     */
-    public KonvertierungBausteinType createKonvertierungBausteinType() {
-        return new KonvertierungBausteinType();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionBelassenType }
-     * 
-     */
-    public KonvertierungsaktionBelassenType createKonvertierungsaktionBelassenType() {
-        return new KonvertierungsaktionBelassenType();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionUebernehmenType }
-     * 
-     */
-    public KonvertierungsaktionUebernehmenType createKonvertierungsaktionUebernehmenType() {
-        return new KonvertierungsaktionUebernehmenType();
-    }
-
-    /**
-     * Create an instance of {@link KonvertierungsaktionStornoType }
-     * 
-     */
-    public KonvertierungsaktionStornoType createKonvertierungsaktionStornoType() {
-        return new KonvertierungsaktionStornoType();
-    }
-
     /**
      * Create an instance of {@link KonvertierungsumfangType.Vertrag }
      * 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezAntragType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezAntragType.java
index 25130f93..f3862754 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezAntragType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezAntragType.java
@@ -83,12 +83,12 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SpezAntragUnfallType
     "einwilligungen"
 })
 @XmlSeeAlso({
+    SpezAntragKfzType.class,
+    SpezAntragRechtsschutzType.class,
     SpezAntragUnfallType.class,
     AntragSachPrivatType.class,
-    SpezAntragRechtsschutzType.class,
-    SpezAntragKrankenType.class,
     SpezAntragPersonenType.class,
-    SpezAntragKfzType.class
+    SpezAntragKrankenType.class
 })
 public abstract class SpezAntragType
     extends SpezOffertType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezBerechnungType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezBerechnungType.java
index 5eb6cc06..38336f1a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezBerechnungType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezBerechnungType.java
@@ -43,12 +43,12 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SpezBerechnungUnfall
     "personen"
 })
 @XmlSeeAlso({
-    SpezBerechnungUnfallType.class,
-    SpezBerechnungLebenType.class,
-    BerechnungSachPrivatType.class,
+    SpezBerechnungKfzType.class,
     SpezBerechnungRechtsschutzType.class,
-    SpezBerechnungKrankenType.class,
-    SpezBerechnungKfzType.class
+    SpezBerechnungUnfallType.class,
+    BerechnungSachPrivatType.class,
+    SpezBerechnungLebenType.class,
+    SpezBerechnungKrankenType.class
 })
 public abstract class SpezBerechnungType
     extends SpezBOASchrittType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezOffertType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezOffertType.java
index 4763b9af..a0829d2a 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezOffertType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SpezOffertType.java
@@ -49,12 +49,12 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SpezOffertUnfallType
     "versicherungsnehmer"
 })
 @XmlSeeAlso({
-    SpezOffertUnfallType.class,
-    SpezOffertLebenType.class,
-    OffertSachPrivatType.class,
-    SpezOffertRechtsschutzType.class,
-    SpezOffertKrankenType.class,
     SpezOffertKfzType.class,
+    SpezOffertRechtsschutzType.class,
+    SpezOffertUnfallType.class,
+    OffertSachPrivatType.class,
+    SpezOffertLebenType.class,
+    SpezOffertKrankenType.class,
     SpezAntragType.class
 })
 public abstract class SpezOffertType
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationRequestGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationRequestGenType.java
index b1ec1322..ff04d74e 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationRequestGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationRequestGenType.java
@@ -40,8 +40,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SubmitApplicationUnf
 })
 @XmlSeeAlso({
     SubmitApplicationUnfallRequestType.class,
-    SubmitApplicationLebenRequestType.class,
     SubmitApplicationSachPrivatRequestType.class,
+    SubmitApplicationLebenRequestType.class,
     SubmitApplicationKrankenRequest.class,
     SubmitApplicationRechtsschutzRequest.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationResponseGenType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationResponseGenType.java
index abe49e57..205643c5 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationResponseGenType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/SubmitApplicationResponseGenType.java
@@ -34,8 +34,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SubmitApplicationUnf
 @XmlType(name = "SubmitApplicationResponseGen_Type")
 @XmlSeeAlso({
     SubmitApplicationUnfallResponseType.class,
-    SubmitApplicationLebenResponseType.class,
     SubmitApplicationSachPrivatResponseType.class,
+    SubmitApplicationLebenResponseType.class,
     SubmitApplicationKrankenResponse.class,
     SubmitApplicationRechtsschutzResponse.class
 })
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java
index 7055a2c0..5aa39976 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfallinvaliditaetType.java
@@ -48,8 +48,8 @@ public class ZusatzversicherungUnfallinvaliditaetType
      * 

      * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
      * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 131 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd
-     * Zeile 1430 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd
+     * Zeile 131 von file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd
+     * Zeile 1451 von file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd
      * 

      * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
      * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java
index 775a69f4..50318cf8 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/leben/ZusatzversicherungUnfalltodType.java
@@ -48,8 +48,8 @@ public class ZusatzversicherungUnfalltodType
      * 

      * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
      * Der Feldname "Versicherungssumme" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
-     * Zeile 119 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd
-     * Zeile 1430 von file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd
+     * Zeile 119 von file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Leben.xsd
+     * Zeile 1451 von file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3CommonServiceTypes.xsd
      * 

      * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
      * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/sachPrivat/RisikoGebaeudeType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/sachPrivat/RisikoGebaeudeType.java
index 34b20c12..170ed194 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/sachPrivat/RisikoGebaeudeType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/sachPrivat/RisikoGebaeudeType.java
@@ -33,7 +33,7 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.VersichertesInteresseMitAttrib
  *         <element name="BauartCd" type="{urn:omds20}BauartCd_Type" minOccurs="0"/>
  *         <element name="DachungCd" type="{urn:omds20}DachungCd_Type" minOccurs="0"/>
  *         <element name="GebaeudeHoeheCd" type="{urn:omds20}GebaeudeHoeheCd_Type" minOccurs="0"/>
- *         <element name="BaujahrGebaeude" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         <element name="BaujahrGebaeude" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
  *         <element name="EL-Flaeche" type="{urn:omds20}EL-Flaeche_Type" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="Vorschaeden" type="{urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat}RisikoVorschaeden_Type" maxOccurs="unbounded" minOccurs="0"/>
  *         <element name="AusstattungCd" type="{urn:omds20}AusstattungCd_Type" minOccurs="0"/>
@@ -80,7 +80,7 @@ public class RisikoGebaeudeType
     protected String dachungCd;
     @XmlElement(name = "GebaeudeHoeheCd")
     protected String gebaeudeHoeheCd;
-    @XmlElement(name = "BaujahrGebaeude", required = true)
+    @XmlElement(name = "BaujahrGebaeude")
     protected BigInteger baujahrGebaeude;
     @XmlElement(name = "EL-Flaeche")
     protected List elFlaeche;
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java
index bff7b566..7029ca8f 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortImpl.java
@@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.5.0
- * 2022-05-13T13:48:10.782+02:00
+ * 2022-06-02T16:53:58.058+02:00
  * Generated source version: 3.5.0
  *
  */
@@ -25,13 +25,29 @@ import javax.xml.bind.annotation.XmlSeeAlso;
                       serviceName = "omdsService",
                       portName = "omdsServicePort",
                       targetNamespace = "urn:omds3Services-1-4-0",
-                      wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions2/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl",
+                      wsdlLocation = "file:/C:/Users/jensb/git/omdsservicedefinitions_master/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl",
                       endpointInterface = "at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType")
 
 public class OmdsServicePortImpl implements OmdsServicePortType {
 
     private static final Logger LOG = Logger.getLogger(OmdsServicePortImpl.class.getName());
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation getOMDSPackageList");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse _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_8_0.service.OmdsServicePortType#calculateLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CalculateLebenRequestType param)*
      */
@@ -64,6 +80,38 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#createApplicationKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse createApplicationKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation createApplicationKranken");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse _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_8_0.service.OmdsServicePortType#calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation calculateSachPrivat");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _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_8_0.service.OmdsServicePortType#calculateRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CalculateRechtsschutzRequest param)*
      */
@@ -80,6 +128,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#createApplicationRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation createApplicationRechtsschutz");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse _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_8_0.service.OmdsServicePortType#createApplicationKfz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.CreateApplicationKfzRequestType param)*
      */
@@ -128,6 +192,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#deepLinkPartner(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation deepLinkPartner");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#submitApplicationLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.SubmitApplicationLebenRequestType param)*
      */
@@ -144,6 +224,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation deepLinkPolicy");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#createOfferRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateOfferRechtsschutzRequest param)*
      */
@@ -192,278 +288,6 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
-    /* (non-Javadoc)
-     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#submitClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType submitClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation submitClaim");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType _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_8_0.service.OmdsServicePortType#deepLinkOffer(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation deepLinkOffer");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation getDocumentsOfPeriod");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType _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_8_0.service.OmdsServicePortType#createApplicationUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType createApplicationUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation createApplicationUnfall");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType _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_8_0.service.OmdsServicePortType#calculateKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse calculateKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation calculateKranken");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse _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_8_0.service.OmdsServicePortType#checkClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType checkClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation checkClaim");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType _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_8_0.service.OmdsServicePortType#conversionProposal2(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest2 param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse2 conversionProposal2(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest2 param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation conversionProposal2");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse2 _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_8_0.service.OmdsServicePortType#createApplicationLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType createApplicationLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation createApplicationLeben");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType _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_8_0.service.OmdsServicePortType#conversionScope2(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest2 param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse2 conversionScope2(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest2 param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation conversionScope2");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse2 _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_8_0.service.OmdsServicePortType#createOfferUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType createOfferUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation createOfferUnfall");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType _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_8_0.service.OmdsServicePortType#getArcImageInfos(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse getArcImageInfos(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation getArcImageInfos");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse _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_8_0.service.OmdsServicePortType#getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation getOMDSPackageList");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse _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_8_0.service.OmdsServicePortType#createApplicationKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse createApplicationKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation createApplicationKranken");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse _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_8_0.service.OmdsServicePortType#calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation calculateSachPrivat");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _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_8_0.service.OmdsServicePortType#createApplicationRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation createApplicationRechtsschutz");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse _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_8_0.service.OmdsServicePortType#deepLinkPartner(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation deepLinkPartner");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param)*
-     */
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param) throws ServiceFaultMsg   {
-        LOG.info("Executing operation deepLinkPolicy");
-        System.out.println(param);
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#getUserData(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.UserDataRequest param)*
      */
@@ -512,6 +336,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#submitClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType submitClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation submitClaim");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType _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_8_0.service.OmdsServicePortType#submitApplicationKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.SubmitApplicationKrankenRequest param)*
      */
@@ -560,6 +400,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#deepLinkOffer(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation deepLinkOffer");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _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_8_0.service.OmdsServicePortType#calculateUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CalculateUnfallRequestType param)*
      */
@@ -592,6 +448,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation getDocumentsOfPeriod");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType _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_8_0.service.OmdsServicePortType#conversionProposal(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest param)*
      */
@@ -656,6 +528,38 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#createApplicationUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType createApplicationUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation createApplicationUnfall");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType _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_8_0.service.OmdsServicePortType#calculateKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse calculateKranken(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation calculateKranken");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse _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_8_0.service.OmdsServicePortType#createOfferSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType param)*
      */
@@ -672,6 +576,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#checkClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType checkClaim(at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation checkClaim");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType _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_8_0.service.OmdsServicePortType#createApplicationSachPrivat(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateApplicationSachPrivatRequestType param)*
      */
@@ -736,6 +656,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#createApplicationLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType createApplicationLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation createApplicationLeben");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType _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_8_0.service.OmdsServicePortType#submitApplicationRechtsschutz(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.SubmitApplicationRechtsschutzRequest param)*
      */
@@ -752,6 +688,22 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#createOfferUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType createOfferUnfall(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation createOfferUnfall");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType _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_8_0.service.OmdsServicePortType#createOfferLeben(at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateOfferLebenRequestType param)*
      */
@@ -816,4 +768,20 @@ public class OmdsServicePortImpl implements OmdsServicePortType {
         //throw new ServiceFaultMsg("ServiceFaultMsg...");
     }
 
+    /* (non-Javadoc)
+     * @see at.vvo.omds.types.omds3Types.r1_8_0.service.OmdsServicePortType#getArcImageInfos(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param)*
+     */
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse getArcImageInfos(at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param) throws ServiceFaultMsg   {
+        LOG.info("Executing operation getArcImageInfos");
+        System.out.println(param);
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse _return = null;
+            return _return;
+        } catch (java.lang.Exception ex) {
+            ex.printStackTrace();
+            throw new RuntimeException(ex);
+        }
+        //throw new ServiceFaultMsg("ServiceFaultMsg...");
+    }
+
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java
index d7c798d4..192b6911 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType.java
@@ -9,7 +9,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.5.0
- * 2022-05-13T13:48:10.795+02:00
+ * 2022-06-02T16:53:58.086+02:00
  * Generated source version: 3.5.0
  *
  */
@@ -18,6 +18,14 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 public interface OmdsServicePortType {
 
+    @WebMethod(action = "urn:getOMDSPackageList")
+    @WebResult(name = "getOMDSPackageListResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(
+
+        @WebParam(partName = "param", name = "getOMDSPackageListRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:calculateLeben")
     @WebResult(name = "CalculateLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CalculateLebenResponseType calculateLeben(
@@ -34,6 +42,22 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on1basis.AddDocToBusinessCaseRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:createApplicationKranken")
+    @WebResult(name = "CreateApplicationKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse createApplicationKranken(
+
+        @WebParam(partName = "param", name = "CreateApplicationKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param
+    ) throws ServiceFaultMsg;
+
+    @WebMethod(action = "urn:calculateSachPrivat")
+    @WebResult(name = "CalculateSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(
+
+        @WebParam(partName = "param", name = "CalculateSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:calculateRechtsschutz")
     @WebResult(name = "CalculateRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CalculateRechtsschutzResponse calculateRechtsschutz(
@@ -42,6 +66,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CalculateRechtsschutzRequest param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:createApplicationRechtsschutz")
+    @WebResult(name = "CreateApplicationRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(
+
+        @WebParam(partName = "param", name = "CreateApplicationRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:createApplicationKfz")
     @WebResult(name = "CreateApplicationKfzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.kfz", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.CreateApplicationKfzResponseType createApplicationKfz(
@@ -66,6 +98,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.CreateOfferKfzRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:deepLinkPartner")
+    @WebResult(name = "getDeepLinkPartnerResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(
+
+        @WebParam(partName = "param", name = "getDeepLinkPartnerRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:submitApplicationLeben")
     @WebResult(name = "SubmitApplicationLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.SubmitApplicationLebenResponseType submitApplicationLeben(
@@ -74,6 +114,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.SubmitApplicationLebenRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:deepLinkPolicy")
+    @WebResult(name = "getDeepLinkPolicyResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(
+
+        @WebParam(partName = "param", name = "getDeepLinkPolicyRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:createOfferRechtsschutz")
     @WebResult(name = "CreateOfferRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateOfferRechtsschutzResponse createOfferRechtsschutz(
@@ -98,142 +146,6 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetStateChangesRequestType param
     ) throws ServiceFaultMsg;
 
-    @WebMethod(action = "urn:submitClaim")
-    @WebResult(name = "SubmitClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType submitClaim(
-
-        @WebParam(partName = "param", name = "SubmitClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkOffer")
-    @WebResult(name = "getDeepLinkOfferResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(
-
-        @WebParam(partName = "param", name = "getDeepLinkOfferRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getDocumentsOfPeriod")
-    @WebResult(name = "GetDocumentsOfPeriodResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(
-
-        @WebParam(partName = "param", name = "GetDocumentsOfPeriodRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
-        at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationUnfall")
-    @WebResult(name = "CreateApplicationUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType createApplicationUnfall(
-
-        @WebParam(partName = "param", name = "CreateApplicationUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateKranken")
-    @WebResult(name = "CalculateKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse calculateKranken(
-
-        @WebParam(partName = "param", name = "CalculateKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:checkClaim")
-    @WebResult(name = "CheckClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType checkClaim(
-
-        @WebParam(partName = "param", name = "CheckClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
-        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:conversionProposal2")
-    @WebResult(name = "ConversionProposalResponse2", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse2 conversionProposal2(
-
-        @WebParam(partName = "param", name = "ConversionProposalRequest2", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest2 param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationLeben")
-    @WebResult(name = "CreateApplicationLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType createApplicationLeben(
-
-        @WebParam(partName = "param", name = "CreateApplicationLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:conversionScope2")
-    @WebResult(name = "ConversionScopeResponse2", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse2 conversionScope2(
-
-        @WebParam(partName = "param", name = "ConversionScopeRequest2", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest2 param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createOfferUnfall")
-    @WebResult(name = "CreateOfferUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType createOfferUnfall(
-
-        @WebParam(partName = "param", name = "CreateOfferUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getArcImageInfos")
-    @WebResult(name = "getArcImageInfosResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse getArcImageInfos(
-
-        @WebParam(partName = "param", name = "getArcImageInfosRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:getOMDSPackageList")
-    @WebResult(name = "getOMDSPackageListResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse getOMDSPackageList(
-
-        @WebParam(partName = "param", name = "getOMDSPackageListRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationKranken")
-    @WebResult(name = "CreateApplicationKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse createApplicationKranken(
-
-        @WebParam(partName = "param", name = "CreateApplicationKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:calculateSachPrivat")
-    @WebResult(name = "CalculateSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType calculateSachPrivat(
-
-        @WebParam(partName = "param", name = "CalculateSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:createApplicationRechtsschutz")
-    @WebResult(name = "CreateApplicationRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse createApplicationRechtsschutz(
-
-        @WebParam(partName = "param", name = "CreateApplicationRechtsschutzRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs")
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkPartner")
-    @WebResult(name = "getDeepLinkPartnerResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPartner(
-
-        @WebParam(partName = "param", name = "getDeepLinkPartnerRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest param
-    ) throws ServiceFaultMsg;
-
-    @WebMethod(action = "urn:deepLinkPolicy")
-    @WebResult(name = "getDeepLinkPolicyResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
-    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkPolicy(
-
-        @WebParam(partName = "param", name = "getDeepLinkPolicyRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest param
-    ) throws ServiceFaultMsg;
-
     @WebMethod(action = "urn:getUserData")
     @WebResult(name = "getUserDataResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.UserDataResponse getUserData(
@@ -258,6 +170,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckCoverageRequest param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:submitClaim")
+    @WebResult(name = "SubmitClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType submitClaim(
+
+        @WebParam(partName = "param", name = "SubmitClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
+        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:submitApplicationKranken")
     @WebResult(name = "SubmitApplicationKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.SubmitApplicationKrankenResponse submitApplicationKranken(
@@ -282,6 +202,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetNumberOfDocumentsRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:deepLinkOffer")
+    @WebResult(name = "getDeepLinkOfferResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse deepLinkOffer(
+
+        @WebParam(partName = "param", name = "getDeepLinkOfferRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:calculateUnfall")
     @WebResult(name = "CalculateUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CalculateUnfallResponseType calculateUnfall(
@@ -298,6 +226,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SubmitApplicationUnfallRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:getDocumentsOfPeriod")
+    @WebResult(name = "GetDocumentsOfPeriodResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType getDocumentsOfPeriod(
+
+        @WebParam(partName = "param", name = "GetDocumentsOfPeriodRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on1basisfunktionen")
+        at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:conversionProposal")
     @WebResult(name = "ConversionProposalResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse conversionProposal(
@@ -330,6 +266,22 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateOfferKrankenRequest param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:createApplicationUnfall")
+    @WebResult(name = "CreateApplicationUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType createApplicationUnfall(
+
+        @WebParam(partName = "param", name = "CreateApplicationUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType param
+    ) throws ServiceFaultMsg;
+
+    @WebMethod(action = "urn:calculateKranken")
+    @WebResult(name = "CalculateKrankenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse calculateKranken(
+
+        @WebParam(partName = "param", name = "CalculateKrankenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-6-0.on2antrag.kranken")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:createOfferSachPrivat")
     @WebResult(name = "CreateOfferSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType createOfferSachPrivat(
@@ -338,6 +290,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateOfferSachPrivatRequestType param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:checkClaim")
+    @WebResult(name = "CheckClaimResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType checkClaim(
+
+        @WebParam(partName = "param", name = "CheckClaimRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on7schaden")
+        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:createApplicationSachPrivat")
     @WebResult(name = "CreateApplicationSachPrivatResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateApplicationSachPrivatResponseType createApplicationSachPrivat(
@@ -370,6 +330,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageRequest param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:createApplicationLeben")
+    @WebResult(name = "CreateApplicationLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType createApplicationLeben(
+
+        @WebParam(partName = "param", name = "CreateApplicationLebenRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:submitApplicationRechtsschutz")
     @WebResult(name = "SubmitApplicationRechtsschutzResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.rs", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.SubmitApplicationRechtsschutzResponse submitApplicationRechtsschutz(
@@ -378,6 +346,14 @@ public interface OmdsServicePortType {
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.SubmitApplicationRechtsschutzRequest param
     ) throws ServiceFaultMsg;
 
+    @WebMethod(action = "urn:createOfferUnfall")
+    @WebResult(name = "CreateOfferUnfallResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType createOfferUnfall(
+
+        @WebParam(partName = "param", name = "CreateOfferUnfallRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.unfall")
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType param
+    ) throws ServiceFaultMsg;
+
     @WebMethod(action = "urn:createOfferLeben")
     @WebResult(name = "CreateOfferLebenResponse", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-5-0.on2antrag.leben", partName = "param")
     public at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateOfferLebenResponseType createOfferLeben(
@@ -409,4 +385,12 @@ public interface OmdsServicePortType {
         @WebParam(partName = "param", name = "SubmitApplicationSachPrivatRequest", targetNamespace = "urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat")
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatRequestType param
     ) throws ServiceFaultMsg;
+
+    @WebMethod(action = "urn:getArcImageInfos")
+    @WebResult(name = "getArcImageInfosResponse", targetNamespace = "urn:omds3ServiceTypes-1-1-0", partName = "param")
+    public at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse getArcImageInfos(
+
+        @WebParam(partName = "param", name = "getArcImageInfosRequest", targetNamespace = "urn:omds3ServiceTypes-1-1-0")
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest param
+    ) throws ServiceFaultMsg;
 }
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java
index 3a0f1430..8749b634 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsServicePortType_OmdsServicePort_Client.java
@@ -19,7 +19,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 
 /**
  * This class was generated by Apache CXF 3.5.0
- * 2022-05-13T13:48:10.731+02:00
+ * 2022-06-02T16:53:57.984+02:00
  * Generated source version: 3.5.0
  *
  */
@@ -48,6 +48,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
         OmdsService ss = new OmdsService(wsdlURL, SERVICE_NAME);
         OmdsServicePortType port = ss.getOmdsServicePort();
 
+        {
+        System.out.println("Invoking getOMDSPackageList...");
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest _getOMDSPackageList_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse _getOMDSPackageList__return = port.getOMDSPackageList(_getOMDSPackageList_param);
+            System.out.println("getOMDSPackageList.result=" + _getOMDSPackageList__return);
+
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
         {
         System.out.println("Invoking calculateLeben...");
         at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CalculateLebenRequestType _calculateLeben_param = null;
@@ -68,6 +81,32 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on1basis.AddDocToBusinessCaseResponseType _addDocToBusinessCase__return = port.addDocToBusinessCase(_addDocToBusinessCase_param);
             System.out.println("addDocToBusinessCase.result=" + _addDocToBusinessCase__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking createApplicationKranken...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest _createApplicationKranken_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse _createApplicationKranken__return = port.createApplicationKranken(_createApplicationKranken_param);
+            System.out.println("createApplicationKranken.result=" + _createApplicationKranken__return);
+
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking calculateSachPrivat...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType _calculateSachPrivat_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _calculateSachPrivat__return = port.calculateSachPrivat(_calculateSachPrivat_param);
+            System.out.println("calculateSachPrivat.result=" + _calculateSachPrivat__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -81,6 +120,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CalculateRechtsschutzResponse _calculateRechtsschutz__return = port.calculateRechtsschutz(_calculateRechtsschutz_param);
             System.out.println("calculateRechtsschutz.result=" + _calculateRechtsschutz__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking createApplicationRechtsschutz...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest _createApplicationRechtsschutz_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse _createApplicationRechtsschutz__return = port.createApplicationRechtsschutz(_createApplicationRechtsschutz_param);
+            System.out.println("createApplicationRechtsschutz.result=" + _createApplicationRechtsschutz__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -120,6 +172,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kfz.CreateOfferKfzResponseType _createOfferKfz__return = port.createOfferKfz(_createOfferKfz_param);
             System.out.println("createOfferKfz.result=" + _createOfferKfz__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking deepLinkPartner...");
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest _deepLinkPartner_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPartner__return = port.deepLinkPartner(_deepLinkPartner_param);
+            System.out.println("deepLinkPartner.result=" + _deepLinkPartner__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -133,6 +198,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.SubmitApplicationLebenResponseType _submitApplicationLeben__return = port.submitApplicationLeben(_submitApplicationLeben_param);
             System.out.println("submitApplicationLeben.result=" + _submitApplicationLeben__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking deepLinkPolicy...");
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest _deepLinkPolicy_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPolicy__return = port.deepLinkPolicy(_deepLinkPolicy_param);
+            System.out.println("deepLinkPolicy.result=" + _deepLinkPolicy__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -172,227 +250,6 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetStateChangesResponseType _getStateChanges__return = port.getStateChanges(_getStateChanges_param);
             System.out.println("getStateChanges.result=" + _getStateChanges__return);
 
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking submitClaim...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType _submitClaim_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType _submitClaim__return = port.submitClaim(_submitClaim_param);
-            System.out.println("submitClaim.result=" + _submitClaim__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking deepLinkOffer...");
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest _deepLinkOffer_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkOffer__return = port.deepLinkOffer(_deepLinkOffer_param);
-            System.out.println("deepLinkOffer.result=" + _deepLinkOffer__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking getDocumentsOfPeriod...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType _getDocumentsOfPeriod_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType _getDocumentsOfPeriod__return = port.getDocumentsOfPeriod(_getDocumentsOfPeriod_param);
-            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 createApplicationUnfall...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType _createApplicationUnfall_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType _createApplicationUnfall__return = port.createApplicationUnfall(_createApplicationUnfall_param);
-            System.out.println("createApplicationUnfall.result=" + _createApplicationUnfall__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking calculateKranken...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest _calculateKranken_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse _calculateKranken__return = port.calculateKranken(_calculateKranken_param);
-            System.out.println("calculateKranken.result=" + _calculateKranken__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking checkClaim...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType _checkClaim_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType _checkClaim__return = port.checkClaim(_checkClaim_param);
-            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 conversionProposal2...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalRequest2 _conversionProposal2_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionProposalResponse2 _conversionProposal2__return = port.conversionProposal2(_conversionProposal2_param);
-            System.out.println("conversionProposal2.result=" + _conversionProposal2__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking createApplicationLeben...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType _createApplicationLeben_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType _createApplicationLeben__return = port.createApplicationLeben(_createApplicationLeben_param);
-            System.out.println("createApplicationLeben.result=" + _createApplicationLeben__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking conversionScope2...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest2 _conversionScope2_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeResponse2 _conversionScope2__return = port.conversionScope2(_conversionScope2_param);
-            System.out.println("conversionScope2.result=" + _conversionScope2__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking createOfferUnfall...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType _createOfferUnfall_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType _createOfferUnfall__return = port.createOfferUnfall(_createOfferUnfall_param);
-            System.out.println("createOfferUnfall.result=" + _createOfferUnfall__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking getArcImageInfos...");
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest _getArcImageInfos_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse _getArcImageInfos__return = port.getArcImageInfos(_getArcImageInfos_param);
-            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 getOMDSPackageList...");
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListRequest _getOMDSPackageList_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.OMDSPackageListResponse _getOMDSPackageList__return = port.getOMDSPackageList(_getOMDSPackageList_param);
-            System.out.println("getOMDSPackageList.result=" + _getOMDSPackageList__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking createApplicationKranken...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenRequest _createApplicationKranken_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateApplicationKrankenResponse _createApplicationKranken__return = port.createApplicationKranken(_createApplicationKranken_param);
-            System.out.println("createApplicationKranken.result=" + _createApplicationKranken__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking calculateSachPrivat...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatRequestType _calculateSachPrivat_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CalculateSachPrivatResponseType _calculateSachPrivat__return = port.calculateSachPrivat(_calculateSachPrivat_param);
-            System.out.println("calculateSachPrivat.result=" + _calculateSachPrivat__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking createApplicationRechtsschutz...");
-        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzRequest _createApplicationRechtsschutz_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.CreateApplicationRechtsschutzResponse _createApplicationRechtsschutz__return = port.createApplicationRechtsschutz(_createApplicationRechtsschutz_param);
-            System.out.println("createApplicationRechtsschutz.result=" + _createApplicationRechtsschutz__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking deepLinkPartner...");
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPartnerRequest _deepLinkPartner_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPartner__return = port.deepLinkPartner(_deepLinkPartner_param);
-            System.out.println("deepLinkPartner.result=" + _deepLinkPartner__return);
-
-        } catch (ServiceFaultMsg e) {
-            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
-            System.out.println(e.toString());
-        }
-
-            }
-        {
-        System.out.println("Invoking deepLinkPolicy...");
-        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkPolicyRequest _deepLinkPolicy_param = null;
-        try {
-            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkPolicy__return = port.deepLinkPolicy(_deepLinkPolicy_param);
-            System.out.println("deepLinkPolicy.result=" + _deepLinkPolicy__return);
-
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -432,6 +289,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckCoverageResponse _checkCoverage__return = port.checkCoverage(_checkCoverage_param);
             System.out.println("checkCoverage.result=" + _checkCoverage__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking submitClaim...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimRequestType _submitClaim_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.SubmitClaimResponseType _submitClaim__return = port.submitClaim(_submitClaim_param);
+            System.out.println("submitClaim.result=" + _submitClaim__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -471,6 +341,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetNumberOfDocumentsResponseType _getNumberOfDocuments__return = port.getNumberOfDocuments(_getNumberOfDocuments_param);
             System.out.println("getNumberOfDocuments.result=" + _getNumberOfDocuments__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking deepLinkOffer...");
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkOfferRequest _deepLinkOffer_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.DeepLinkBusinessObjectResponse _deepLinkOffer__return = port.deepLinkOffer(_deepLinkOffer_param);
+            System.out.println("deepLinkOffer.result=" + _deepLinkOffer__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -497,6 +380,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.SubmitApplicationUnfallResponseType _submitApplicationUnfall__return = port.submitApplicationUnfall(_submitApplicationUnfall_param);
             System.out.println("submitApplicationUnfall.result=" + _submitApplicationUnfall__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking getDocumentsOfPeriod...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodRequestType _getDocumentsOfPeriod_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on1basis.GetDocumentsOfPeriodResponseType _getDocumentsOfPeriod__return = port.getDocumentsOfPeriod(_getDocumentsOfPeriod_param);
+            System.out.println("getDocumentsOfPeriod.result=" + _getDocumentsOfPeriod__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -549,6 +445,32 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CreateOfferKrankenResponse _createOfferKranken__return = port.createOfferKranken(_createOfferKranken_param);
             System.out.println("createOfferKranken.result=" + _createOfferKranken__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking createApplicationUnfall...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallRequestType _createApplicationUnfall_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateApplicationUnfallResponseType _createApplicationUnfall__return = port.createApplicationUnfall(_createApplicationUnfall_param);
+            System.out.println("createApplicationUnfall.result=" + _createApplicationUnfall__return);
+
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking calculateKranken...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenRequest _calculateKranken_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.kranken.CalculateKrankenResponse _calculateKranken__return = port.calculateKranken(_calculateKranken_param);
+            System.out.println("calculateKranken.result=" + _calculateKranken__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -562,6 +484,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.CreateOfferSachPrivatResponseType _createOfferSachPrivat__return = port.createOfferSachPrivat(_createOfferSachPrivat_param);
             System.out.println("createOfferSachPrivat.result=" + _createOfferSachPrivat__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking checkClaim...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimRequestType _checkClaim_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on7schaden.CheckClaimResponseType _checkClaim__return = port.checkClaim(_checkClaim_param);
+            System.out.println("checkClaim.result=" + _checkClaim__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -614,6 +549,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageResponse _getArcImage__return = port.getArcImage(_getArcImage_param);
             System.out.println("getArcImage.result=" + _getArcImage__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking createApplicationLeben...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenRequestType _createApplicationLeben_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.leben.CreateApplicationLebenResponseType _createApplicationLeben__return = port.createApplicationLeben(_createApplicationLeben_param);
+            System.out.println("createApplicationLeben.result=" + _createApplicationLeben__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -627,6 +575,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.rs.SubmitApplicationRechtsschutzResponse _submitApplicationRechtsschutz__return = port.submitApplicationRechtsschutz(_submitApplicationRechtsschutz_param);
             System.out.println("submitApplicationRechtsschutz.result=" + _submitApplicationRechtsschutz__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking createOfferUnfall...");
+        at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallRequestType _createOfferUnfall_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.unfall.CreateOfferUnfallResponseType _createOfferUnfall__return = port.createOfferUnfall(_createOfferUnfall_param);
+            System.out.println("createOfferUnfall.result=" + _createOfferUnfall__return);
+
         } catch (ServiceFaultMsg e) {
             System.out.println("Expected exception: ServiceFaultMsg has occurred.");
             System.out.println(e.toString());
@@ -679,6 +640,19 @@ public final class OmdsServicePortType_OmdsServicePort_Client {
             at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.sachPrivat.SubmitApplicationSachPrivatResponseType _submitApplicationSachPrivat__return = port.submitApplicationSachPrivat(_submitApplicationSachPrivat_param);
             System.out.println("submitApplicationSachPrivat.result=" + _submitApplicationSachPrivat__return);
 
+        } catch (ServiceFaultMsg e) {
+            System.out.println("Expected exception: ServiceFaultMsg has occurred.");
+            System.out.println(e.toString());
+        }
+
+            }
+        {
+        System.out.println("Invoking getArcImageInfos...");
+        at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosRequest _getArcImageInfos_param = null;
+        try {
+            at.vvo.omds.types.omds3Types.r1_8_0.servicetypes.ArcImageInfosResponse _getArcImageInfos__return = port.getArcImageInfos(_getArcImageInfos_param);
+            System.out.println("getArcImageInfos.result=" + _getArcImageInfos__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_8_0/service/ServiceFaultMsg.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java
index fab06736..4aed7a34 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/ServiceFaultMsg.java
@@ -6,7 +6,7 @@ import javax.xml.ws.WebFault;
 
 /**
  * This class was generated by Apache CXF 3.5.0
- * 2022-05-13T13:48:10.778+02:00
+ * 2022-06-02T16:53:58.053+02:00
  * Generated source version: 3.5.0
  */
 
diff --git a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omds3_ON2_Antrag_Common_binding.xml b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omds3_ON2_Antrag_Common_binding.xml
index 4341816e..fff77da3 100644
--- a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omds3_ON2_Antrag_Common_binding.xml
+++ b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omds3_ON2_Antrag_Common_binding.xml
@@ -24,20 +24,5 @@ version="1.0"
       
    
 
-   
-      
-         Die Liste der Sparten, die in der Konvertierungsanforderung behandelt werden.

-]]>
-      
-   
-
-   
-      
-         Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.
-         Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.
-         Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. 

-]]>
-      
-   
 
 
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
index bbf7ac6c..26c02955 100644
--- a/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
+++ b/OMDSServiceDefinition/src/main/resources/bind/r1_8_0/omdsCommonServiceTypes_binding.xml
@@ -25,5 +25,28 @@ version="1.0"
    
 
 
+   
+      
+         Die Liste der Bausteine, die in der Konvertierungsanforderung behandelt werden.

+]]>
+      
+   
+
+   
+      
+         Die Liste der Aktionen, die für einen Vertragsbaustein zulässig sind.
+         Die zulässigen Aktionen müssen nur im Response vom ServiceProvider (VU) befüllt werden.
+         Im Request eines Konvertierungsvorschlags durch den Consumer, können sie leer bleiben. 

+]]>
+      
+   
+
+   
+      
+         Die Liste der Bausteine, die in der Konvertierungsaktion behandelt werden.

+]]>
+      
+   
+
 
 
\ No newline at end of file
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl
index 140aa33e..60705bac 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3Services.wsdl
@@ -349,20 +349,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	
 		
 	
-	
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
-	
-		
-	
 
 	
 	
@@ -627,16 +613,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			
 			
 		
-		
-			
-			
-			
-		
-		
-			
-			
-			
-		
 	
 
 	
@@ -1256,31 +1232,6 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 				
 			
 		
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-		
-		
-			
-			
-				
-			
-			
-				
-			
-			
-				
-			
-