diff --git a/OMDSServiceDefinition/doc/ON_2 Antragsabwicklung/ON_2.02_BOA Services/ON_2.02.07_BOA_Konvertierungshilfe.docx b/OMDSServiceDefinition/doc/ON_2 Antragsabwicklung/ON_2.02_BOA Services/ON_2.02.07_BOA_Konvertierungshilfe.docx
index 367cf35a..abc6b079 100644
Binary files a/OMDSServiceDefinition/doc/ON_2 Antragsabwicklung/ON_2.02_BOA Services/ON_2.02.07_BOA_Konvertierungshilfe.docx and b/OMDSServiceDefinition/doc/ON_2 Antragsabwicklung/ON_2.02_BOA Services/ON_2.02.07_BOA_Konvertierungshilfe.docx differ
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 0c418357..56751125 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
@@ -37,6 +37,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 @XmlSeeAlso({
     ErsatzpolizzeMitAendGrundType.class,
+    at.vvo.omds.types.omds3Types.r1_8_0.on2antrag.common.ConversionScopeRequest.Vertrag.class,
     KonvertierungsumfangVertragType.class
 })
 public abstract class ErsatzpolizzeType {
diff --git a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest.java
index ca632505..c4e8a305 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/on2antrag/common/ConversionScopeRequest.java
@@ -9,6 +9,7 @@ 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;
+import at.vvo.omds.types.omds3Types.r1_8_0.common.ErsatzpolizzeType;
 
 
 /**
@@ -24,12 +25,8 @@ import at.vvo.omds.types.omds3Types.r1_8_0.common.CommonRequestType;
  *         <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>
+ *               <extension base="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type">
+ *               </extension>
  *             </complexContent>
  *           </complexType>
  *         </element>
@@ -92,12 +89,8 @@ public class ConversionScopeRequest
      * <pre>
      * &lt;complexType&gt;
      *   &lt;complexContent&gt;
-     *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
-     *       &lt;sequence&gt;
-     *         &lt;element name="Polizzennr" type="{urn:omds20}Polizzennr"/&gt;
-     *         &lt;element name="VertragsID" type="{urn:omds20}VertragsID" minOccurs="0"/&gt;
-     *       &lt;/sequence&gt;
-     *     &lt;/restriction&gt;
+     *     &lt;extension base="{urn:omds3CommonServiceTypes-1-1-0}Ersatzpolizze_Type"&gt;
+     *     &lt;/extension&gt;
      *   &lt;/complexContent&gt;
      * &lt;/complexType&gt;
      * </pre>
@@ -105,64 +98,11 @@ public class ConversionScopeRequest
      * 
      */
     @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "polizzennr",
-        "vertragsID"
-    })
-    public static class Vertrag {
+    @XmlType(name = "")
+    public static class Vertrag
+        extends ErsatzpolizzeType
+    {
 
-        @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/service/OmdsService.java b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java
index 809d44bf..2591cffb 100644
--- a/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java
+++ b/OMDSServiceDefinition/src/main/java/at/vvo/omds/types/omds3Types/r1_8_0/service/OmdsService.java
@@ -10,7 +10,7 @@ import javax.xml.ws.Service;
 
 /**
  * This class was generated by Apache CXF 3.5.0
- * 2022-06-03T14:46:49.877+02:00
+ * 2022-06-03T16:19:45.523+02:00
  * Generated source version: 3.5.0
  *
  */
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 1acb9e6b..55cdb69c 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-06-03T14:46:49.846+02:00
+ * 2022-06-03T16:19:45.487+02:00
  * Generated source version: 3.5.0
  *
  */
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 4cef3b21..6859a259 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-06-03T14:46:49.862+02:00
+ * 2022-06-03T16:19:45.503+02:00
  * Generated source version: 3.5.0
  *
  */
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 e88e23dc..4c3a5b9d 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-06-03T14:46:49.774+02:00
+ * 2022-06-03T16:19:45.418+02:00
  * Generated source version: 3.5.0
  *
  */
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 67b7cec3..dc8afeaa 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-06-03T14:46:49.846+02:00
+ * 2022-06-03T16:19:45.471+02:00
  * Generated source version: 3.5.0
  */
 
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd
index ee6fe341..4c9e8714 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_8_0/omds3_ON2_Antrag_Common.xsd
@@ -518,10 +518,9 @@
 								<xsd:documentation>Angabe für welche Verträge die Konvertierung geplant ist.</xsd:documentation>
 							</xsd:annotation>
 							<xsd:complexType>
-								<xsd:sequence>
-									<xsd:element name="Polizzennr" type="omds:Polizzennr"/>
-									<xsd:element name="VertragsID" type="omds:VertragsID" minOccurs="0"/>
-								</xsd:sequence>
+								<xsd:complexContent>
+									<xsd:extension base="cst:Ersatzpolizze_Type"/>
+								</xsd:complexContent>
 							</xsd:complexType>
 						</xsd:element>
 					</xsd:sequence>