diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb b/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
index 0ed29620..467d9b02 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/binding.xjb
@@ -697,35 +697,40 @@
             <jaxb:javadoc><![CDATA[<p>Die Liste der Kindelemente. Die Liste kann leer sein, wenn es keine Kindelemente gibt.</p>]]></jaxb:javadoc>
          </jaxb:property>
       </jaxb:bindings>
+      <jaxb:bindings node="//xs:complexType[@name='Baustein_Type']//xs:element[@name='Attribut']">
+         <jaxb:property name="Attribute">
+            <jaxb:javadoc><![CDATA[<p>Die Liste der Attribute dieses Knotens. Die Liste kann leer sein, wenn es keine Attribute gibt.</p>]]></jaxb:javadoc>
+         </jaxb:property>
+      </jaxb:bindings>
       <!-- Annotiere die Request- und Response-elemente als XmlRootElement in Java -->
-      <bindings node="xs:element[@name='IncludeRiskProposalRequest']">
+      <bindings node="xs:element[@name='AmendRiskProposalRequest']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalRequest"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskProposalRequest"/>
          </annox:annotate>
       </bindings>
-      <bindings node="xs:element[@name='IncludeRiskProposalResponse']">
+      <bindings node="xs:element[@name='AmendRiskProposalResponse']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalResponse"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskProposalResponse"/>
          </annox:annotate>
       </bindings>
-      <bindings node="xs:element[@name='IncludeRiskConfigurationRequest']">
+      <bindings node="xs:element[@name='AmendRiskConfigurationRequest']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalRequest"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskConfigurationRequest"/>
          </annox:annotate>
       </bindings>
-      <bindings node="xs:element[@name='IncludeRiskConfigurationResponse']">
+      <bindings node="xs:element[@name='AmendRiskConfigurationResponse']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalResponse"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskConfigurationResponse"/>
          </annox:annotate>
       </bindings>
-      <bindings node="xs:element[@name='IncludeRiskSubmitRequest']">
+      <bindings node="xs:element[@name='AmendRiskSubmitRequest']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalRequest"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskSubmitRequest"/>
          </annox:annotate>
       </bindings>
-      <bindings node="xs:element[@name='IncludeRiskSubmitResponse']">
+      <bindings node="xs:element[@name='AmendRiskSubmitResponse']">
          <annox:annotate>
-            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="IncludeRiskProposalResponse"/>
+            <annox:annotate annox:class="jakarta.xml.bind.annotation.XmlRootElement" name="AmendRiskSubmitResponse"/>
          </annox:annotate>
       </bindings>
    </jaxb:bindings>
diff --git a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON3_Vertrag.xsd b/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON3_Vertrag.xsd
index 1ccb7a84..688f7cda 100644
--- a/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON3_Vertrag.xsd
+++ b/OMDSServiceDefinition/src/main/resources/def/r2025_27/omds3_ON3_Vertrag.xsd
@@ -145,7 +145,13 @@
       </xsd:complexContent>
     </xsd:complexType>
   </xsd:element>
-  <xsd:element name="AmendRiskSubmitResponse" type="cst:CommonResponse_Type" >
+  <xsd:element name="AmendRiskSubmitResponse">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="cst:CommonResponse_Type">
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
   </xsd:element>
   <xsd:element name="Einbeziehung" >
     <xsd:complexType>