diff --git a/OMDSServiceDefinition/assembly.xml b/OMDSServiceDefinition/assembly.xml
index 6031244b..dce30ef5 100644
--- a/OMDSServiceDefinition/assembly.xml
+++ b/OMDSServiceDefinition/assembly.xml
@@ -32,7 +32,7 @@
 		</fileSet>
 
 	    <fileSet>
-	    	<directory>${basedir}/src/main/resources/def/r1_8_0</directory>
+	    	<directory>${basedir}/src/main/resources/def/r1_9_0</directory>
 	    	<outputDirectory>/</outputDirectory>
 	    </fileSet>
 	</fileSets>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1.xml
index 843e004b..9506fcc5 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1.xml
@@ -3,8 +3,8 @@
 						 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 						 xmlns="urn:omds3CommonServiceTypes-1-1-0"
 						 xsi:schemaLocation="
-						 urn:omds3CommonServiceTypes-1-1-0 ../../../r1_8_0/omds3CommonServiceTypes.xsd
-						 urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd
+						 urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+						 urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
 ">
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1_restr.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1_restr.xml
index 7bf18e00..ca9cba34 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1_restr.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var1_restr.xml
@@ -3,8 +3,8 @@
 						 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 						 xmlns="urn:omds3CommonServiceTypes-1-1-0"
 						 xsi:schemaLocation="
-						 urn:omds3CommonServiceTypes-1-1-0 ../../../r1_8_0/omds3CommonServiceTypes.xsd
-						 urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd
+						 urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+						 urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
 ">
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2.xml
index 80267497..94fa4003 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2.xml
@@ -4,8 +4,8 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="urn:omds3CommonServiceTypes-1-1-0"
 		xsi:schemaLocation="
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../../r1_8_0/omds3_ON2_Antrag_Common.xsd
-			urn:omds3CommonServiceTypes-1-1-0 ../omds3CommonServiceTypes.xsd">
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd">
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
 		<Ergebnis>OK</Ergebnis>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2b.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2b.xml
index 81f2738e..01501c3b 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2b.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/1_Conversion_Scope_Response_Var2b.xml
@@ -4,8 +4,8 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="urn:omds3CommonServiceTypes-1-1-0"
 		xsi:schemaLocation="
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../../r1_8_0/omds3_ON2_Antrag_Common.xsd
-			urn:omds3CommonServiceTypes-1-1-0 ../omds3CommonServiceTypes.xsd">
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd">
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
 		<Ergebnis>OK</Ergebnis>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Request_Var1.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Request_Var1.xml
index bd8d1d9e..bf4dabd9 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Request_Var1.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Request_Var1.xml
@@ -4,8 +4,8 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="urn:omds3CommonServiceTypes-1-1-0"
 		xsi:schemaLocation="
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../../r1_8_0/omds3_ON2_Antrag_Common.xsd
-			urn:omds3CommonServiceTypes-1-1-0 ../omds3CommonServiceTypes.xsd">
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd">
 	<VUNr>23</VUNr>
 	<KorrelationsId>678708979</KorrelationsId>
 	<ac:Konvertierungsplan>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1.xml
index b1c04d7b..02a9da31 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1.xml
@@ -7,10 +7,10 @@
 		xmlns:omds="urn:omds20"
 		
 		xsi:schemaLocation="
-			urn:omds3CommonServiceTypes-1-1-0 ../../../r1_8_0/omds3CommonServiceTypes.xsd
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd
-			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../omds3_ON2_Antrag_SachPrivat.xsd
-			urn:omds20 ../omds215-00.xsd"
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../../omds3_ON2_Antrag_SachPrivat.xsd
+			urn:omds20 ../../omds215-00.xsd"
 >
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1_vereinfacht.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1_vereinfacht.xml
index b1c04d7b..02a9da31 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1_vereinfacht.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var1_vereinfacht.xml
@@ -7,10 +7,10 @@
 		xmlns:omds="urn:omds20"
 		
 		xsi:schemaLocation="
-			urn:omds3CommonServiceTypes-1-1-0 ../../../r1_8_0/omds3CommonServiceTypes.xsd
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd
-			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../omds3_ON2_Antrag_SachPrivat.xsd
-			urn:omds20 ../omds215-00.xsd"
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../../omds3_ON2_Antrag_SachPrivat.xsd
+			urn:omds20 ../../omds215-00.xsd"
 >
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var2.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var2.xml
index 31f06ba3..d685f568 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var2.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/2_Conversion_Proposal_Response_Var2.xml
@@ -7,10 +7,10 @@
 		xmlns:omds="urn:omds20"
 		
 		xsi:schemaLocation="
-			urn:omds3CommonServiceTypes-1-1-0 ../../../r1_8_0/omds3CommonServiceTypes.xsd
-			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd
-			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../omds3_ON2_Antrag_SachPrivat.xsd
-			urn:omds20 ../omds215-00.xsd"
+			urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+			urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd
+			urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../../omds3_ON2_Antrag_SachPrivat.xsd
+			urn:omds20 ../../omds215-00.xsd"
 >
 	<Status>
 		<KorrelationsId>678708979</KorrelationsId>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/3_BOA_Request.xml b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/3_BOA_Request.xml
index eac9113d..c9fa3191 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/3_BOA_Request.xml
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/TestXmls/Konvertierungshilfe/3_BOA_Request.xml
@@ -5,9 +5,9 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:ac="urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common"
         xsi:schemaLocation="
-            urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../../../r1_8_0/omds3_ON2_Antrag_SachPrivat.xsd
-            urn:omds3CommonServiceTypes-1-1-0 ../omds3CommonServiceTypes.xsd
-            urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../omds3_ON2_Antrag_Common.xsd">
+            urn:at.vvo.omds.types.omds3types.v1-4-0.on2antrag.sachprivat ../../omds3_ON2_Antrag_SachPrivat.xsd
+            urn:omds3CommonServiceTypes-1-1-0 ../../omds3CommonServiceTypes.xsd
+            urn:at.vvo.omds.types.omds3types.v1-3-0.on2antrag.common ../../omds3_ON2_Antrag_Common.xsd">
     <VUNr>23</VUNr>
     <KorrelationsId>1000010011</KorrelationsId>
     <!-- Uebermittlung des Konvertierungsumfangs -->
diff --git a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/omds3CommonServiceTypes.xsd b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/omds3CommonServiceTypes.xsd
index d8f3c4f8..474e077c 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r1_9_0/omds3CommonServiceTypes.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r1_9_0/omds3CommonServiceTypes.xsd
@@ -1217,9 +1217,9 @@
 		<xsd:complexContent>
 			<xsd:extension base="Produktbaustein_Type">
 				<xsd:sequence>
-					<xsd:element name="Eingeschlossen" type="xsd:boolean" minOccurs="0">
+					<xsd:element name="Eingeschlossen" type="xsd:boolean">
 						<xsd:annotation>
-							<xsd:documentation>Ob dieser Produktbaustein eingeschlossen ist oder nicht. Wenn das Element nicht vorhanden ist, so ist dies gleichbedeutend mit Eingeschlossen = true.</xsd:documentation>
+							<xsd:documentation>Ob dieser Produktbaustein eingeschlossen ist oder nicht</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="EinschlussAenderbar" type="xsd:boolean" minOccurs="0">