diff --git a/xsd/siri_model/siri_situationAffects.xsd b/xsd/siri_model/siri_situationAffects.xsd
index 57c31da..0475b24 100644
--- a/xsd/siri_model/siri_situationAffects.xsd
+++ b/xsd/siri_model/siri_situationAffects.xsd
@@ -120,12 +120,12 @@ Rail transport, Roads and road transport
   <xsd:documentation>SIRI-SX Situation Scope.</xsd:documentation>
  </xsd:annotation>
  <!-- ======================================================================= -->
- <xsd:complexType name="AffectedStopPointStructure">
+ <xsd:complexType name="AffectedStopPointWithoutLineStructure">
   <xsd:annotation>
-   <xsd:documentation>Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
+   <xsd:documentation>Base Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
   </xsd:annotation>
   <xsd:sequence>
-   <xsd:element ref="StopPointRef" minOccurs="0"/>
+ <xsd:element ref="StopPointRef" minOccurs="0"/>
    <xsd:element name="PrivateRef" type="xsd:string" minOccurs="0">
     <xsd:annotation>
      <xsd:documentation>Alternative private code of stop.</xsd:documentation>
@@ -195,18 +195,29 @@ Rail transport, Roads and road transport
      </xsd:sequence>
     </xsd:complexType>
    </xsd:element>
+  </xsd:sequence>
+ </xsd:complexType>
+ <xsd:complexType name="AffectedStopPointStructure">
+  <xsd:annotation>
+   <xsd:documentation>Type for an SCHEDULED STOP POINT affected by a SITUATION.</xsd:documentation>
+  </xsd:annotation>
+  <xsd:complexContent>
+   <xsd:extension base="AffectedStopPointWithoutLineStructure">
+  <xsd:sequence>
    <xsd:element name="Lines" minOccurs="0">
     <xsd:annotation>
      <xsd:documentation>Used to restrict stop points to some lines. DEPRECATED since SIRI 2.1</xsd:documentation>
     </xsd:annotation>
     <xsd:complexType>
      <xsd:sequence>
-      <xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
+      <xsd:element name="AffectedLine" type="AffectedLineWithoutStopStructure" maxOccurs="unbounded"/>
      </xsd:sequence>
     </xsd:complexType>
    </xsd:element>
    <xsd:element ref="Extensions" minOccurs="0"/>
   </xsd:sequence>
+   </xsd:extension>
+  </xsd:complexContent>
  </xsd:complexType>
  <xsd:complexType name="AffectedModesStructure">
   <xsd:annotation>
@@ -585,23 +596,32 @@ Rail transport, Roads and road transport
    <xsd:element ref="Extensions" minOccurs="0"/>
   </xsd:sequence>
  </xsd:complexType>
+ <xsd:complexType name="AffectedLineWithoutStopStructure">
+  <xsd:annotation>
+   <xsd:documentation>Base information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context. </xsd:documentation>
+  </xsd:annotation>
+  <xsd:sequence>
+  <xsd:element name="AffectedOperator" type="AffectedOperatorStructure" minOccurs="0" maxOccurs="unbounded">
+   <xsd:annotation>
+    <xsd:documentation>Restricts the affected scope to the specified operators of LINEs that are affected by the situation. Overrides any value specified for (i) Affected Network (ii) General Context.</xsd:documentation>
+   </xsd:annotation>
+  </xsd:element>
+  <xsd:group ref="LineGroup"/>
+  </xsd:sequence>
+ </xsd:complexType>
  <xsd:complexType name="AffectedLineStructure">
   <xsd:annotation>
    <xsd:documentation>Information about the individual LINEs in the network that are affected by a SITUATION. If not explicitly overridden, modes and submodes will be defaulted to any values present (i) in the AffectedNetwork (ii) in the general context. </xsd:documentation>
   </xsd:annotation>
+  <xsd:complexContent>
+  <xsd:extension base="AffectedLineWithoutStopStructure">
   <xsd:sequence>
-   <xsd:element name="AffectedOperator" type="AffectedOperatorStructure" minOccurs="0" maxOccurs="unbounded">
-    <xsd:annotation>
-     <xsd:documentation>Restricts the affected scope to the specified operators of LINEs that are affected by the situation. Overrides any value specified for (i) Affected Network (ii) General Context.</xsd:documentation>
-    </xsd:annotation>
-   </xsd:element>
-   <xsd:group ref="LineGroup"/>
-   <xsd:element name="Origins" type="AffectedStopPointStructure" minOccurs="0" maxOccurs="unbounded">
+   <xsd:element name="Origins" type="AffectedStopPointWithoutLineStructure" minOccurs="0" maxOccurs="unbounded">
     <xsd:annotation>
      <xsd:documentation>Restricts the affected scope to the specified origins</xsd:documentation>
     </xsd:annotation>
    </xsd:element>
-   <xsd:element name="Destinations" type="AffectedStopPointStructure" minOccurs="0" maxOccurs="unbounded">
+   <xsd:element name="Destinations" type="AffectedStopPointWithoutLineStructure" minOccurs="0" maxOccurs="unbounded">
     <xsd:annotation>
      <xsd:documentation>Restricts the affected scope to the specified DESTINATIONs</xsd:documentation>
     </xsd:annotation>
@@ -641,7 +661,7 @@ Rail transport, Roads and road transport
     </xsd:annotation>
     <xsd:complexType>
      <xsd:sequence>
-      <xsd:element name="AffectedStopPoint" type="AffectedStopPointStructure" maxOccurs="unbounded"/>
+      <xsd:element name="AffectedStopPoint" type="AffectedStopPointWithoutLineStructure" maxOccurs="unbounded"/>
      </xsd:sequence>
     </xsd:complexType>
    </xsd:element>
@@ -651,12 +671,14 @@ Rail transport, Roads and road transport
     </xsd:annotation>
     <xsd:complexType>
      <xsd:sequence>
-      <xsd:element name="AffectedStopPlace" type="AffectedStopPlaceStructure" maxOccurs="unbounded"/>
+      <xsd:element name="AffectedStopPlace" type="AffectedStopPlaceWithoutLineStructure" maxOccurs="unbounded"/>
      </xsd:sequence>
     </xsd:complexType>
    </xsd:element>
    <xsd:element ref="Extensions" minOccurs="0"/>
   </xsd:sequence>
+  </xsd:extension>
+  </xsd:complexContent>
  </xsd:complexType>
  <xsd:complexType name="AffectedSectionStructure">
   <xsd:annotation>
@@ -780,7 +802,7 @@ Rail transport, Roads and road transport
        </xsd:annotation>
       </xsd:element>
       <xsd:sequence maxOccurs="unbounded">
-       <xsd:element name="AffectedStopPoint" type="AffectedStopPointStructure">
+       <xsd:element name="AffectedStopPoint" type="AffectedStopPointWithoutLineStructure">
         <xsd:annotation>
          <xsd:documentation>Stop Point of the ROUTE</xsd:documentation>
         </xsd:annotation>
@@ -1181,6 +1203,28 @@ Rail transport, Roads and road transport
   <xsd:annotation>
    <xsd:documentation>Type for information about the STOP PLACEs affected by an SITUATION.</xsd:documentation>
   </xsd:annotation>
+  <xsd:complexContent>
+  <xsd:extension base="AffectedStopPlaceWithoutLineStructure">
+   <xsd:sequence>
+   <xsd:element name="Lines" minOccurs="0">
+    <xsd:annotation>
+     <xsd:documentation>Used to restrict STOP PLACEs to some lines. DEPRECATED since SIRI 2.1</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+     <xsd:sequence>
+      <xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
+     </xsd:sequence>
+    </xsd:complexType>
+   </xsd:element>
+    <xsd:element ref="Extensions" minOccurs="0"/>
+  </xsd:sequence>
+  </xsd:extension>
+  </xsd:complexContent>
+ </xsd:complexType>>
+ <xsd:complexType name="AffectedStopPlaceWithoutLineStructure">
+  <xsd:annotation>
+   <xsd:documentation>Base Type for information about the STOP PLACEs affected by an SITUATION.</xsd:documentation>
+  </xsd:annotation>
   <xsd:complexContent>
    <xsd:extension base="AffectedStopPlaceElementStructure">
     <xsd:sequence>
@@ -1237,17 +1281,6 @@ Rail transport, Roads and road transport
        </xsd:sequence>
       </xsd:complexType>
      </xsd:element>
-     <xsd:element name="Lines" minOccurs="0">
-      <xsd:annotation>
-       <xsd:documentation>Used to restrict STOP PLACEs to some lines. DEPRECATED since SIRI 2.1</xsd:documentation>
-      </xsd:annotation>
-      <xsd:complexType>
-       <xsd:sequence>
-        <xsd:element name="AffectedLine" type="AffectedLineStructure" maxOccurs="unbounded"/>
-       </xsd:sequence>
-      </xsd:complexType>
-     </xsd:element>
-     <xsd:element ref="Extensions" minOccurs="0"/>
     </xsd:sequence>
    </xsd:extension>
   </xsd:complexContent>