From c7ac6b23b8392ebf3a1fe0c78a81c66474ea3f91 Mon Sep 17 00:00:00 2001
From: ue71603 <matthias.guenter@sbb.ch>
Date: Thu, 5 Sep 2024 10:24:56 +0000
Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20VDVde/OJ?=
 =?UTF-8?q?P@4a9f5f8819135f5fa557166aa740db2e6b3177c8=20=F0=9F=9A=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../documentation-tables/acsb.html            |   72 +-
 .../documentation-tables/datex2.html          |   32 +-
 .../documentation-tables/ifopt.html           |   64 +-
 .../documentation-tables/ojp.html             |  834 ++--
 .../documentation-tables/siri.html            | 3820 ++++++++---------
 5 files changed, 2411 insertions(+), 2411 deletions(-)

diff --git a/bugfix/clarification_multipointtyp/documentation-tables/acsb.html b/bugfix/clarification_multipointtyp/documentation-tables/acsb.html
index aede05fc..5755a522 100644
--- a/bugfix/clarification_multipointtyp/documentation-tables/acsb.html
+++ b/bugfix/clarification_multipointtyp/documentation-tables/acsb.html
@@ -118,7 +118,7 @@ <h3>1.2. The complex type <code>acsb:AccessibilityAssessmentStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_25_1" title="local-type: typedef-25.1">local-type: typedef-25.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_80_1" title="local-type: typedef-80.1">local-type: typedef-80.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The Limitations that apply to component.</p>
@@ -133,7 +133,7 @@ <h3>1.2. The complex type <code>acsb:AccessibilityAssessmentStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_25_2" title="local-type: typedef-25.2">local-type: typedef-25.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_80_2" title="local-type: typedef-80.2">local-type: typedef-80.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The Suitability of the component to meet specifc user needs.</p>
@@ -148,7 +148,7 @@ <h3>1.2. The complex type <code>acsb:AccessibilityAssessmentStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_77_1" title="local-type: typedef-77.1">local-type: typedef-77.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Arbitrary extensions.</p>
@@ -307,7 +307,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityLimitationStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_77_1" title="local-type: typedef-77.1">local-type: typedef-77.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Arbitrary extensions.</p>
@@ -345,8 +345,8 @@ <h3>1.4. The complex type <code>acsb:LimitationRefStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_25_1">
-          <h3>1.5. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-25.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_77_1">
+          <h3>1.5. The complex type <code>element[ifopt:Extensions]#complexType (typedef-77.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -360,36 +360,21 @@ <h3>1.5. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[acsb:AccessibilityAssessmentStructure]</code><br/><code>  /Limitations #complexType</code><br/><code>  (typedef-25.1)</code></p>
+                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-77.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"></p>
+                    <p class="tableblock"><code>xs:anyType</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>acsb:AccessibilityLimitation</strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_acsb__AccessibilityLimitationStructure" title="acsb:AccessibilityLimitationStructure">acsb:AccessibilityLimitationStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The accessibility limitations on navigation.</p>
-                  </td>
-                </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_25_2">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-25.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_80_1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-80.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -403,7 +388,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[acsb:AccessibilityAssessmentStructure]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-25.2)</code></p>
+                    <p class="tableblock"><code>complexType[acsb:AccessibilityAssessmentStructure]</code><br/><code>  /Limitations #complexType</code><br/><code>  (typedef-80.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -415,24 +400,24 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>acsb:Suitability</strong></code></p>
+                    <p class="tableblock"><code><strong>acsb:AccessibilityLimitation</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_acsb__SuitabilityStructure" title="acsb:SuitabilityStructure">acsb:SuitabilityStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_acsb__AccessibilityLimitationStructure" title="acsb:AccessibilityLimitationStructure">acsb:AccessibilityLimitationStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The Suitability of com[onent to meet a specifc user need.</p>
+                    <p class="tableblock darkbrown">The accessibility limitations on navigation.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_71_1">
-          <h3>1.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-71.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_80_2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-80.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -446,15 +431,30 @@ <h3>1.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-7
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-71.1)</code></p>
+                    <p class="tableblock"><code>complexType[acsb:AccessibilityAssessmentStructure]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-80.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>xs:anyType</code></p>
+                    <p class="tableblock"></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>acsb:Suitability</strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_acsb__SuitabilityStructure" title="acsb:SuitabilityStructure">acsb:SuitabilityStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">The Suitability of com[onent to meet a specifc user need.</p>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -1209,7 +1209,7 @@ <h3>3.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_28_1" class="tableblock"><code>group[acsb:UserNeedGroup]</code><br/><code>  /MedicalNeed #simpleType</code><br/><code>  (typedef-28.1)</code></p>
+                    <p id="local_type_typedef_81_1" class="tableblock"><code>group[acsb:UserNeedGroup]</code><br/><code>  /MedicalNeed #simpleType</code><br/><code>  (typedef-81.1)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -1330,7 +1330,7 @@ <h3>3.2. The group <code>acsb:UserNeedGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/acsb.enum-dict.html#local_enum.typedef_28_1" title="local-type: typedef-28.1">local-type: typedef-28.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/acsb.enum-dict.html#local_enum.typedef_81_1" title="local-type: typedef-81.1">local-type: typedef-81.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Passenger medical USER NEED for which SUITABILITY is specified.</p>
@@ -1546,7 +1546,7 @@ <h3>3.5. The complex type <code>acsb:UserNeedStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/acsb.enum-dict.html#local_enum.typedef_28_1" title="local-type: typedef-28.1">local-type: typedef-28.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/acsb.enum-dict.html#local_enum.typedef_81_1" title="local-type: typedef-81.1">local-type: typedef-81.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Passenger medical USER NEED for which SUITABILITY is specified.</p>
diff --git a/bugfix/clarification_multipointtyp/documentation-tables/datex2.html b/bugfix/clarification_multipointtyp/documentation-tables/datex2.html
index 5f26af01..9480f1e2 100644
--- a/bugfix/clarification_multipointtyp/documentation-tables/datex2.html
+++ b/bugfix/clarification_multipointtyp/documentation-tables/datex2.html
@@ -75081,7 +75081,7 @@ <h3>2.68. The complex type <code>orc:Itinerary</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_1" title="local-type: typedef-62.1">local-type: typedef-62.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_84_1" title="local-type: typedef-84.1">local-type: typedef-84.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Location contained in an itinerary (i.e. an ordered set of locations defining a route or itinerary).</p>
@@ -77548,7 +77548,7 @@ <h3>2.83. The complex type <code>orc:MeasurementSiteRecord</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_2" title="local-type: typedef-62.2">local-type: typedef-62.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_84_2" title="local-type: typedef-84.2">local-type: typedef-84.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Composition to the indexed measurement specific characteristics associated with the measurement site. The index uniquely associates the measurement characteristics with the corresponding indexed measurement values for the measurement site.</p>
@@ -78086,7 +78086,7 @@ <h3>2.88. The complex type <code>orc:MultilingualString</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_3" title="local-type: typedef-62.3">local-type: typedef-62.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_84_3" title="local-type: typedef-84.3">local-type: typedef-84.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -87771,7 +87771,7 @@ <h3>2.130. The complex type <code>orc:SiteMeasurements</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_4" title="local-type: typedef-62.4">local-type: typedef-62.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_84_4" title="local-type: typedef-84.4">local-type: typedef-84.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Composition to the indexed measured value associated with the measurement site. The index uniquely associates the measurement value with the corresponding indexed measurement characteristics defined for the measurement site.</p>
@@ -98984,8 +98984,8 @@ <h3>2.190. The complex type <code>orc:WinterDrivingManagement</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_62_1">
-          <h3>2.191. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-62.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_84_1">
+          <h3>2.191. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-84.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -98999,7 +98999,7 @@ <h3>2.191. The complex type <code>complexType[Itinerary]/locationContainedInItin
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[Itinerary]</code><br/><code>  /locationContainedInItinerary #complexType</code><br/><code>  (typedef-62.1)</code></p>
+                    <p class="tableblock"><code>complexType[Itinerary]</code><br/><code>  /locationContainedInItinerary #complexType</code><br/><code>  (typedef-84.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_orc__Location" title="orc:Location">orc:Location</a></p>
@@ -99080,8 +99080,8 @@ <h3>2.191. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_62_2">
-          <h3>2.192. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-62.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_84_2">
+          <h3>2.192. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-84.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -99095,7 +99095,7 @@ <h3>2.192. The complex type <code>complexType[MeasurementSiteRecord]/measurement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[MeasurementSiteRecord]</code><br/><code>  /measurementSpecificCharacteristics #complexType</code><br/><code>  (typedef-62.2)</code></p>
+                    <p class="tableblock"><code>complexType[MeasurementSiteRecord]</code><br/><code>  /measurementSpecificCharacteristics #complexType</code><br/><code>  (typedef-84.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_orc__MeasurementSpecificCharacteristics" title="orc:MeasurementSpecificCharacteristics">orc:MeasurementSpecificCharacteristics</a></p>
@@ -99236,8 +99236,8 @@ <h3>2.192. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_62_3">
-          <h3>2.193. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-62.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_84_3">
+          <h3>2.193. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-84.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -99251,7 +99251,7 @@ <h3>2.193. The complex type <code>complexType[MultilingualString]/values#complex
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[MultilingualString]</code><br/><code>  /values #complexType</code><br/><code>  (typedef-62.3)</code></p>
+                    <p class="tableblock"><code>complexType[MultilingualString]</code><br/><code>  /values #complexType</code><br/><code>  (typedef-84.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -99279,8 +99279,8 @@ <h3>2.193. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_62_4">
-          <h3>2.194. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-62.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_84_4">
+          <h3>2.194. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-84.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -99294,7 +99294,7 @@ <h3>2.194. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[SiteMeasurements]</code><br/><code>  /measuredValue #complexType</code><br/><code>  (typedef-62.4)</code></p>
+                    <p class="tableblock"><code>complexType[SiteMeasurements]</code><br/><code>  /measuredValue #complexType</code><br/><code>  (typedef-84.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_orc__MeasuredValue" title="orc:MeasuredValue">orc:MeasuredValue</a></p>
diff --git a/bugfix/clarification_multipointtyp/documentation-tables/ifopt.html b/bugfix/clarification_multipointtyp/documentation-tables/ifopt.html
index f08e2c6b..1c1efc88 100644
--- a/bugfix/clarification_multipointtyp/documentation-tables/ifopt.html
+++ b/bugfix/clarification_multipointtyp/documentation-tables/ifopt.html
@@ -6203,7 +6203,7 @@ <h3>4.5. The group <code>ifopt:LocalServiceGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_69_1" title="local-type: typedef-69.1">local-type: typedef-69.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Classification of features.</p>
@@ -6826,7 +6826,7 @@ <h3>4.10. The complex type <code>ifopt:LocalServiceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_69_1" title="local-type: typedef-69.1">local-type: typedef-69.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Classification of features.</p>
@@ -6841,7 +6841,7 @@ <h3>4.10. The complex type <code>ifopt:LocalServiceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_77_1" title="local-type: typedef-77.1">local-type: typedef-77.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Arbitrary extensions.</p>
@@ -7037,7 +7037,7 @@ <h3>4.11. The complex type <code>ifopt:PlaceEquipmentStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_71_1" title="local-type: typedef-71.1">local-type: typedef-71.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_77_1" title="local-type: typedef-77.1">local-type: typedef-77.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Arbitrary extensions.</p>
@@ -7047,8 +7047,8 @@ <h3>4.11. The complex type <code>ifopt:PlaceEquipmentStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_69_1">
-          <h3>4.12. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-69.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_71_1">
+          <h3>4.12. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-71.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -7062,7 +7062,7 @@ <h3>4.12. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[ifopt:LocalServiceGroup]</code><br/><code>  /FeatureRefs #complexType</code><br/><code>  (typedef-69.1)</code></p>
+                    <p class="tableblock"><code>group[ifopt:LocalServiceGroup]</code><br/><code>  /FeatureRefs #complexType</code><br/><code>  (typedef-71.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -7090,8 +7090,8 @@ <h3>4.12. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_71_1">
-          <h3>4.13. The complex type <code>element[ifopt:Extensions]#complexType (typedef-71.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_77_1">
+          <h3>4.13. The complex type <code>element[ifopt:Extensions]#complexType (typedef-77.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -7105,7 +7105,7 @@ <h3>4.13. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-71.1)</code></p>
+                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-77.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><code>xs:anyType</code></p>
@@ -7624,7 +7624,7 @@ <h3>5.8. The complex type <code>ifopt:AbstractProjection</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_1" title="local-type: typedef-66.1">local-type: typedef-66.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_1" title="local-type: typedef-76.1">local-type: typedef-76.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">GIS Features that this element projects onto.</p>
@@ -7756,7 +7756,7 @@ <h3>5.11. The complex type <code>ifopt:LinkProjectionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_1" title="local-type: typedef-66.1">local-type: typedef-66.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_1" title="local-type: typedef-76.1">local-type: typedef-76.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">GIS Features that this element projects onto.</p>
@@ -7776,7 +7776,7 @@ <h3>5.11. The complex type <code>ifopt:LinkProjectionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_2" title="local-type: typedef-66.2">local-type: typedef-66.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_2" title="local-type: typedef-76.2">local-type: typedef-76.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Ordered sequence of points. There must always be a start and end point.</p>
@@ -7824,7 +7824,7 @@ <h3>5.12. The complex type <code>ifopt:PointProjectionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_1" title="local-type: typedef-66.1">local-type: typedef-66.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_1" title="local-type: typedef-76.1">local-type: typedef-76.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">GIS Features that this element projects onto.</p>
@@ -7978,7 +7978,7 @@ <h3>5.13. The complex type <code>ifopt:ZoneProjectionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_1" title="local-type: typedef-66.1">local-type: typedef-66.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_1" title="local-type: typedef-76.1">local-type: typedef-76.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">GIS Features that this element projects onto.</p>
@@ -7998,7 +7998,7 @@ <h3>5.13. The complex type <code>ifopt:ZoneProjectionStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_66_3" title="local-type: typedef-66.3">local-type: typedef-66.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_76_3" title="local-type: typedef-76.3">local-type: typedef-76.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Boundary line of Zone as an ordered set of points.</p>
@@ -8008,8 +8008,8 @@ <h3>5.13. The complex type <code>ifopt:ZoneProjectionStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_66_1">
-          <h3>5.14. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-66.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_76_1">
+          <h3>5.14. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-76.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8023,7 +8023,7 @@ <h3>5.14. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[ifopt:AbstractProjection]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-66.1)</code></p>
+                    <p class="tableblock"><code>complexType[ifopt:AbstractProjection]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-76.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -8051,8 +8051,8 @@ <h3>5.14. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_66_2">
-          <h3>5.15. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-66.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_76_2">
+          <h3>5.15. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-76.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8066,7 +8066,7 @@ <h3>5.15. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[ifopt:LinkProjectionStructure]</code><br/><code>  /Line #complexType</code><br/><code>  (typedef-66.2)</code></p>
+                    <p class="tableblock"><code>complexType[ifopt:LinkProjectionStructure]</code><br/><code>  /Line #complexType</code><br/><code>  (typedef-76.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -8094,8 +8094,8 @@ <h3>5.15. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_66_3">
-          <h3>5.16. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-66.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_76_3">
+          <h3>5.16. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-76.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8109,7 +8109,7 @@ <h3>5.16. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[ifopt:ZoneProjectionStructure]</code><br/><code>  /Boundary #complexType</code><br/><code>  (typedef-66.3)</code></p>
+                    <p class="tableblock"><code>complexType[ifopt:ZoneProjectionStructure]</code><br/><code>  /Boundary #complexType</code><br/><code>  (typedef-76.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -10549,7 +10549,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_65_1" title="local-type: typedef-65.1">local-type: typedef-65.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_73_1" title="local-type: typedef-73.1">local-type: typedef-73.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any timebands which further qualify the validity condition.</p>
@@ -10559,8 +10559,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_65_1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-65.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_73_1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-73.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -10574,7 +10574,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[ifopt:ValidityConditionStructure]</code><br/><code>  /Timebands #complexType</code><br/><code>  (typedef-65.1)</code></p>
+                    <p class="tableblock"><code>complexType[ifopt:ValidityConditionStructure]</code><br/><code>  /Timebands #complexType</code><br/><code>  (typedef-73.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -10757,8 +10757,8 @@ <h3>11.5. The complex type <code>ifopt:InfoLinkStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_71_1">
-          <h3>11.6. The complex type <code>element[ifopt:Extensions]#complexType (typedef-71.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_77_1">
+          <h3>11.6. The complex type <code>element[ifopt:Extensions]#complexType (typedef-77.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -10772,7 +10772,7 @@ <h3>11.6. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-71.1)</code></p>
+                    <p class="tableblock"><code>element[ifopt:Extensions]</code><br/><code>  #complexType</code><br/><code>  (typedef-77.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><code>xs:anyType</code></p>
diff --git a/bugfix/clarification_multipointtyp/documentation-tables/ojp.html b/bugfix/clarification_multipointtyp/documentation-tables/ojp.html
index 5d58af74..a0b2dfc8 100644
--- a/bugfix/clarification_multipointtyp/documentation-tables/ojp.html
+++ b/bugfix/clarification_multipointtyp/documentation-tables/ojp.html
@@ -681,7 +681,7 @@ <h3>1.4. The complex type <code>OJPRequestStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -698,7 +698,7 @@ <h3>1.4. The complex type <code>OJPRequestStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -841,7 +841,7 @@ <h3>1.4. The complex type <code>OJPRequestStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -875,7 +875,7 @@ <h3>1.4. The complex type <code>OJPRequestStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -1073,7 +1073,7 @@ <h3>1.5. The complex type <code>OJPResponseStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -1288,8 +1288,8 @@ <h3>1.5. The complex type <code>OJPResponseStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_1">
-          <h3>1.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-88.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_1">
+          <h3>1.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-61.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -1303,7 +1303,7 @@ <h3>1.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/Er
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-88.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-61.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -1372,8 +1372,8 @@ <h3>1.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_1">
-          <h3>1.7. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-98.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_2">
+          <h3>1.7. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-98.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -1387,10 +1387,10 @@ <h3>1.7. The complex type <code>element[siri:StopPointsRequest]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.1)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequest">siri:StopPointsDiscoveryRequest</a></p>
+                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceRequestStructure" title="siri:ServiceRequest">siri:ServiceRequest</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -1401,6 +1401,21 @@ <h3>1.7. The complex type <code>element[siri:StopPointsRequest]#complexType (typ
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContext">siri:ServiceRequestContext</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1483,151 +1498,240 @@ <h3>1.7. The complex type <code>element[siri:StopPointsRequest]#complexType (typ
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="sect2" id="local_type_typedef_98_3">
+          <h3>1.8. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-98.3)</code></h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
                 <tr>
-                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopic">siri:StopPointsDiscoveryRequestTopic</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>a</em></p>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:BoundingBox</code></p>
+                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequest">siri:SubscriptionRequest</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
+                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__BoundingBoxStructure" title="siri:BoundingBox">siri:BoundingBox</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
+                    <p class="tableblock darkbrown">Timestamp on request.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>b</em></p>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__AuthenticatedRequestGroup" title="siri:AuthenticatedRequest">siri:AuthenticatedRequest</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:AccountId</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Circle</code></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                    <p class="tableblock darkbrown">Account Identifier. May be used to attribute requests to a particular application provider and authentication key. The account may be common to all users of an application, or to an individual user. Note that to identify an individual user the RequestorRef can be used with an anonymised token. . (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:AccountKey</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__LocationStructure" title="siri:Location">siri:Location</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
+                    <p class="tableblock darkbrown">Authentication key for request. May be used to authenticate requests from a particular account. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>c</em></p>
+                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__RequestorEndpointGroup" title="siri:RequestorEndpoint">siri:RequestorEndpoint</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Address</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:PlaceRef</code></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
+                    <p class="tableblock darkbrown">Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:OperatorRef</code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__RequestorRef" title="siri:RequestorRef">siri:RequestorRef</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to a requestor - Participant Code.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__OperatorRefStructure" title="siri:OperatorRef">siri:OperatorRef</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageQualifierStructure" title="siri:MessageQualifier">siri:MessageQualifier</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
+                    <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:LineRef</code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__LineRefStructure" title="siri:LineRef">siri:LineRef</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicy">siri:StopPointsDiscoveryRequestPolicy</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Language</code></p>
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpoint">siri:SubscriberEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
+                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="siri.html#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ExtensionsStructure" title="siri:Extensions">siri:Extensions</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContext">siri:SubscriptionContext</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscription">siri:AbstractSubscription</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_2">
-          <h3>1.8. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-98.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_4">
+          <h3>1.9. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-98.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -1641,13 +1745,13 @@ <h3>1.8. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequest">siri:ServiceFeaturesDiscoveryRequest</a></p>
+                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceDeliveryStructure" title="siri:ServiceDelivery">siri:ServiceDelivery</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
+                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
                   </td>
                 </tr>
                 <tr>
@@ -1658,120 +1762,177 @@ <h3>1.8. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Timestamp on request.</p>
+                    <p class="tableblock darkbrown">Time individual response element was created.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__AuthenticatedRequestGroup" title="siri:AuthenticatedRequest">siri:AuthenticatedRequest</a></td>
+                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpoint">siri:ProducerResponseEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:AccountId</code></p>
+                    <p class="tableblock"><code>siri:ProducerRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Account Identifier. May be used to attribute requests to a particular application provider and authentication key. The account may be common to all users of an application, or to an individual user. Note that to identify an individual user the RequestorRef can be used with an anonymised token. . (since SIRI 2.0)</p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:AccountKey</code></p>
+                    <p class="tableblock"><code>siri:Address</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Authentication key for request. May be used to authenticate requests from a particular account. (since SIRI 2.0)</p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__RequestorEndpointGroup" title="siri:RequestorEndpoint">siri:RequestorEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Address</code></p>
+                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageQualifierStructure" title="siri:MessageQualifier">siri:MessageQualifier</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data.</p>
+                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__RequestorRef" title="siri:RequestorRef">siri:RequestorRef</a></strong></code></p>
+                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageRefStructure" title="siri:MessageRef">siri:MessageRef</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a requestor - Participant Code.</p>
+                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageQualifierStructure" title="siri:MessageQualifier">siri:MessageQualifier</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatus">siri:ServiceDeliveryRequestStatus</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Status</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
+                  </td>
+                </tr>
+                <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="siri.html#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ExtensionsStructure" title="siri:Extensions">siri:Extensions</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBody">siri:ServiceDeliveryBody</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:MoreData</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDelivery">siri:AbstractServiceDelivery</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_2">
-          <h3>1.9. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-104.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_1">
+          <h3>1.10. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-104.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -1785,10 +1946,10 @@ <h3>1.9. The complex type <code>element[siri:ServiceRequest]#complexType (typede
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
+                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceRequestStructure" title="siri:ServiceRequest">siri:ServiceRequest</a></p>
+                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequest">siri:StopPointsDiscoveryRequest</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -1799,21 +1960,6 @@ <h3>1.9. The complex type <code>element[siri:ServiceRequest]#complexType (typede
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContext">siri:ServiceRequestContext</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
-                  </td>
-                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1896,40 +2042,151 @@ <h3>1.9. The complex type <code>element[siri:ServiceRequest]#complexType (typede
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopic">siri:StopPointsDiscoveryRequestTopic</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>a</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:BoundingBox</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__BoundingBoxStructure" title="siri:BoundingBox">siri:BoundingBox</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>b</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Circle</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__LocationStructure" title="siri:Location">siri:Location</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>c</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:PlaceRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:OperatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__OperatorRefStructure" title="siri:OperatorRef">siri:OperatorRef</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                    <p class="tableblock"><code>siri:LineRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__LineRefStructure" title="siri:LineRef">siri:LineRef</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicy">siri:StopPointsDiscoveryRequestPolicy</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Language</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>→‍<a shape="rect" href="siri.html#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ExtensionsStructure" title="siri:Extensions">siri:Extensions</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_3">
-          <h3>1.10. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-104.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_2">
+          <h3>1.11. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-104.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -1943,10 +2200,10 @@ <h3>1.10. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequest">siri:SubscriptionRequest</a></p>
+                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequest">siri:ServiceFeaturesDiscoveryRequest</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -2038,291 +2295,34 @@ <h3>1.10. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                     <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpoint">siri:SubscriberEndpoint</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContext">siri:SubscriptionContext</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
-                  </td>
-                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscription">siri:AbstractSubscription</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <div class="sect2" id="local_type_typedef_104_4">
-          <h3>1.11. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-104.4)</code></h3>
-          <div class="sectionbody">
-            <table class="tableblock frame-all grid-all spread">
-              <colgroup span="1">
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:23.8095238095238%"/>
-                <col span="1" style="width:35.7142857142857%"/>
-              </colgroup>
-              <tbody>
-                <tr>
-                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.4)</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="siri.html#type_siri__ServiceDeliveryStructure" title="siri:ServiceDelivery">siri:ServiceDelivery</a></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
-                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Time individual response element was created.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpoint">siri:ProducerResponseEndpoint</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ProducerRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Address</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageQualifierStructure" title="siri:MessageQualifier">siri:MessageQualifier</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__MessageRefStructure" title="siri:MessageRef">siri:MessageRef</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpoint">siri:DelegatorEndpoint</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="siri.html#type_siri__ParticipantRefStructure" title="siri:ParticipantRef">siri:ParticipantRef</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="siri.html#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatus">siri:ServiceDeliveryRequestStatus</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Status</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="siri.html#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBody">siri:ServiceDeliveryBody</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MoreData</code></p>
+                    <p class="tableblock"><code>→‍<a shape="rect" href="siri.html#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="siri.html#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDelivery">siri:AbstractServiceDelivery</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="siri.html#type_siri__ExtensionsStructure" title="siri:Extensions">siri:Extensions</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
@@ -14291,7 +14291,7 @@ <h3>7.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_7_1" class="tableblock"><code>complexType[ojp:PlaceResultStructure]</code><br/><code>  /Probability #simpleType</code><br/><code>  (typedef-7.1)</code></p>
+                    <p id="local_type_typedef_4_1" class="tableblock"><code>complexType[ojp:PlaceResultStructure]</code><br/><code>  /Probability #simpleType</code><br/><code>  (typedef-4.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">xs:float: range=[0,1]</p>
@@ -15980,7 +15980,7 @@ <h3>7.19. The complex type <code>PlaceResultStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#local_type_typedef_7_1" title="local-type: typedef-7.1">local-type: typedef-7.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#local_type_typedef_4_1" title="local-type: typedef-4.1">local-type: typedef-4.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Probability, that this result is the one meant by the user's input. Value should be between 0 and 1.</p>
@@ -22077,7 +22077,7 @@ <h3>11.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_3_1" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /HikingProfile #simpleType</code><br/><code>  (typedef-3.1)</code></p>
+                    <p id="local_type_typedef_14_1" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /HikingProfile #simpleType</code><br/><code>  (typedef-14.1)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -22121,7 +22121,7 @@ <h3>11.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_3_2" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /CyclingProfile #simpleType</code><br/><code>  (typedef-3.2)</code></p>
+                    <p id="local_type_typedef_14_2" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /CyclingProfile #simpleType</code><br/><code>  (typedef-14.2)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -22369,7 +22369,7 @@ <h3>11.5. The group <code>MultiPointTripPolicyGroup</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -23410,7 +23410,7 @@ <h3>11.14. The group <code>TripMobilityFilterGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -23424,7 +23424,7 @@ <h3>11.14. The group <code>TripMobilityFilterGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -23476,7 +23476,7 @@ <h3>11.15. The group <code>TripPolicyGroup</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -25663,7 +25663,7 @@ <h3>11.27. The complex type <code>MultiPointTripParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -25677,7 +25677,7 @@ <h3>11.27. The complex type <code>MultiPointTripParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -25701,7 +25701,7 @@ <h3>11.27. The complex type <code>MultiPointTripParamStructure</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -27686,7 +27686,7 @@ <h3>11.39. The complex type <code>TripParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -27700,7 +27700,7 @@ <h3>11.39. The complex type <code>TripParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -27724,7 +27724,7 @@ <h3>11.39. The complex type <code>TripParamStructure</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -28315,7 +28315,7 @@ <h3>11.40. The complex type <code>TripRefineParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -28329,7 +28329,7 @@ <h3>11.40. The complex type <code>TripRefineParamStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -28353,7 +28353,7 @@ <h3>11.40. The complex type <code>TripRefineParamStructure</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -29843,7 +29843,7 @@ <h3>12.4. The group <code>BaseTripPolicyGroup</code></h3>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. MultiPointTripRequests may deliver more results than requested depending on the MultiPointType setting. This means one always must check the results against the parameters before using them.</p>
+                    <p class="tableblock darkbrown">The number of trip results that the user wants to see at least (according to the Transmodel TRIP REQUEST POLICY.maximumNumberofJourneys). Be aware that some implementations will deliver one of the TripResults before the indicated departure time. This means that you can't assume that you get the exact number of results that you indicated in the request from the server.</p>
                   </td>
                 </tr>
                 <tr>
@@ -33489,7 +33489,7 @@ <h3>12.20. The complex type <code>DatedJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -33503,7 +33503,7 @@ <h3>12.20. The complex type <code>DatedJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -33517,7 +33517,7 @@ <h3>12.20. The complex type <code>DatedJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -35156,8 +35156,8 @@ <h3>12.32. The complex type <code>VehiclePositionStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>12.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>12.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35171,7 +35171,7 @@ <h3>12.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -35225,8 +35225,8 @@ <h3>12.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>12.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>12.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35240,7 +35240,7 @@ <h3>12.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -35292,8 +35292,8 @@ <h3>12.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>12.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>12.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35307,7 +35307,7 @@ <h3>12.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -35614,7 +35614,7 @@ <h3>13.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_3_1" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /HikingProfile #simpleType</code><br/><code>  (typedef-3.1)</code></p>
+                    <p id="local_type_typedef_14_1" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /HikingProfile #simpleType</code><br/><code>  (typedef-14.1)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -35658,7 +35658,7 @@ <h3>13.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_3_2" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /CyclingProfile #simpleType</code><br/><code>  (typedef-3.2)</code></p>
+                    <p id="local_type_typedef_14_2" class="tableblock"><code>group[ojp:TripMobilityFilterGroup]</code><br/><code>  /CyclingProfile #simpleType</code><br/><code>  (typedef-14.2)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -36384,7 +36384,7 @@ <h3>13.9. The group <code>PassengerRequirementsGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -36398,7 +36398,7 @@ <h3>13.9. The group <code>PassengerRequirementsGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -37371,7 +37371,7 @@ <h3>13.13. The complex type <code>BookingUserStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_1" title="local-type: typedef-3.1">local-type: typedef-3.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Users hiking profile. The main element to control general walking behaviour is WalkSpeed (together with accessibility constraints). Note: explanations in German can be found here: https://akademie.alpinewelten.com/bergwandern/klassifizierung-von-wanderwegen</p>
@@ -37385,7 +37385,7 @@ <h3>13.13. The complex type <code>BookingUserStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_3_2" title="local-type: typedef-3.2">local-type: typedef-3.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/ojp.enum-dict.html#local_enum.typedef_14_2" title="local-type: typedef-14.2">local-type: typedef-14.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Cycling profile of the user (especially for sportive activities).</p>
@@ -37791,7 +37791,7 @@ <h3>14.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_14_1" class="tableblock"><code>complexType[ojp:EmissionCO2Structure]</code><br/><code>  /KilogramPerPersonKm #simpleType</code><br/><code>  (typedef-14.1)</code></p>
+                    <p id="local_type_typedef_7_1" class="tableblock"><code>complexType[ojp:EmissionCO2Structure]</code><br/><code>  /KilogramPerPersonKm #simpleType</code><br/><code>  (typedef-7.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">xs:float: value&gt;=0</p>
@@ -38617,7 +38617,7 @@ <h3>14.19. The complex type <code>EmissionCO2Structure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#local_type_typedef_14_1" title="local-type: typedef-14.1">local-type: typedef-14.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#local_type_typedef_7_1" title="local-type: typedef-7.1">local-type: typedef-7.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Kilograms of CO2 emission by person and by kilometre.</p>
diff --git a/bugfix/clarification_multipointtyp/documentation-tables/siri.html b/bugfix/clarification_multipointtyp/documentation-tables/siri.html
index 85029200..a0df03dc 100644
--- a/bugfix/clarification_multipointtyp/documentation-tables/siri.html
+++ b/bugfix/clarification_multipointtyp/documentation-tables/siri.html
@@ -1804,7 +1804,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -2065,7 +2065,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -2082,7 +2082,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_86_2" title="local-type: typedef-86.2">local-type: typedef-86.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_58_2" title="local-type: typedef-58.2">local-type: typedef-58.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -2304,7 +2304,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -2670,7 +2670,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -2743,7 +2743,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -2760,7 +2760,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -2903,7 +2903,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -2937,7 +2937,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -3135,7 +3135,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -3395,7 +3395,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -3674,7 +3674,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -3691,7 +3691,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -3867,7 +3867,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -3901,7 +3901,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -4222,7 +4222,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_3" title="local-type: typedef-97.3">local-type: typedef-97.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_3" title="local-type: typedef-103.3">local-type: typedef-103.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for information about ProductionTimetable Service Capabilities. Answered with a ProductionTimetableCapabilitiesResponse.</p>
@@ -5032,7 +5032,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_2" title="local-type: typedef-97.2">local-type: typedef-97.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_2" title="local-type: typedef-103.2">local-type: typedef-103.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for a subscription to the Production Timetable Service.</p>
@@ -5350,7 +5350,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_3" title="local-type: typedef-97.3">local-type: typedef-97.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_3" title="local-type: typedef-103.3">local-type: typedef-103.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for information about ProductionTimetable Service Capabilities. Answered with a ProductionTimetableCapabilitiesResponse.</p>
@@ -5839,7 +5839,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -6246,7 +6246,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -7129,7 +7129,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code></h
                     <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_2" title="local-type: typedef-97.2">local-type: typedef-97.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_2" title="local-type: typedef-103.2">local-type: typedef-103.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for a subscription to the Production Timetable Service.</p>
@@ -7495,7 +7495,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_2" title="local-type: typedef-97.2">local-type: typedef-97.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_2" title="local-type: typedef-103.2">local-type: typedef-103.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for a subscription to the Production Timetable Service.</p>
@@ -7658,8 +7658,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_86_2">
-          <h3>1.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_58_2">
+          <h3>1.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -7673,7 +7673,7 @@ <h3>1.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-86.2)</code></p>
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-58.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
@@ -7858,8 +7858,8 @@ <h3>1.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-88.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-61.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -7873,7 +7873,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-88.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-61.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -7942,8 +7942,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_2">
-          <h3>1.30. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-97.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_1">
+          <h3>1.30. The complex type <code>element[siri:Siri]#complexType (typedef-98.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -7957,214 +7957,392 @@ <h3>1.30. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ProductionTimetableSubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-97.2)</code></p>
+                    <p class="tableblock"><code>element[siri:Siri]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ProductionTimetableSubscriptionStructure" title="siri:ProductionTimetableSubscriptionStructure">siri:ProductionTimetableSubscriptionStructure</a></p>
+                    <p class="tableblock"></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Type for SIRI Service subscriptions.</p>
+                    <p class="tableblock anno-text">-</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
-                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown"></p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriptionIdentityGroup" title="siri:SubscriptionIdentityGroup">siri:SubscriptionIdentityGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriberRef</code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'a', the element contains <em>one</em> of the following elements (aa-ad)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'aa', the element contains <em>one</em> of the following elements (aaa-aac)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceRequestGroup" title="siri:ServiceRequestGroup">siri:ServiceRequestGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>aaa</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ServiceRequest" title="siri:ServiceRequest">siri:ServiceRequest</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Participant identifier of Subscriber. Normally this will be given by context, i.e. be the same as on the Subscription Request.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:SubscriptionIdentifier</strong></code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>aab</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__SubscriptionRequest" title="siri:SubscriptionRequest">siri:SubscriptionRequest</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__SubscriptionQualifierStructure" title="siri:SubscriptionQualifierStructure">siri:SubscriptionQualifierStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier to be given to Subscription.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_58_2" title="local-type: typedef-58.2">local-type: typedef-58.2</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:InitialTerminationTime</strong></code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>aac</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__TerminateSubscriptionRequest" title="siri:TerminateSubscriptionRequest">siri:TerminateSubscriptionRequest</a></strong></code></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Requested end time for subscription.</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__TerminateSubscriptionRequestStructure" title="siri:TerminateSubscriptionRequestStructure">siri:TerminateSubscriptionRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Subscriber to Subscription Manager to terminate a subscription. Answered with a TerminateSubscriptionResponse.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionRenewal</code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'ab', the element contains <em>one</em> of the following elements (aba-abb)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DeliveryRequestGroup" title="siri:DeliveryRequestGroup">siri:DeliveryRequestGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>aba</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReadyNotification" title="siri:DataReadyNotification">siri:DataReadyNotification</a></strong></code></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">By using this element, the subscriber asks the data provider for an extension of the InitialTerminationTime of the subscription. If SubscriptionRenewal is omitted, this request is to be treated as a re-subscription and therefore all data corresponding to the SubscriptionRequest must be sent in the initial response (or a portion of the data if MoreData is set to 'true'). (since SIRI 2.1)</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReadyRequestStructure" title="siri:DataReadyRequestStructure">siri:DataReadyRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Producer to Consumer to notify that data update is ready to fetch. Answered with a DataReadyResponse.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ProductionTimetableRequest" title="siri:ProductionTimetableRequest">siri:ProductionTimetableRequest</a></strong></code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>abb</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataSupplyRequest" title="siri:DataSupplyRequest">siri:DataSupplyRequest</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ProductionTimetableRequestStructure" title="siri:ProductionTimetableRequestStructure">siri:ProductionTimetableRequestStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request for daily production timetables.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataSupplyRequestStructure" title="siri:DataSupplyRequestStructure">siri:DataSupplyRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Consumer to Producer to fetch update previously notified by a Data ready message. Answered with a Service Delivery.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProductionTimetableSubscriptionPolicyGroup" title="siri:ProductionTimetableSubscriptionPolicyGroup">siri:ProductionTimetableSubscriptionPolicyGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:IncrementalUpdates</code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'ac', the element contains <em>one</em> of the following elements (aca-acb)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StatusRequestGroup" title="siri:StatusRequestGroup">siri:StatusRequestGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>aca</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CheckStatusRequest" title="siri:CheckStatusRequest">siri:CheckStatusRequest</a></strong></code></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether the producer should return the complete set of current data, or only provide updates to the last data returned, i.e. additions, modifications and deletions. If false each subscription response will contain the full information as specified in this request.</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CheckStatusRequestStructure" title="siri:CheckStatusRequestStructure">siri:CheckStatusRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Consumer to Producer to check whether services is working. Answers a CheckStatusRequest.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>acb</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__HeartbeatNotification" title="siri:HeartbeatNotification">siri:HeartbeatNotification</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__HeartbeatNotificationStructure" title="siri:HeartbeatNotificationStructure">siri:HeartbeatNotificationStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Notification from Producer to Consumer to indicate that the service is running normally.</p>
                   </td>
                 </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <div class="sect2" id="local_type_typedef_97_3">
-          <h3>1.31. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-97.3)</code></h3>
-          <div class="sectionbody">
-            <table class="tableblock frame-all grid-all spread">
-              <colgroup span="1">
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:23.8095238095238%"/>
-                <col span="1" style="width:35.7142857142857%"/>
-              </colgroup>
-              <tbody>
                 <tr>
-                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ProductionTimetableCapabilitiesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-97.3)</code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'ad', the element contains <em>one</em> of the following elements (ada-adb)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DiscoveryRequestGroup" title="siri:DiscoveryRequestGroup">siri:DiscoveryRequestGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>ada</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceCapabilitiesRequestStructure" title="siri:ServiceCapabilitiesRequestStructure">siri:ServiceCapabilitiesRequestStructure</a></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CapabilitiesRequest" title="siri:CapabilitiesRequest">siri:CapabilitiesRequest</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CapabilitiesRequestStructure" title="siri:CapabilitiesRequestStructure">siri:CapabilitiesRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Requests a the current capabilities of the server. Answred with a CpabailitiesResponse.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
-                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>adb</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractDiscoveryRequest" title="siri:AbstractDiscoveryRequest">siri:AbstractDiscoveryRequest</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractDiscoveryRequestStructure" title="siri:AbstractDiscoveryRequestStructure">siri:AbstractDiscoveryRequestStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Abstract Discovery request.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'b', the element contains <em>one</em> of the following elements (ba-bd)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'ba', the element contains <em>one</em> of the following elements (baa-bab)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceResponseGroup" title="siri:ServiceResponseGroup">siri:ServiceResponseGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>baa</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__SubscriptionResponse" title="siri:SubscriptionResponse">siri:SubscriptionResponse</a></strong></code></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Timestamp on request.</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionResponseStructure" title="siri:SubscriptionResponseStructure">siri:SubscriptionResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Response from Producer to Consumer to inform whether subscriptions have been created. Answers a previous SubscriptionRequest.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ContextualisedRequestEndpointGroup" title="siri:ContextualisedRequestEndpointGroup">siri:ContextualisedRequestEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bab</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__TerminateSubscriptionResponse" title="siri:TerminateSubscriptionResponse">siri:TerminateSubscriptionResponse</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary unique reference to this message.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__TerminateSubscriptionResponseStructure" title="siri:TerminateSubscriptionResponseStructure">siri:TerminateSubscriptionResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Request from Subscriber to Subscription Manager to terminate a subscription. Answered with a TerminateSubscriptionResponse.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'bb', the element contains <em>one</em> of the following elements (bba-bbc)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DeliveryResponseGroup" title="siri:DeliveryResponseGroup">siri:DeliveryResponseGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bba</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReadyAcknowledgement" title="siri:DataReadyAcknowledgement">siri:DataReadyAcknowledgement</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReadyResponseStructure" title="siri:DataReadyResponseStructure">siri:DataReadyResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Response from Consumer to Producer to acknowledge to Producer that a DataReadyRequest has been received.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ParticipantPermissions</code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bbb</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ServiceDelivery" title="siri:ServiceDelivery">siri:ServiceDelivery</a></strong></code></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether to include the requestors permissions in the response. Only applies if Access control capability supported. Default is 'false'.</p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bbc</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReceivedAcknowledgement" title="siri:DataReceivedAcknowledgement">siri:DataReceivedAcknowledgement</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReceivedResponseStructure" title="siri:DataReceivedResponseStructure">siri:DataReceivedResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Response from Consumer to Producer to acknowledge that data hase been received. Used as optioanl extra step if reliable delivery is needed. Answers a ServiceDelivery.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'bc', the element contains <em>one</em> of the following elements (bca)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StatusResponseGroup" title="siri:StatusResponseGroup">siri:StatusResponseGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bca</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CheckStatusResponse" title="siri:CheckStatusResponse">siri:CheckStatusResponse</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CheckStatusResponseStructure" title="siri:CheckStatusResponseStructure">siri:CheckStatusResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Response from Producer to Consumer to inform whether services is working. Answers a CheckStatusRequest.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">In case of choice 'bd', the element contains <em>one</em> of the following elements (bda-bdb)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DiscoveryResponseGroup" title="siri:DiscoveryResponseGroup">siri:DiscoveryResponseGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bda</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CapabilitiesResponse" title="siri:CapabilitiesResponse">siri:CapabilitiesResponse</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CapabilitiesResponseStructure" title="siri:CapabilitiesResponseStructure">siri:CapabilitiesResponseStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Responses with the capabilities of an implementation.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>bdb</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractDiscoveryDelivery" title="siri:AbstractDiscoveryDelivery">siri:AbstractDiscoveryDelivery</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractDiscoveryDeliveryStructure" title="siri:AbstractDiscoveryDeliveryStructure">siri:AbstractDiscoveryDeliveryStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Abstract type for a discovery delivery.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>c</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
@@ -8177,8 +8355,8 @@ <h3>1.31. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_1">
-          <h3>1.32. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-98.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_2">
+          <h3>1.31. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-98.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8192,10 +8370,10 @@ <h3>1.32. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.1)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequestStructure">siri:StopPointsDiscoveryRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -8206,6 +8384,21 @@ <h3>1.32. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContextStructure">siri:ServiceRequestContextStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -8288,151 +8481,40 @@ <h3>1.32. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopicGroup">siri:StopPointsDiscoveryRequestTopicGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>a</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:BoundingBox</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__BoundingBoxStructure" title="siri:BoundingBoxStructure">siri:BoundingBoxStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>b</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Circle</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LocationStructure" title="siri:LocationStructure">siri:LocationStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>c</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:PlaceRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:OperatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__OperatorRefStructure" title="siri:OperatorRefStructure">siri:OperatorRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:LineRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__LineRefStructure" title="siri:LineRefStructure">siri:LineRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicyGroup">siri:StopPointsDiscoveryRequestPolicyGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Language</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_2">
-          <h3>1.33. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-98.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_3">
+          <h3>1.32. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-98.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8446,10 +8528,10 @@ <h3>1.33. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequestStructure">siri:ServiceFeaturesDiscoveryRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -8542,41 +8624,97 @@ <h3>1.33. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpointGroup">siri:SubscriberEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContextStructure">siri:SubscriptionContextStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscriptionStructure">siri:AbstractSubscriptionStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_1">
-          <h3>1.34. The complex type <code>element[siri:Siri]#complexType (typedef-104.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_4">
+          <h3>1.33. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-98.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -8590,392 +8728,415 @@ <h3>1.34. The complex type <code>element[siri:Siri]#complexType (typedef-104.1)<
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:Siri]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.1)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">-</p>
+                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
+                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown"></p>
+                    <p class="tableblock darkbrown">Time individual response element was created.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpointGroup">siri:ProducerResponseEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ProducerRef</code></p>
                   </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'a', the element contains <em>one</em> of the following elements (aa-ad)</p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'aa', the element contains <em>one</em> of the following elements (aaa-aac)</p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceRequestGroup" title="siri:ServiceRequestGroup">siri:ServiceRequestGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>aaa</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ServiceRequest" title="siri:ServiceRequest">siri:ServiceRequest</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Address</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
+                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>aab</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__SubscriptionRequest" title="siri:SubscriptionRequest">siri:SubscriptionRequest</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_86_2" title="local-type: typedef-86.2">local-type: typedef-86.2</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
+                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>aac</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__TerminateSubscriptionRequest" title="siri:TerminateSubscriptionRequest">siri:TerminateSubscriptionRequest</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__TerminateSubscriptionRequestStructure" title="siri:TerminateSubscriptionRequestStructure">siri:TerminateSubscriptionRequestStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageRefStructure" title="siri:MessageRefStructure">siri:MessageRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Subscriber to Subscription Manager to terminate a subscription. Answered with a TerminateSubscriptionResponse.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'ab', the element contains <em>one</em> of the following elements (aba-abb)</p>
+                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DeliveryRequestGroup" title="siri:DeliveryRequestGroup">siri:DeliveryRequestGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>aba</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReadyNotification" title="siri:DataReadyNotification">siri:DataReadyNotification</a></strong></code></p>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReadyRequestStructure" title="siri:DataReadyRequestStructure">siri:DataReadyRequestStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Producer to Consumer to notify that data update is ready to fetch. Answered with a DataReadyResponse.</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>abb</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataSupplyRequest" title="siri:DataSupplyRequest">siri:DataSupplyRequest</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataSupplyRequestStructure" title="siri:DataSupplyRequestStructure">siri:DataSupplyRequestStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Consumer to Producer to fetch update previously notified by a Data ready message. Answered with a Service Delivery.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'ac', the element contains <em>one</em> of the following elements (aca-acb)</p>
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StatusRequestGroup" title="siri:StatusRequestGroup">siri:StatusRequestGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>aca</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CheckStatusRequest" title="siri:CheckStatusRequest">siri:CheckStatusRequest</a></strong></code></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CheckStatusRequestStructure" title="siri:CheckStatusRequestStructure">siri:CheckStatusRequestStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Consumer to Producer to check whether services is working. Answers a CheckStatusRequest.</p>
+                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>acb</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__HeartbeatNotification" title="siri:HeartbeatNotification">siri:HeartbeatNotification</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatusGroup">siri:ServiceDeliveryRequestStatusGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Status</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__HeartbeatNotificationStructure" title="siri:HeartbeatNotificationStructure">siri:HeartbeatNotificationStructure</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Notification from Producer to Consumer to indicate that the service is running normally.</p>
+                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'ad', the element contains <em>one</em> of the following elements (ada-adb)</p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
                   </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DiscoveryRequestGroup" title="siri:DiscoveryRequestGroup">siri:DiscoveryRequestGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>ada</em></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CapabilitiesRequest" title="siri:CapabilitiesRequest">siri:CapabilitiesRequest</a></strong></code></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:MoreData</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CapabilitiesRequestStructure" title="siri:CapabilitiesRequestStructure">siri:CapabilitiesRequestStructure</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Requests a the current capabilities of the server. Answred with a CpabailitiesResponse.</p>
+                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>adb</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractDiscoveryRequest" title="siri:AbstractDiscoveryRequest">siri:AbstractDiscoveryRequest</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractDiscoveryRequestStructure" title="siri:AbstractDiscoveryRequestStructure">siri:AbstractDiscoveryRequestStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDeliveryStructure">siri:AbstractServiceDeliveryStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Abstract Discovery request.</p>
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
                   </td>
                 </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="sect2" id="local_type_typedef_103_2">
+          <h3>1.34. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-103.2)</code></h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'b', the element contains <em>one</em> of the following elements (ba-bd)</p>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>element[siri:ProductionTimetableSubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.2)</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ProductionTimetableSubscriptionStructure" title="siri:ProductionTimetableSubscriptionStructure">siri:ProductionTimetableSubscriptionStructure</a></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock anno-text">Type for SIRI Service subscriptions.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'ba', the element contains <em>one</em> of the following elements (baa-bab)</p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
+                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceResponseGroup" title="siri:ServiceResponseGroup">siri:ServiceResponseGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>baa</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__SubscriptionResponse" title="siri:SubscriptionResponse">siri:SubscriptionResponse</a></strong></code></p>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriptionIdentityGroup" title="siri:SubscriptionIdentityGroup">siri:SubscriptionIdentityGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:SubscriberRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionResponseStructure" title="siri:SubscriptionResponseStructure">siri:SubscriptionResponseStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Response from Producer to Consumer to inform whether subscriptions have been created. Answers a previous SubscriptionRequest.</p>
+                    <p class="tableblock darkbrown">Participant identifier of Subscriber. Normally this will be given by context, i.e. be the same as on the Subscription Request.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bab</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__TerminateSubscriptionResponse" title="siri:TerminateSubscriptionResponse">siri:TerminateSubscriptionResponse</a></strong></code></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>siri:SubscriptionIdentifier</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__TerminateSubscriptionResponseStructure" title="siri:TerminateSubscriptionResponseStructure">siri:TerminateSubscriptionResponseStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__SubscriptionQualifierStructure" title="siri:SubscriptionQualifierStructure">siri:SubscriptionQualifierStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Request from Subscriber to Subscription Manager to terminate a subscription. Answered with a TerminateSubscriptionResponse.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'bb', the element contains <em>one</em> of the following elements (bba-bbc)</p>
+                    <p class="tableblock darkbrown">Identifier to be given to Subscription.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DeliveryResponseGroup" title="siri:DeliveryResponseGroup">siri:DeliveryResponseGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bba</em></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>siri:InitialTerminationTime</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReadyAcknowledgement" title="siri:DataReadyAcknowledgement">siri:DataReadyAcknowledgement</a></strong></code></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock darkbrown">Requested end time for subscription.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:SubscriptionRenewal</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReadyResponseStructure" title="siri:DataReadyResponseStructure">siri:DataReadyResponseStructure</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Response from Consumer to Producer to acknowledge to Producer that a DataReadyRequest has been received.</p>
+                    <p class="tableblock darkbrown">By using this element, the subscriber asks the data provider for an extension of the InitialTerminationTime of the subscription. If SubscriptionRenewal is omitted, this request is to be treated as a re-subscription and therefore all data corresponding to the SubscriptionRequest must be sent in the initial response (or a portion of the data if MoreData is set to 'true'). (since SIRI 2.1)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bbb</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ServiceDelivery" title="siri:ServiceDelivery">siri:ServiceDelivery</a></strong></code></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ProductionTimetableRequest" title="siri:ProductionTimetableRequest">siri:ProductionTimetableRequest</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ProductionTimetableRequestStructure" title="siri:ProductionTimetableRequestStructure">siri:ProductionTimetableRequestStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
+                    <p class="tableblock darkbrown">Request for daily production timetables.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bbc</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__DataReceivedAcknowledgement" title="siri:DataReceivedAcknowledgement">siri:DataReceivedAcknowledgement</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProductionTimetableSubscriptionPolicyGroup" title="siri:ProductionTimetableSubscriptionPolicyGroup">siri:ProductionTimetableSubscriptionPolicyGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:IncrementalUpdates</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__DataReceivedResponseStructure" title="siri:DataReceivedResponseStructure">siri:DataReceivedResponseStructure</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Response from Consumer to Producer to acknowledge that data hase been received. Used as optioanl extra step if reliable delivery is needed. Answers a ServiceDelivery.</p>
+                    <p class="tableblock darkbrown">Whether the producer should return the complete set of current data, or only provide updates to the last data returned, i.e. additions, modifications and deletions. If false each subscription response will contain the full information as specified in this request.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'bc', the element contains <em>one</em> of the following elements (bca)</p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StatusResponseGroup" title="siri:StatusResponseGroup">siri:StatusResponseGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bca</em></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CheckStatusResponse" title="siri:CheckStatusResponse">siri:CheckStatusResponse</a></strong></code></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="sect2" id="local_type_typedef_103_3">
+          <h3>1.35. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-103.3)</code></h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
+                <tr>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>element[siri:ProductionTimetableCapabilitiesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CheckStatusResponseStructure" title="siri:CheckStatusResponseStructure">siri:CheckStatusResponseStructure</a></em></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceCapabilitiesRequestStructure" title="siri:ServiceCapabilitiesRequestStructure">siri:ServiceCapabilitiesRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Response from Producer to Consumer to inform whether services is working. Answers a CheckStatusRequest.</p>
+                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">In case of choice 'bd', the element contains <em>one</em> of the following elements (bda-bdb)</p>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
+                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DiscoveryResponseGroup" title="siri:DiscoveryResponseGroup">siri:DiscoveryResponseGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bda</em></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__CapabilitiesResponse" title="siri:CapabilitiesResponse">siri:CapabilitiesResponse</a></strong></code></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock darkbrown">Timestamp on request.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ContextualisedRequestEndpointGroup" title="siri:ContextualisedRequestEndpointGroup">siri:ContextualisedRequestEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__CapabilitiesResponseStructure" title="siri:CapabilitiesResponseStructure">siri:CapabilitiesResponseStructure</a></em></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Responses with the capabilities of an implementation.</p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Arbitrary unique reference to this message.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>bdb</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractDiscoveryDelivery" title="siri:AbstractDiscoveryDelivery">siri:AbstractDiscoveryDelivery</a></strong></code></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractDiscoveryDeliveryStructure" title="siri:AbstractDiscoveryDeliveryStructure">siri:AbstractDiscoveryDeliveryStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Abstract type for a discovery delivery.</p>
+                    <p class="tableblock darkbrown">Version number of request. Fixed.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>c</em></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ParticipantPermissions</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Whether to include the requestors permissions in the response. Only applies if Access control capability supported. Default is 'false'.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
@@ -8988,8 +9149,8 @@ <h3>1.34. The complex type <code>element[siri:Siri]#complexType (typedef-104.1)<
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_2">
-          <h3>1.35. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-104.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_1">
+          <h3>1.36. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-104.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -9003,10 +9164,10 @@ <h3>1.35. The complex type <code>element[siri:ServiceRequest]#complexType (typed
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
+                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequestStructure">siri:StopPointsDiscoveryRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -9017,21 +9178,6 @@ <h3>1.35. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContextStructure">siri:ServiceRequestContextStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
-                  </td>
-                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -9114,40 +9260,151 @@ <h3>1.35. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopicGroup">siri:StopPointsDiscoveryRequestTopicGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>a</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:BoundingBox</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__BoundingBoxStructure" title="siri:BoundingBoxStructure">siri:BoundingBoxStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>b</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Circle</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LocationStructure" title="siri:LocationStructure">siri:LocationStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>c</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:PlaceRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:OperatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__OperatorRefStructure" title="siri:OperatorRefStructure">siri:OperatorRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                    <p class="tableblock"><code>siri:LineRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__LineRefStructure" title="siri:LineRefStructure">siri:LineRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicyGroup">siri:StopPointsDiscoveryRequestPolicyGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Language</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-104.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_2">
+          <h3>1.37. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-104.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -9161,10 +9418,10 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequestStructure">siri:ServiceFeaturesDiscoveryRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -9256,291 +9513,34 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                     <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpointGroup">siri:SubscriberEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
-                  </td>
-                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContextStructure">siri:SubscriptionContextStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscriptionStructure">siri:AbstractSubscriptionStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <div class="sect2" id="local_type_typedef_104_4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-104.4)</code></h3>
-          <div class="sectionbody">
-            <table class="tableblock frame-all grid-all spread">
-              <colgroup span="1">
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:23.8095238095238%"/>
-                <col span="1" style="width:35.7142857142857%"/>
-              </colgroup>
-              <tbody>
-                <tr>
-                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.4)</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top announceBase">
-                    <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Time individual response element was created.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpointGroup">siri:ProducerResponseEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ProducerRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Address</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageRefStructure" title="siri:MessageRefStructure">siri:MessageRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatusGroup">siri:ServiceDeliveryRequestStatusGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Status</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MoreData</code></p>
+                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDeliveryStructure">siri:AbstractServiceDeliveryStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
@@ -9770,7 +9770,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -10243,7 +10243,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -10452,7 +10452,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -10469,7 +10469,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -10719,7 +10719,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -10854,7 +10854,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -10932,7 +10932,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -10949,7 +10949,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -11434,7 +11434,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -11841,7 +11841,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -12301,7 +12301,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -12318,7 +12318,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_3" title="local-type: typedef-104.3">local-type: typedef-104.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_3" title="local-type: typedef-98.3">local-type: typedef-98.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -12461,7 +12461,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -12495,7 +12495,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -12665,7 +12665,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -13103,8 +13103,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_86_1">
-          <h3>2.21. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_58_1">
+          <h3>2.21. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-58.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -13118,7 +13118,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceRequest]#complexType (typed
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-86.1)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-58.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
@@ -13281,8 +13281,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_86_2">
-          <h3>2.22. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_58_2">
+          <h3>2.22. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -13296,7 +13296,7 @@ <h3>2.22. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-86.2)</code></p>
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-58.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
@@ -13481,8 +13481,8 @@ <h3>2.22. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_86_3">
-          <h3>2.23. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_58_3">
+          <h3>2.23. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-58.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -13496,7 +13496,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceDelivery]#complexType (type
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-86.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-58.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
@@ -13645,7 +13645,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -13682,8 +13682,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_1">
-          <h3>2.24. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-88.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_1">
+          <h3>2.24. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-61.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -13697,7 +13697,7 @@ <h3>2.24. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-88.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-61.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -13766,8 +13766,8 @@ <h3>2.24. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_1">
-          <h3>2.25. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-98.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_2">
+          <h3>2.25. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-98.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -13781,10 +13781,10 @@ <h3>2.25. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.1)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequestStructure">siri:StopPointsDiscoveryRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -13795,6 +13795,21 @@ <h3>2.25. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                     <p class="tableblock">The element content starts with <b>items inherited</b> from the base type:</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContextStructure">siri:ServiceRequestContextStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -13877,151 +13892,40 @@ <h3>2.25. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopicGroup">siri:StopPointsDiscoveryRequestTopicGroup</a></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>a</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:BoundingBox</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__BoundingBoxStructure" title="siri:BoundingBoxStructure">siri:BoundingBoxStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>b</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Circle</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LocationStructure" title="siri:LocationStructure">siri:LocationStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>c</em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:PlaceRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:OperatorRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__OperatorRefStructure" title="siri:OperatorRefStructure">siri:OperatorRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:LineRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__LineRefStructure" title="siri:LineRefStructure">siri:LineRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicyGroup">siri:StopPointsDiscoveryRequestPolicyGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Language</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
-                  </td>
-                </tr>
-                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_2">
-          <h3>2.26. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-98.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_3">
+          <h3>2.26. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-98.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -14035,10 +13939,10 @@ <h3>2.26. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequestStructure">siri:ServiceFeaturesDiscoveryRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -14131,41 +14035,97 @@ <h3>2.26. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@version</strong></code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpointGroup">siri:SubscriberEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
+                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContextStructure">siri:SubscriptionContextStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
+                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscriptionStructure">siri:AbstractSubscriptionStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-104.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_4">
+          <h3>2.27. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-98.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -14179,13 +14139,13 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
+                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
                   </td>
                 </tr>
                 <tr>
@@ -14196,60 +14156,77 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ServiceRequestContext</code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Time individual response element was created.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpointGroup">siri:ProducerResponseEndpointGroup</a></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ProducerRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ServiceRequestContextStructure" title="siri:ServiceRequestContextStructure">siri:ServiceRequestContextStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General request properties - typically configured rather than repeated on request.</p>
+                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
+                    <p class="tableblock"><code>siri:Address</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Timestamp on request.</p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__AuthenticatedRequestGroup" title="siri:AuthenticatedRequestGroup">siri:AuthenticatedRequestGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:AccountId</code></p>
+                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Account Identifier. May be used to attribute requests to a particular application provider and authentication key. The account may be common to all users of an application, or to an individual user. Note that to identify an individual user the RequestorRef can be used with an anonymised token. . (since SIRI 2.0)</p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:AccountKey</code></p>
+                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Authentication key for request. May be used to authenticate requests from a particular account. (since SIRI 2.0)</p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageRefStructure" title="siri:MessageRefStructure">siri:MessageRefStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__RequestorEndpointGroup" title="siri:RequestorEndpointGroup">siri:RequestorEndpointGroup</a></td>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Address</code></p>
+                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
@@ -14258,72 +14235,98 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                     <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data.</p>
+                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestorRef" title="siri:RequestorRef">siri:RequestorRef</a></strong></code></p>
+                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a requestor - Participant Code.</p>
+                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
+                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
+                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatusGroup">siri:ServiceDeliveryRequestStatusGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
+                    <p class="tableblock"><code>siri:Status</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                    <p class="tableblock"><code>siri:MoreData</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDeliveryStructure">siri:AbstractServiceDeliveryStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-104.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_1">
+          <h3>2.28. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-104.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -14337,10 +14340,10 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.3)</code></p>
+                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequestStructure">siri:StopPointsDiscoveryRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">Type for General SIRI Request.</p>
@@ -14433,97 +14436,151 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-c)</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="5" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestTopicGroup" title="siri:StopPointsDiscoveryRequestTopicGroup">siri:StopPointsDiscoveryRequestTopicGroup</a></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>a</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:BoundingBox</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__BoundingBoxStructure" title="siri:BoundingBoxStructure">siri:BoundingBoxStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Rectangle containing stops be returned. ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>b</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:Circle</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LocationStructure" title="siri:LocationStructure">siri:LocationStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Circle containing stops be returned. Point indicates centre, precision indicates radius ((since SIRI 2.0))</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>c</em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>siri:PlaceRef</code></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Filter the results to include only stops associated with the PLACE . ((since SIRI 2.0))</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                    <p class="tableblock"><code>siri:OperatorRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__OperatorRefStructure" title="siri:OperatorRefStructure">siri:OperatorRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops run by the specified OPERATOR. ((since SIRI 2.0))</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__SubscriberEndpointGroup" title="siri:SubscriberEndpointGroup">siri:SubscriberEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ConsumerAddress</code></p>
+                    <p class="tableblock"><code>siri:LineRef</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__LineRefStructure" title="siri:LineRefStructure">siri:LineRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address to which data is to be sent, if different from Address. This may also be determined from RequestorRef and preconfigured data.</p>
+                    <p class="tableblock darkbrown">Filter the results to include only stops for the given LINE. ((since SIRI 2.0))</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__StopPointsDiscoveryRequestPolicyGroup" title="siri:StopPointsDiscoveryRequestPolicyGroup">siri:StopPointsDiscoveryRequestPolicyGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionFilterIdentifier</code></p>
+                    <p class="tableblock"><code>siri:Language</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to a Subscription Filter with which this subscription is to be aggregated for purposes of notification and delivery. If absent, use the default filter. If present, use any existing filter with that identifier, if none found, create a new one. Optional SIRI feature.</p>
+                    <p class="tableblock darkbrown">Preferred languages in which to return text values. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:SubscriptionContext</code></p>
+                    <p class="tableblock"><code>siri:StopPointsDetailLevel</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__SubscriptionContextStructure" title="siri:SubscriptionContextStructure">siri:SubscriptionContextStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__StopPointsDetailEnumeration" title="siri:StopPointsDetailEnumeration">siri:StopPointsDetailEnumeration</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">General values that apply to subscription. Usually set by configuration.</p>
+                    <p class="tableblock darkbrown">Level of detail to include in response. Default is 'normal'. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceSubscriptionRequest" title="siri:AbstractFunctionalServiceSubscriptionRequest">siri:AbstractFunctionalServiceSubscriptionRequest</a></strong></code></p>
+                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                    <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractSubscriptionStructure" title="siri:AbstractSubscriptionStructure">siri:AbstractSubscriptionStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service subscription request.</p>
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-104.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_2">
+          <h3>2.29. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-104.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -14537,13 +14594,13 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.4)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
+                    <p class="tableblock"><a shape="rect" href="#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequestStructure">siri:ServiceFeaturesDiscoveryRequestStructure</a></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">General Type for General SIRI Response.</p>
+                    <p class="tableblock anno-text">Type for General SIRI Request.</p>
                   </td>
                 </tr>
                 <tr>
@@ -14554,169 +14611,112 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__ResponseTimestamp" title="siri:ResponseTimestamp">siri:ResponseTimestamp</a></strong></code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestTimestamp" title="siri:RequestTimestamp">siri:RequestTimestamp</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Time individual response element was created.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="4" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ProducerResponseEndpointGroup" title="siri:ProducerResponseEndpointGroup">siri:ProducerResponseEndpointGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ProducerRef</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Unique identifier of Producer - Participant reference.</p>
+                    <p class="tableblock darkbrown">Timestamp on request.</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__AuthenticatedRequestGroup" title="siri:AuthenticatedRequestGroup">siri:AuthenticatedRequestGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Address</code></p>
+                    <p class="tableblock"><code>siri:AccountId</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Endpoint Address to which acknowledgements to confirm delivery are to be sent.</p>
+                    <p class="tableblock darkbrown">Account Identifier. May be used to attribute requests to a particular application provider and authentication key. The account may be common to all users of an application, or to an individual user. Note that to identify an individual user the RequestorRef can be used with an anonymised token. . (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ResponseMessageIdentifier</code></p>
+                    <p class="tableblock"><code>siri:AccountKey</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">An arbitrary unique reference associated with the response which may be used to reference it.</p>
+                    <p class="tableblock darkbrown">Authentication key for request. May be used to authenticate requests from a particular account. (since SIRI 2.0)</p>
                   </td>
                 </tr>
                 <tr>
+                  <td colspan="1" rowspan="3" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__RequestorEndpointGroup" title="siri:RequestorEndpointGroup">siri:RequestorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:RequestMessageRef</code></p>
+                    <p class="tableblock"><code>siri:Address</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageRefStructure" title="siri:MessageRefStructure">siri:MessageRefStructure</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Reference to an arbitrary unique identifier associated with the request which gave rise to this response.</p>
+                    <p class="tableblock darkbrown">Address to which response is to be sent. This may also be determined from RequestorRef and preconfigured data.</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__DelegatorEndpointGroup" title="siri:DelegatorEndpointGroup">siri:DelegatorEndpointGroup</a></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorAddress</code></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__RequestorRef" title="siri:RequestorRef">siri:RequestorRef</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
+                    <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__EndpointAddress" title="siri:EndpointAddress">siri:EndpointAddress</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Address of original Consumer, i.e. requesting system to which delegating response is to be returned. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Reference to a requestor - Participant Code.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:DelegatorRef</code></p>
+                    <p class="tableblock"><code>siri:MessageIdentifier</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__ParticipantRefStructure" title="siri:ParticipantRefStructure">siri:ParticipantRefStructure</a></em></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__MessageQualifierStructure" title="siri:MessageQualifierStructure">siri:MessageQualifierStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Identifier of delegating system that originated message. (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Arbitrary unique identifier that can be used to reference this message in subsequent interactions.</p>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>@srsName</strong></code></p>
+                    <p class="tableblock"><code><strong>@version</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="#type_siri__SrsNameType" title="siri:SrsNameType">siri:SrsNameType</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="#type_siri__VersionString" title="siri:VersionString">siri:VersionString</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Default gml coordinate format for eny location elements in response; applies if Coordinates element is used to specify points. May be overridden on individual points.</p>
+                    <p class="tableblock darkbrown">Version number of request. Fixed</p>
                   </td>
                 </tr>
                 <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryRequestStatusGroup" title="siri:ServiceDeliveryRequestStatusGroup">siri:ServiceDeliveryRequestStatusGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:Status</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether the complerte request could be processed successfully or not. Default is 'true'. If any of the individual requests within the delivery failed, should be set to ' false'.</p>
-                  </td>
-                </tr>
-                <tr>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:ErrorCondition</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><span title="optional, single">0:1</span></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="2" class="tableblock halign-left valign-top"><a shape="rect" href="#group_siri__ServiceDeliveryBodyGroup" title="siri:ServiceDeliveryBodyGroup">siri:ServiceDeliveryBodyGroup</a></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>siri:MoreData</code></p>
+                    <p class="tableblock"><code>→‍<a shape="rect" href="#element_siri__Extensions" title="siri:Extensions">siri:Extensions</a></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Whether there is a further delvery message with more current updates that follows this one. Default is 'false'.</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AbstractFunctionalServiceDelivery" title="siri:AbstractFunctionalServiceDelivery">siri:AbstractFunctionalServiceDelivery</a></strong></code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__AbstractServiceDeliveryStructure" title="siri:AbstractServiceDeliveryStructure">siri:AbstractServiceDeliveryStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__ExtensionsStructure" title="siri:ExtensionsStructure">siri:ExtensionsStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Subsititutable type for a SIRI Functional Service request.</p>
+                    <p class="tableblock darkbrown">Extensions to schema. (Wrapper tag used to avoid problems with handling of optional 'any' by some validators).</p>
                   </td>
                 </tr>
               </tbody>
@@ -15205,7 +15205,7 @@ <h3>3.14. The group <code>siri:CheckStatusPayloadGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_4" title="local-type: typedef-87.4">local-type: typedef-87.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_4" title="local-type: typedef-62.4">local-type: typedef-62.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition that applies to the status check.</p>
@@ -15385,7 +15385,7 @@ <h3>3.16. The group <code>siri:DataReceivedPayloadGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_3" title="local-type: typedef-87.3">local-type: typedef-87.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_3" title="local-type: typedef-62.3">local-type: typedef-62.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition.</p>
@@ -16879,7 +16879,7 @@ <h3>3.35. The complex type <code>siri:CheckStatusResponseBodyStructure</code></h
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_4" title="local-type: typedef-87.4">local-type: typedef-87.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_4" title="local-type: typedef-62.4">local-type: typedef-62.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition that applies to the status check.</p>
@@ -17095,7 +17095,7 @@ <h3>3.36. The complex type <code>siri:CheckStatusResponseStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_4" title="local-type: typedef-87.4">local-type: typedef-87.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_4" title="local-type: typedef-62.4">local-type: typedef-62.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition that applies to the status check.</p>
@@ -17676,7 +17676,7 @@ <h3>3.40. The complex type <code>siri:DataReadyResponseStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_2" title="local-type: typedef-87.2">local-type: typedef-87.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_2" title="local-type: typedef-62.2">local-type: typedef-62.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition as to why Consumer cannot fetch data.</p>
@@ -17812,7 +17812,7 @@ <h3>3.41. The complex type <code>siri:DataReceivedResponseStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_3" title="local-type: typedef-87.3">local-type: typedef-87.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_3" title="local-type: typedef-62.3">local-type: typedef-62.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition.</p>
@@ -18229,7 +18229,7 @@ <h3>3.44. The complex type <code>siri:HeartbeatNotificationStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_4" title="local-type: typedef-87.4">local-type: typedef-87.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_4" title="local-type: typedef-62.4">local-type: typedef-62.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition that applies to the status check.</p>
@@ -19811,7 +19811,7 @@ <h3>3.53. The complex type <code>siri:TerminationResponseStatusStructure</code><
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_87_1" title="local-type: typedef-87.1">local-type: typedef-87.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_62_1" title="local-type: typedef-62.1">local-type: typedef-62.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning condition.</p>
@@ -19821,8 +19821,8 @@ <h3>3.53. The complex type <code>siri:TerminationResponseStatusStructure</code><
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_87_1">
-          <h3>3.54. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-87.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_62_1">
+          <h3>3.54. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-62.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -19836,7 +19836,7 @@ <h3>3.54. The complex type <code>complexType[siri:TerminationResponseStatusStruc
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:TerminationResponseStatusStructure]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-87.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:TerminationResponseStatusStructure]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-62.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -19941,8 +19941,8 @@ <h3>3.54. The complex type <code>complexType[siri:TerminationResponseStatusStruc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_87_2">
-          <h3>3.55. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-87.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_62_2">
+          <h3>3.55. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-62.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -19956,7 +19956,7 @@ <h3>3.55. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:DataReadyResponseStructure]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-87.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:DataReadyResponseStructure]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-62.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -20025,8 +20025,8 @@ <h3>3.55. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_87_3">
-          <h3>3.56. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-87.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_62_3">
+          <h3>3.56. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-62.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -20040,7 +20040,7 @@ <h3>3.56. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DataReceivedPayloadGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-87.3)</code></p>
+                    <p class="tableblock"><code>group[siri:DataReceivedPayloadGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-62.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -20109,8 +20109,8 @@ <h3>3.56. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_87_4">
-          <h3>3.57. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-87.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_62_4">
+          <h3>3.57. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-62.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -20124,7 +20124,7 @@ <h3>3.57. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:CheckStatusPayloadGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-87.4)</code></p>
+                    <p class="tableblock"><code>group[siri:CheckStatusPayloadGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-62.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -25538,7 +25538,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>
@@ -27355,7 +27355,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_2" title="local-type: typedef-88.2">local-type: typedef-88.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_2" title="local-type: typedef-61.2">local-type: typedef-61.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Interaction capabilities.</p>
@@ -27370,7 +27370,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_3" title="local-type: typedef-88.3">local-type: typedef-88.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_3" title="local-type: typedef-61.3">local-type: typedef-61.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Delivery capabilities.</p>
@@ -28766,8 +28766,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-88.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-61.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -28781,7 +28781,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-88.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-61.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -28850,8 +28850,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-88.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-61.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -28865,7 +28865,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:CapabilityGeneralInteractionStructure]</code><br/><code>  /Interaction #complexType</code><br/><code>  (typedef-88.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:CapabilityGeneralInteractionStructure]</code><br/><code>  /Interaction #complexType</code><br/><code>  (typedef-61.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -28904,8 +28904,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-88.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-61.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -28919,7 +28919,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:CapabilityGeneralInteractionStructure]</code><br/><code>  /Delivery #complexType</code><br/><code>  (typedef-88.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:CapabilityGeneralInteractionStructure]</code><br/><code>  /Delivery #complexType</code><br/><code>  (typedef-61.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -30512,7 +30512,7 @@ <h3>7.23. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_95_3" title="local-type: typedef-95.3">local-type: typedef-95.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_3" title="local-type: typedef-92.3">local-type: typedef-92.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participants permissions to use the service.</p>
@@ -31576,7 +31576,7 @@ <h3>7.29. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_95_1" title="local-type: typedef-95.1">local-type: typedef-95.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_1" title="local-type: typedef-92.1">local-type: typedef-92.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -31591,7 +31591,7 @@ <h3>7.29. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_95_2" title="local-type: typedef-95.2">local-type: typedef-95.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_2" title="local-type: typedef-92.2">local-type: typedef-92.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -33015,8 +33015,8 @@ <h3>7.35. The complex type <code>siri:WaitProlongedDepartureStructure</code></h3
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_95_1">
-          <h3>7.36. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-95.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_92_1">
+          <h3>7.36. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-92.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -33030,7 +33030,7 @@ <h3>7.36. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-95.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-92.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -33097,8 +33097,8 @@ <h3>7.36. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_95_2">
-          <h3>7.37. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-95.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_92_2">
+          <h3>7.37. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-92.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -33112,7 +33112,7 @@ <h3>7.37. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-95.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-92.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -33215,8 +33215,8 @@ <h3>7.37. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_95_3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-95.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_92_3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-92.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -33230,7 +33230,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ConnectionMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-95.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ConnectionMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-92.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -34267,7 +34267,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_1" title="local-type: typedef-93.1">local-type: typedef-93.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_1" title="local-type: typedef-91.1">local-type: typedef-91.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service, Only returned if requested.</p>
@@ -34985,7 +34985,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_2" title="local-type: typedef-93.2">local-type: typedef-93.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_2" title="local-type: typedef-91.2">local-type: typedef-91.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -35000,7 +35000,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_3" title="local-type: typedef-93.3">local-type: typedef-93.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_3" title="local-type: typedef-91.3">local-type: typedef-91.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -35761,8 +35761,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code></h
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_93_1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-93.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_91_1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-91.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35776,7 +35776,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]</code><br/><code>  /ConnectionTimetablePermissions #complexType</code><br/><code>  (typedef-93.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]</code><br/><code>  /ConnectionTimetablePermissions #complexType</code><br/><code>  (typedef-91.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -35829,8 +35829,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_93_2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-93.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_91_2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-91.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35844,7 +35844,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-93.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-91.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -35883,8 +35883,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_93_3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-93.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_91_3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-91.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -35898,7 +35898,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-93.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-91.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -37568,7 +37568,7 @@ <h3>9.25. The group <code>siri:SiriDiscoveryIndexGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -37602,7 +37602,7 @@ <h3>9.25. The group <code>siri:SiriDiscoveryIndexGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -38050,7 +38050,7 @@ <h3>9.27. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_1" title="local-type: typedef-98.1">local-type: typedef-98.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_1" title="local-type: typedef-104.1">local-type: typedef-104.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the STOP POINTs and places covered by a Producer.</p>
@@ -38084,7 +38084,7 @@ <h3>9.27. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Requests a list of the Service Features covered by a Producer.</p>
@@ -41225,8 +41225,8 @@ <h3>9.46. The complex type <code>siri:VehicleFeaturesRequestStructure</code></h3
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_1">
-          <h3>9.47. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-98.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_1">
+          <h3>9.47. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-104.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -41240,7 +41240,7 @@ <h3>9.47. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.1)</code></p>
+                    <p class="tableblock"><code>element[siri:StopPointsRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__StopPointsDiscoveryRequestStructure" title="siri:StopPointsDiscoveryRequestStructure">siri:StopPointsDiscoveryRequestStructure</a></p>
@@ -41479,8 +41479,8 @@ <h3>9.47. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_98_2">
-          <h3>9.48. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-98.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_104_2">
+          <h3>9.48. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-104.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -41494,7 +41494,7 @@ <h3>9.48. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceFeaturesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceFeaturesDiscoveryRequestStructure" title="siri:ServiceFeaturesDiscoveryRequestStructure">siri:ServiceFeaturesDiscoveryRequestStructure</a></p>
@@ -42250,7 +42250,7 @@ <h3>10.12. The group <code>siri:EstimatedTimetableTopicGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_1" title="local-type: typedef-99.1">local-type: typedef-99.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_102_1" title="local-type: typedef-102.1">local-type: typedef-102.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only VEHICLEs along the given LINEs.</p>
@@ -42558,7 +42558,7 @@ <h3>10.14. The complex type <code>siri:EstimatedTimetableCapabilitiesResponseStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_4" title="local-type: typedef-99.4">local-type: typedef-99.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_102_4" title="local-type: typedef-102.4">local-type: typedef-102.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -43138,7 +43138,7 @@ <h3>10.18. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_1" title="local-type: typedef-99.1">local-type: typedef-99.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_102_1" title="local-type: typedef-102.1">local-type: typedef-102.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only VEHICLEs along the given LINEs.</p>
@@ -43353,7 +43353,7 @@ <h3>10.19. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_2" title="local-type: typedef-99.2">local-type: typedef-99.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_102_2" title="local-type: typedef-102.2">local-type: typedef-102.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -43368,7 +43368,7 @@ <h3>10.19. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_3" title="local-type: typedef-99.3">local-type: typedef-99.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_102_3" title="local-type: typedef-102.3">local-type: typedef-102.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -43693,8 +43693,8 @@ <h3>10.21. The complex type <code>siri:EstimatedVersionFrameStructure</code></h3
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_99_1">
-          <h3>10.22. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-99.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_102_1">
+          <h3>10.22. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-102.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -43708,7 +43708,7 @@ <h3>10.22. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:EstimatedTimetableTopicGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-99.1)</code></p>
+                    <p class="tableblock"><code>group[siri:EstimatedTimetableTopicGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-102.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -43736,8 +43736,8 @@ <h3>10.22. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_99_2">
-          <h3>10.23. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-99.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_102_2">
+          <h3>10.23. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-102.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -43751,7 +43751,7 @@ <h3>10.23. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-99.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-102.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -43857,8 +43857,8 @@ <h3>10.23. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_99_3">
-          <h3>10.24. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-99.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_102_3">
+          <h3>10.24. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-102.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -43872,7 +43872,7 @@ <h3>10.24. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-99.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-102.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -43957,8 +43957,8 @@ <h3>10.24. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_99_4">
-          <h3>10.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-99.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_102_4">
+          <h3>10.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-102.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -43972,7 +43972,7 @@ <h3>10.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:EstimatedTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-99.4)</code></p>
+                    <p class="tableblock"><code>element[siri:EstimatedTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-102.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -45239,7 +45239,7 @@ <h3>11.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_5" title="local-type: typedef-96.5">local-type: typedef-96.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_5" title="local-type: typedef-93.5">local-type: typedef-93.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -46002,7 +46002,7 @@ <h3>11.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_1" title="local-type: typedef-96.1">local-type: typedef-96.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_1" title="local-type: typedef-93.1">local-type: typedef-93.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -46017,7 +46017,7 @@ <h3>11.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_2" title="local-type: typedef-96.2">local-type: typedef-96.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_2" title="local-type: typedef-93.2">local-type: typedef-93.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -46047,7 +46047,7 @@ <h3>11.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_3" title="local-type: typedef-96.3">local-type: typedef-96.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_3" title="local-type: typedef-93.3">local-type: typedef-93.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Access control capabilities.</p>
@@ -46062,7 +46062,7 @@ <h3>11.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_4" title="local-type: typedef-96.4">local-type: typedef-96.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_93_4" title="local-type: typedef-93.4">local-type: typedef-93.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Response capabilities.</p>
@@ -46166,7 +46166,7 @@ <h3>11.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -46186,7 +46186,7 @@ <h3>11.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -46201,7 +46201,7 @@ <h3>11.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -46362,8 +46362,8 @@ <h3>11.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>11.24. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>11.24. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46377,7 +46377,7 @@ <h3>11.24. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -46429,8 +46429,8 @@ <h3>11.24. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>11.25. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>11.25. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46444,7 +46444,7 @@ <h3>11.25. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -46496,8 +46496,8 @@ <h3>11.25. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>11.26. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>11.26. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46511,7 +46511,7 @@ <h3>11.26. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -46550,8 +46550,8 @@ <h3>11.26. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_96_1">
-          <h3>11.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-96.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_93_1">
+          <h3>11.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-93.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46565,7 +46565,7 @@ <h3>11.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-96.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-93.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -46710,8 +46710,8 @@ <h3>11.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_96_2">
-          <h3>11.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-96.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_93_2">
+          <h3>11.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-93.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46725,7 +46725,7 @@ <h3>11.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-96.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-93.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -46828,8 +46828,8 @@ <h3>11.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_96_3">
-          <h3>11.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-96.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_93_3">
+          <h3>11.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-93.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46843,7 +46843,7 @@ <h3>11.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-96.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-93.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityAccessControlStructure" title="siri:CapabilityAccessControlStructure">siri:CapabilityAccessControlStructure</a></p>
@@ -46905,8 +46905,8 @@ <h3>11.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_96_4">
-          <h3>11.30. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-96.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_93_4">
+          <h3>11.30. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-93.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46920,7 +46920,7 @@ <h3>11.30. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-96.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-93.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -46959,8 +46959,8 @@ <h3>11.30. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_96_5">
-          <h3>11.31. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-96.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_93_5">
+          <h3>11.31. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-93.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -46974,7 +46974,7 @@ <h3>11.31. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:FacilityMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-96.5)</code></p>
+                    <p class="tableblock"><code>element[siri:FacilityMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-93.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -47813,7 +47813,7 @@ <h3>12.16. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_2" title="local-type: typedef-101.2">local-type: typedef-101.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_2" title="local-type: typedef-96.2">local-type: typedef-96.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -48423,7 +48423,7 @@ <h3>12.21. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_1" title="local-type: typedef-101.1">local-type: typedef-101.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_1" title="local-type: typedef-96.1">local-type: typedef-96.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -48542,7 +48542,7 @@ <h3>12.22. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -48562,7 +48562,7 @@ <h3>12.22. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_3" title="local-type: typedef-101.3">local-type: typedef-101.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_96_3" title="local-type: typedef-96.3">local-type: typedef-96.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The monitoring points that the participant may access.</p>
@@ -49091,8 +49091,8 @@ <h3>12.27. The complex type <code>siri:InfoMessageStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>12.28. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>12.28. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -49106,7 +49106,7 @@ <h3>12.28. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -49145,8 +49145,8 @@ <h3>12.28. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_101_1">
-          <h3>12.29. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-101.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_96_1">
+          <h3>12.29. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-96.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -49160,7 +49160,7 @@ <h3>12.29. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-101.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-96.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -49201,8 +49201,8 @@ <h3>12.29. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_101_2">
-          <h3>12.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-101.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_96_2">
+          <h3>12.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-96.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -49216,7 +49216,7 @@ <h3>12.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:GeneralMessagePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-101.2)</code></p>
+                    <p class="tableblock"><code>element[siri:GeneralMessagePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-96.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -49269,8 +49269,8 @@ <h3>12.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_101_3">
-          <h3>12.31. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-101.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_96_3">
+          <h3>12.31. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-96.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -49284,7 +49284,7 @@ <h3>12.31. The complex type <code>complexType[siri:GeneralMessageServicePermissi
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:GeneralMessageServicePermissionStructure]</code><br/><code>  /InfoChannelPermissions #complexType</code><br/><code>  (typedef-101.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:GeneralMessageServicePermissionStructure]</code><br/><code>  /InfoChannelPermissions #complexType</code><br/><code>  (typedef-96.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -52106,7 +52106,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_6" title="local-type: typedef-43.6">local-type: typedef-43.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_6" title="local-type: typedef-56.6">local-type: typedef-56.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -52120,7 +52120,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_7" title="local-type: typedef-43.7">local-type: typedef-43.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_7" title="local-type: typedef-56.7">local-type: typedef-56.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -52135,7 +52135,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -52149,7 +52149,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -52163,7 +52163,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -52178,7 +52178,7 @@ <h3>13.28. The complex type <code>siri:DatedVehicleJourneyStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_44_1" title="local-type: typedef-44.1">local-type: typedef-44.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Complete sequence of stops along the route path, in calling order.</p>
@@ -52612,7 +52612,7 @@ <h3>13.30. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_44_2" title="local-type: typedef-44.2">local-type: typedef-44.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey.</p>
@@ -53811,8 +53811,8 @@ <h3>13.34. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>13.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>13.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -53826,7 +53826,7 @@ <h3>13.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -53880,8 +53880,8 @@ <h3>13.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>13.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>13.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -53895,7 +53895,7 @@ <h3>13.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -53947,8 +53947,8 @@ <h3>13.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>13.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>13.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -53962,7 +53962,7 @@ <h3>13.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -54014,8 +54014,8 @@ <h3>13.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_42_1">
-          <h3>13.38. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-42.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_44_1">
+          <h3>13.38. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-44.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -54029,7 +54029,7 @@ <h3>13.38. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:DatedVehicleJourneyStructure]</code><br/><code>  /DatedCalls #complexType</code><br/><code>  (typedef-42.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:DatedVehicleJourneyStructure]</code><br/><code>  /DatedCalls #complexType</code><br/><code>  (typedef-44.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -54057,8 +54057,8 @@ <h3>13.38. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_42_2">
-          <h3>13.39. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-42.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_44_2">
+          <h3>13.39. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-44.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -54072,7 +54072,7 @@ <h3>13.39. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:RemovedDatedVehicleJourneyStructure]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-42.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:RemovedDatedVehicleJourneyStructure]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-44.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -54100,8 +54100,8 @@ <h3>13.39. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_6">
-          <h3>13.40. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-43.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_6">
+          <h3>13.40. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-56.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -54115,7 +54115,7 @@ <h3>13.40. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-43.6)</code></p>
+                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-56.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -54143,8 +54143,8 @@ <h3>13.40. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_7">
-          <h3>13.41. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-43.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_7">
+          <h3>13.41. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-56.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -54158,7 +54158,7 @@ <h3>13.41. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-43.7)</code></p>
+                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-56.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -57561,7 +57561,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_4" title="local-type: typedef-43.4">local-type: typedef-43.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_4" title="local-type: typedef-56.4">local-type: typedef-56.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -57575,7 +57575,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_5" title="local-type: typedef-43.5">local-type: typedef-43.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_5" title="local-type: typedef-56.5">local-type: typedef-56.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -57590,7 +57590,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -57604,7 +57604,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -57618,7 +57618,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -57633,7 +57633,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_30_1" title="local-type: typedef-30.1">local-type: typedef-30.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_31_1" title="local-type: typedef-31.1">local-type: typedef-31.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Complete sequence of stops already visited along the route path, in calling order. Only used if observed stop data is being recorded. (SIRI 2.0)</p>
@@ -57648,7 +57648,7 @@ <h3>14.12. The complex type <code>siri:EstimatedVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_30_2" title="local-type: typedef-30.2">local-type: typedef-30.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_31_2" title="local-type: typedef-31.2">local-type: typedef-31.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Complete sequence of stops along the route path, in calling order. Normally this is only the onwards stops from the vehicle's current position.</p>
@@ -58493,8 +58493,8 @@ <h3>14.14. The complex type <code>siri:WillWaitStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_30_1">
-          <h3>14.15. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-30.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_31_1">
+          <h3>14.15. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-31.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58508,7 +58508,7 @@ <h3>14.15. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:EstimatedVehicleJourneyStructure]</code><br/><code>  /RecordedCalls #complexType</code><br/><code>  (typedef-30.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:EstimatedVehicleJourneyStructure]</code><br/><code>  /RecordedCalls #complexType</code><br/><code>  (typedef-31.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58536,8 +58536,8 @@ <h3>14.15. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_30_2">
-          <h3>14.16. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-30.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_31_2">
+          <h3>14.16. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-31.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58551,7 +58551,7 @@ <h3>14.16. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:EstimatedVehicleJourneyStructure]</code><br/><code>  /EstimatedCalls #complexType</code><br/><code>  (typedef-30.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:EstimatedVehicleJourneyStructure]</code><br/><code>  /EstimatedCalls #complexType</code><br/><code>  (typedef-31.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58579,8 +58579,8 @@ <h3>14.16. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>14.17. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>14.17. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58594,7 +58594,7 @@ <h3>14.17. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58648,8 +58648,8 @@ <h3>14.17. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>14.18. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>14.18. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58663,7 +58663,7 @@ <h3>14.18. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58715,8 +58715,8 @@ <h3>14.18. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>14.19. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>14.19. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58730,7 +58730,7 @@ <h3>14.19. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58782,8 +58782,8 @@ <h3>14.19. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_4">
-          <h3>14.20. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-43.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_4">
+          <h3>14.20. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-56.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58797,7 +58797,7 @@ <h3>14.20. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-43.4)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-56.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -58825,8 +58825,8 @@ <h3>14.20. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_5">
-          <h3>14.21. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-43.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_5">
+          <h3>14.21. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-56.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -58840,7 +58840,7 @@ <h3>14.21. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-43.5)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-56.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -62984,7 +62984,7 @@ <h3>16.6. The group <code>siri:FacilityAccessibilityGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_2" title="local-type: typedef-50.2">local-type: typedef-50.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Limitation of facility.</p>
@@ -62998,7 +62998,7 @@ <h3>16.6. The group <code>siri:FacilityAccessibilityGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_3" title="local-type: typedef-50.3">local-type: typedef-50.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_3" title="local-type: typedef-51.3">local-type: typedef-51.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Suitabilities of facility for specific passenger needs.</p>
@@ -63465,7 +63465,7 @@ <h3>16.10. The complex type <code>siri:EquipmentAvailabilityStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_6" title="local-type: typedef-50.6">local-type: typedef-50.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_6" title="local-type: typedef-51.6">local-type: typedef-51.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Service Features associated with equipment.</p>
@@ -63652,7 +63652,7 @@ <h3>16.12. The complex type <code>siri:FacilityConditionStructure</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_5" title="local-type: typedef-50.5">local-type: typedef-50.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_5" title="local-type: typedef-51.5">local-type: typedef-51.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -64254,7 +64254,7 @@ <h3>16.16. The complex type <code>siri:FacilityStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_1" title="local-type: typedef-50.1">local-type: typedef-50.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Features of service.</p>
@@ -64329,7 +64329,7 @@ <h3>16.16. The complex type <code>siri:FacilityStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_2" title="local-type: typedef-50.2">local-type: typedef-50.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Limitation of facility.</p>
@@ -64343,7 +64343,7 @@ <h3>16.16. The complex type <code>siri:FacilityStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_3" title="local-type: typedef-50.3">local-type: typedef-50.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_3" title="local-type: typedef-51.3">local-type: typedef-51.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Suitabilities of facility for specific passenger needs.</p>
@@ -64601,7 +64601,7 @@ <h3>16.18. The complex type <code>siri:MonitoredCountingStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_4" title="local-type: typedef-50.4">local-type: typedef-50.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_4" title="local-type: typedef-51.4">local-type: typedef-51.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">List of the IDs of the counted items: usefull mainly for reservation and detailed information purposes</p>
@@ -64946,8 +64946,8 @@ <h3>16.22. The complex type <code>siri:TypeOfVehicleFuelStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_1">
-          <h3>16.23. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-50.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_1">
+          <h3>16.23. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-51.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -64961,7 +64961,7 @@ <h3>16.23. The complex type <code>complexType[siri:FacilityStructure]/Features#c
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-50.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-51.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -64989,8 +64989,8 @@ <h3>16.23. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_2">
-          <h3>16.24. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-50.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_2">
+          <h3>16.24. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-51.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -65004,7 +65004,7 @@ <h3>16.24. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:FacilityAccessibilityGroup]</code><br/><code>  /Limitations #complexType</code><br/><code>  (typedef-50.2)</code></p>
+                    <p class="tableblock"><code>group[siri:FacilityAccessibilityGroup]</code><br/><code>  /Limitations #complexType</code><br/><code>  (typedef-51.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -65103,8 +65103,8 @@ <h3>16.24. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_3">
-          <h3>16.25. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-50.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_3">
+          <h3>16.25. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-51.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -65118,7 +65118,7 @@ <h3>16.25. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:FacilityAccessibilityGroup]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-50.3)</code></p>
+                    <p class="tableblock"><code>group[siri:FacilityAccessibilityGroup]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-51.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -65146,8 +65146,8 @@ <h3>16.25. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_4">
-          <h3>16.26. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-50.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_4">
+          <h3>16.26. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-51.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -65161,7 +65161,7 @@ <h3>16.26. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:MonitoredCountingStructure]</code><br/><code>  /CountedItemsIdList #complexType</code><br/><code>  (typedef-50.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:MonitoredCountingStructure]</code><br/><code>  /CountedItemsIdList #complexType</code><br/><code>  (typedef-51.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -65189,8 +65189,8 @@ <h3>16.26. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_5">
-          <h3>16.27. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-50.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_5">
+          <h3>16.27. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-51.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -65204,7 +65204,7 @@ <h3>16.27. The complex type <code>complexType[siri:FacilityConditionStructure]/M
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:FacilityConditionStructure]</code><br/><code>  /MonitoredCounting #complexType</code><br/><code>  (typedef-50.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:FacilityConditionStructure]</code><br/><code>  /MonitoredCounting #complexType</code><br/><code>  (typedef-51.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__MonitoredCountingStructure" title="siri:MonitoredCountingStructure">siri:MonitoredCountingStructure</a></p>
@@ -65356,7 +65356,7 @@ <h3>16.27. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_50_4" title="local-type: typedef-50.4">local-type: typedef-50.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_4" title="local-type: typedef-51.4">local-type: typedef-51.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">List of the IDs of the counted items: usefull mainly for reservation and detailed information purposes</p>
@@ -65381,8 +65381,8 @@ <h3>16.27. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_50_6">
-          <h3>16.28. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-50.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_51_6">
+          <h3>16.28. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-51.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -65396,7 +65396,7 @@ <h3>16.28. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:EquipmentAvailabilityStructure]</code><br/><code>  /EquipmentFeatures #complexType</code><br/><code>  (typedef-50.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:EquipmentAvailabilityStructure]</code><br/><code>  /EquipmentFeatures #complexType</code><br/><code>  (typedef-51.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -66381,7 +66381,7 @@ <h3>19.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_55_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-55.1)</code></p>
+                    <p id="local_type_typedef_30_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-30.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">Union({xs:language}, {xs:string: (empty restriction)})</p>
@@ -69136,7 +69136,7 @@ <h3>19.65. The group <code>siri:JourneyFormationGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -69150,7 +69150,7 @@ <h3>19.65. The group <code>siri:JourneyFormationGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -69164,7 +69164,7 @@ <h3>19.65. The group <code>siri:JourneyFormationGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -69317,7 +69317,7 @@ <h3>19.67. The group <code>siri:JourneyRelationInfoGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_1" title="local-type: typedef-35.1">local-type: typedef-35.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_1" title="local-type: typedef-36.1">local-type: typedef-36.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Information about the JOURNEY PARTs for which the JOURNEY has a JOURNEY RELATION. (since SIRI 2.1)</p>
@@ -71678,7 +71678,7 @@ <h3>19.83. The group <code>siri:TrainGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_5" title="local-type: typedef-35.5">local-type: typedef-35.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_5" title="local-type: typedef-36.5">local-type: typedef-36.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Ordered collection of TRAIN COMPONENTs making up the TRAIN.</p>
@@ -71928,7 +71928,7 @@ <h3>19.84. The group <code>siri:TrainInCompoundTrainGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_7" title="local-type: typedef-35.7">local-type: typedef-35.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_7" title="local-type: typedef-36.7">local-type: typedef-36.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Specifies whether a passage from/to an adjacent TRAIN is possible for passengers.</p>
@@ -72699,7 +72699,7 @@ <h3>19.90. The group <code>siri:VehicleTypeGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_9" title="local-type: typedef-35.9">local-type: typedef-35.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_9" title="local-type: typedef-36.9">local-type: typedef-36.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Break down of capacities by FARE CLASS, i.e., maximum number of passengers that TRAIN ELEMENT can carry.</p>
@@ -72808,7 +72808,7 @@ <h3>19.90. The group <code>siri:VehicleTypeGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_8" title="local-type: typedef-35.8">local-type: typedef-35.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_8" title="local-type: typedef-36.8">local-type: typedef-36.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities of VEHICLE TYPE.</p>
@@ -72901,7 +72901,7 @@ <h3>19.91. The group <code>siri:VehicleTypePropertiesGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_9" title="local-type: typedef-35.9">local-type: typedef-35.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_9" title="local-type: typedef-36.9">local-type: typedef-36.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Break down of capacities by FARE CLASS, i.e., maximum number of passengers that TRAIN ELEMENT can carry.</p>
@@ -73324,7 +73324,7 @@ <h3>19.94. The complex type <code>siri:CompoundTrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_9" title="local-type: typedef-35.9">local-type: typedef-35.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_9" title="local-type: typedef-36.9">local-type: typedef-36.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Break down of capacities by FARE CLASS, i.e., maximum number of passengers that TRAIN ELEMENT can carry.</p>
@@ -73433,7 +73433,7 @@ <h3>19.94. The complex type <code>siri:CompoundTrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_8" title="local-type: typedef-35.8">local-type: typedef-35.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_8" title="local-type: typedef-36.8">local-type: typedef-36.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities of VEHICLE TYPE.</p>
@@ -73448,7 +73448,7 @@ <h3>19.94. The complex type <code>siri:CompoundTrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_6" title="local-type: typedef-35.6">local-type: typedef-35.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_6" title="local-type: typedef-36.6">local-type: typedef-36.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Ordered collection of TRAINs making up the COMPOUND TRAIN.</p>
@@ -74220,7 +74220,7 @@ <h3>19.102. The complex type <code>siri:JourneyRelationStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_1" title="local-type: typedef-35.1">local-type: typedef-35.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_1" title="local-type: typedef-36.1">local-type: typedef-36.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Information about the JOURNEY PARTs for which the JOURNEY has a JOURNEY RELATION. (since SIRI 2.1)</p>
@@ -76151,7 +76151,7 @@ <h3>19.113. The complex type <code>siri:RelatedJourneyStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_1" title="local-type: typedef-35.1">local-type: typedef-35.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_1" title="local-type: typedef-36.1">local-type: typedef-36.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Information about the JOURNEY PARTs for which the JOURNEY has a JOURNEY RELATION. (since SIRI 2.1)</p>
@@ -76930,7 +76930,7 @@ <h3>19.117. The complex type <code>siri:TrainElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_9" title="local-type: typedef-35.9">local-type: typedef-35.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_9" title="local-type: typedef-36.9">local-type: typedef-36.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Break down of capacities by FARE CLASS, i.e., maximum number of passengers that TRAIN ELEMENT can carry.</p>
@@ -77039,7 +77039,7 @@ <h3>19.117. The complex type <code>siri:TrainElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_8" title="local-type: typedef-35.8">local-type: typedef-35.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_8" title="local-type: typedef-36.8">local-type: typedef-36.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities of VEHICLE TYPE.</p>
@@ -77317,7 +77317,7 @@ <h3>19.118. The complex type <code>siri:TrainInCompoundTrainStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_7" title="local-type: typedef-35.7">local-type: typedef-35.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_7" title="local-type: typedef-36.7">local-type: typedef-36.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Specifies whether a passage from/to an adjacent TRAIN is possible for passengers.</p>
@@ -77480,7 +77480,7 @@ <h3>19.119. The complex type <code>siri:TrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_9" title="local-type: typedef-35.9">local-type: typedef-35.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_9" title="local-type: typedef-36.9">local-type: typedef-36.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Break down of capacities by FARE CLASS, i.e., maximum number of passengers that TRAIN ELEMENT can carry.</p>
@@ -77589,7 +77589,7 @@ <h3>19.119. The complex type <code>siri:TrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_8" title="local-type: typedef-35.8">local-type: typedef-35.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_8" title="local-type: typedef-36.8">local-type: typedef-36.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities of VEHICLE TYPE.</p>
@@ -77630,7 +77630,7 @@ <h3>19.119. The complex type <code>siri:TrainStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_5" title="local-type: typedef-35.5">local-type: typedef-35.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_5" title="local-type: typedef-36.5">local-type: typedef-36.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Ordered collection of TRAIN COMPONENTs making up the TRAIN.</p>
@@ -78199,8 +78199,8 @@ <h3>19.123. The complex type <code>siri:ViaNameStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_1">
-          <h3>19.124. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-35.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_1">
+          <h3>19.124. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-36.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78214,7 +78214,7 @@ <h3>19.124. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyRelationInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-35.1)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyRelationInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-36.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78242,8 +78242,8 @@ <h3>19.124. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>19.125. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>19.125. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78257,7 +78257,7 @@ <h3>19.125. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78311,8 +78311,8 @@ <h3>19.125. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>19.126. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>19.126. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78326,7 +78326,7 @@ <h3>19.126. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78378,8 +78378,8 @@ <h3>19.126. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>19.127. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>19.127. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78393,7 +78393,7 @@ <h3>19.127. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78445,8 +78445,8 @@ <h3>19.127. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_5">
-          <h3>19.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-35.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_5">
+          <h3>19.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-36.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78460,7 +78460,7 @@ <h3>19.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainGroup]</code><br/><code>  /TrainComponents #complexType</code><br/><code>  (typedef-35.5)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainGroup]</code><br/><code>  /TrainComponents #complexType</code><br/><code>  (typedef-36.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78514,8 +78514,8 @@ <h3>19.128. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_6">
-          <h3>19.129. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-35.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_6">
+          <h3>19.129. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-36.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78529,7 +78529,7 @@ <h3>19.129. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:CompoundTrainStructure]</code><br/><code>  /TrainsInCompoundTrain #complexType</code><br/><code>  (typedef-35.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:CompoundTrainStructure]</code><br/><code>  /TrainsInCompoundTrain #complexType</code><br/><code>  (typedef-36.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78583,8 +78583,8 @@ <h3>19.129. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_7">
-          <h3>19.130. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-35.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_7">
+          <h3>19.130. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-36.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78598,7 +78598,7 @@ <h3>19.130. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainInCompoundTrainGroup]</code><br/><code>  /Passages #complexType</code><br/><code>  (typedef-35.7)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainInCompoundTrainGroup]</code><br/><code>  /Passages #complexType</code><br/><code>  (typedef-36.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78626,8 +78626,8 @@ <h3>19.130. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_8">
-          <h3>19.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-35.8)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_8">
+          <h3>19.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-36.8)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78641,7 +78641,7 @@ <h3>19.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:VehicleTypeGroup]</code><br/><code>  /Facilities #complexType</code><br/><code>  (typedef-35.8)</code></p>
+                    <p class="tableblock"><code>group[siri:VehicleTypeGroup]</code><br/><code>  /Facilities #complexType</code><br/><code>  (typedef-36.8)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -78713,8 +78713,8 @@ <h3>19.131. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_9">
-          <h3>19.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-35.9)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_9">
+          <h3>19.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-36.9)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -78728,7 +78728,7 @@ <h3>19.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:VehicleTypePropertiesGroup]</code><br/><code>  /MaximumPassengerCapacities #complexType</code><br/><code>  (typedef-35.9)</code></p>
+                    <p class="tableblock"><code>group[siri:VehicleTypePropertiesGroup]</code><br/><code>  /MaximumPassengerCapacities #complexType</code><br/><code>  (typedef-36.9)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -82830,7 +82830,7 @@ <h3>21.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -82850,7 +82850,7 @@ <h3>21.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -82865,7 +82865,7 @@ <h3>21.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -82880,7 +82880,7 @@ <h3>21.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_3" title="local-type: typedef-51.3">local-type: typedef-51.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_3" title="local-type: typedef-42.3">local-type: typedef-42.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The CONNECTION links that the participant may access.</p>
@@ -83251,8 +83251,8 @@ <h3>21.30. The complex type <code>siri:StopMonitorPermissionStructure</code></h3
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>21.31. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>21.31. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -83266,7 +83266,7 @@ <h3>21.31. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -83318,8 +83318,8 @@ <h3>21.31. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>21.32. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>21.32. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -83333,7 +83333,7 @@ <h3>21.32. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -83385,8 +83385,8 @@ <h3>21.32. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_3">
-          <h3>21.33. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-51.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_3">
+          <h3>21.33. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-42.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -83400,7 +83400,7 @@ <h3>21.33. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ConnectionLinkPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ConnectionLinkPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -83452,8 +83452,8 @@ <h3>21.33. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>21.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>21.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -83467,7 +83467,7 @@ <h3>21.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -88947,7 +88947,7 @@ <h3>23.3. The group <code>siri:DatedTrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_6" title="local-type: typedef-43.6">local-type: typedef-43.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_6" title="local-type: typedef-56.6">local-type: typedef-56.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -88961,7 +88961,7 @@ <h3>23.3. The group <code>siri:DatedTrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_7" title="local-type: typedef-43.7">local-type: typedef-43.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_7" title="local-type: typedef-56.7">local-type: typedef-56.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -88976,7 +88976,7 @@ <h3>23.3. The group <code>siri:DatedTrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -88990,7 +88990,7 @@ <h3>23.3. The group <code>siri:DatedTrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -89004,7 +89004,7 @@ <h3>23.3. The group <code>siri:DatedTrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -90737,7 +90737,7 @@ <h3>23.12. The group <code>siri:ServicePointsGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_1" title="local-type: typedef-43.1">local-type: typedef-43.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_1" title="local-type: typedef-56.1">local-type: typedef-56.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Origin of the VEHICLE JOURNEY.</p>
@@ -90751,7 +90751,7 @@ <h3>23.12. The group <code>siri:ServicePointsGroup</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_2" title="local-type: typedef-43.2">local-type: typedef-43.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_2" title="local-type: typedef-56.2">local-type: typedef-56.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">VIA points for VEHICLE JOURNEY</p>
@@ -90765,7 +90765,7 @@ <h3>23.12. The group <code>siri:ServicePointsGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_3" title="local-type: typedef-43.3">local-type: typedef-43.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_3" title="local-type: typedef-56.3">local-type: typedef-56.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Destination of VEHICLE JOURNEY.</p>
@@ -91475,7 +91475,7 @@ <h3>23.15. The group <code>siri:TrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_4" title="local-type: typedef-43.4">local-type: typedef-43.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_4" title="local-type: typedef-56.4">local-type: typedef-56.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -91489,7 +91489,7 @@ <h3>23.15. The group <code>siri:TrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_5" title="local-type: typedef-43.5">local-type: typedef-43.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_5" title="local-type: typedef-56.5">local-type: typedef-56.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -91504,7 +91504,7 @@ <h3>23.15. The group <code>siri:TrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -91518,7 +91518,7 @@ <h3>23.15. The group <code>siri:TrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -91532,7 +91532,7 @@ <h3>23.15. The group <code>siri:TrainOperationalInfoGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -93613,7 +93613,7 @@ <h3>23.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_4" title="local-type: typedef-43.4">local-type: typedef-43.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_4" title="local-type: typedef-56.4">local-type: typedef-56.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -93627,7 +93627,7 @@ <h3>23.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_5" title="local-type: typedef-43.5">local-type: typedef-43.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_5" title="local-type: typedef-56.5">local-type: typedef-56.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -93642,7 +93642,7 @@ <h3>23.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -93656,7 +93656,7 @@ <h3>23.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -93670,7 +93670,7 @@ <h3>23.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code></
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -94096,8 +94096,8 @@ <h3>23.22. The complex type <code>siri:TrainBlockPartStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>23.23. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>23.23. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94111,7 +94111,7 @@ <h3>23.23. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94165,8 +94165,8 @@ <h3>23.23. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>23.24. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>23.24. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94180,7 +94180,7 @@ <h3>23.24. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94232,8 +94232,8 @@ <h3>23.24. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>23.25. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>23.25. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94247,7 +94247,7 @@ <h3>23.25. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94299,8 +94299,8 @@ <h3>23.25. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_1">
-          <h3>23.26. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-43.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_1">
+          <h3>23.26. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-56.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94314,7 +94314,7 @@ <h3>23.26. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Origin #complexType</code><br/><code>  (typedef-43.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Origin #complexType</code><br/><code>  (typedef-56.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94357,8 +94357,8 @@ <h3>23.26. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_2">
-          <h3>23.27. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-43.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_2">
+          <h3>23.27. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-56.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94372,7 +94372,7 @@ <h3>23.27. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Via #complexType</code><br/><code>  (typedef-43.2)</code></p>
+                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Via #complexType</code><br/><code>  (typedef-56.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94428,8 +94428,8 @@ <h3>23.27. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_3">
-          <h3>23.28. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-43.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_3">
+          <h3>23.28. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-56.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94443,7 +94443,7 @@ <h3>23.28. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Destination #complexType</code><br/><code>  (typedef-43.3)</code></p>
+                    <p class="tableblock"><code>group[siri:ServicePointsGroup]</code><br/><code>  /Destination #complexType</code><br/><code>  (typedef-56.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94486,8 +94486,8 @@ <h3>23.28. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_4">
-          <h3>23.29. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-43.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_4">
+          <h3>23.29. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-56.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94501,7 +94501,7 @@ <h3>23.29. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-43.4)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-56.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94529,8 +94529,8 @@ <h3>23.29. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_5">
-          <h3>23.30. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-43.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_5">
+          <h3>23.30. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-56.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94544,7 +94544,7 @@ <h3>23.30. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-43.5)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-56.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94572,8 +94572,8 @@ <h3>23.30. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_6">
-          <h3>23.31. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-43.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_6">
+          <h3>23.31. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-56.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94587,7 +94587,7 @@ <h3>23.31. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-43.6)</code></p>
+                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-56.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -94615,8 +94615,8 @@ <h3>23.31. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_7">
-          <h3>23.32. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-43.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_7">
+          <h3>23.32. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-56.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -94630,7 +94630,7 @@ <h3>23.32. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-43.7)</code></p>
+                    <p class="tableblock"><code>group[siri:DatedTrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-56.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -98386,7 +98386,7 @@ <h3>26.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_29_3" class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /ScopeType #simpleType</code><br/><code>  (typedef-29.3)</code></p>
+                    <p id="local_type_typedef_40_3" class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /ScopeType #simpleType</code><br/><code>  (typedef-40.3)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -98566,7 +98566,7 @@ <h3>26.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_29_1" class="tableblock"><code>group[siri:StatusGroup]</code><br/><code>  /Verification #simpleType</code><br/><code>  (typedef-29.1)</code></p>
+                    <p id="local_type_typedef_40_1" class="tableblock"><code>group[siri:StatusGroup]</code><br/><code>  /Verification #simpleType</code><br/><code>  (typedef-40.1)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -98626,7 +98626,7 @@ <h3>26.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_55_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-55.1)</code></p>
+                    <p id="local_type_typedef_30_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-30.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">Union({xs:language}, {xs:string: (empty restriction)})</p>
@@ -98990,7 +98990,7 @@ <h3>26.4. The group <code>siri:ClassifierGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_3" title="local-type: typedef-29.3">local-type: typedef-29.3</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_3" title="local-type: typedef-40.3">local-type: typedef-40.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Nature of scope, e.g. general, network.</p>
@@ -99042,7 +99042,7 @@ <h3>26.4. The group <code>siri:ClassifierGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_4" title="local-type: typedef-29.4">local-type: typedef-29.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_4" title="local-type: typedef-40.4">local-type: typedef-40.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Additional reasons</p>
@@ -99578,7 +99578,7 @@ <h3>26.10. The group <code>siri:DescriptionGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_14" title="local-type: typedef-29.14">local-type: typedef-29.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_14" title="local-type: typedef-40.14">local-type: typedef-40.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any images associated with SITUATION.</p>
@@ -99592,7 +99592,7 @@ <h3>26.10. The group <code>siri:DescriptionGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_16" title="local-type: typedef-29.16">local-type: typedef-29.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_16" title="local-type: typedef-40.16">local-type: typedef-40.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Hyperlinks to other resources associated with SITUATION.</p>
@@ -99706,7 +99706,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_1" title="local-type: typedef-29.1">local-type: typedef-29.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_1" title="local-type: typedef-40.1">local-type: typedef-40.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether the SITUATION has been verified.</p>
@@ -99805,7 +99805,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_2" title="local-type: typedef-29.2">local-type: typedef-29.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_2" title="local-type: typedef-40.2">local-type: typedef-40.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
@@ -100096,7 +100096,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_3" title="local-type: typedef-29.3">local-type: typedef-29.3</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_3" title="local-type: typedef-40.3">local-type: typedef-40.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Nature of scope, e.g. general, network.</p>
@@ -100148,7 +100148,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_4" title="local-type: typedef-29.4">local-type: typedef-29.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_4" title="local-type: typedef-40.4">local-type: typedef-40.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Additional reasons</p>
@@ -100245,7 +100245,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_14" title="local-type: typedef-29.14">local-type: typedef-29.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_14" title="local-type: typedef-40.14">local-type: typedef-40.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any images associated with SITUATION.</p>
@@ -100259,7 +100259,7 @@ <h3>26.12. The group <code>siri:PtSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_16" title="local-type: typedef-29.16">local-type: typedef-29.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_16" title="local-type: typedef-40.16">local-type: typedef-40.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Hyperlinks to other resources associated with SITUATION.</p>
@@ -100666,7 +100666,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_1" title="local-type: typedef-29.1">local-type: typedef-29.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_1" title="local-type: typedef-40.1">local-type: typedef-40.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether the SITUATION has been verified.</p>
@@ -100765,7 +100765,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_2" title="local-type: typedef-29.2">local-type: typedef-29.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_2" title="local-type: typedef-40.2">local-type: typedef-40.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
@@ -101056,7 +101056,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_3" title="local-type: typedef-29.3">local-type: typedef-29.3</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_3" title="local-type: typedef-40.3">local-type: typedef-40.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Nature of scope, e.g. general, network.</p>
@@ -101108,7 +101108,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_4" title="local-type: typedef-29.4">local-type: typedef-29.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_4" title="local-type: typedef-40.4">local-type: typedef-40.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Additional reasons</p>
@@ -101205,7 +101205,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_14" title="local-type: typedef-29.14">local-type: typedef-29.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_14" title="local-type: typedef-40.14">local-type: typedef-40.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any images associated with SITUATION.</p>
@@ -101219,7 +101219,7 @@ <h3>26.15. The group <code>siri:RoadSituationBodyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_16" title="local-type: typedef-29.16">local-type: typedef-29.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_16" title="local-type: typedef-40.16">local-type: typedef-40.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Hyperlinks to other resources associated with SITUATION.</p>
@@ -101471,7 +101471,7 @@ <h3>26.18. The group <code>siri:StatusGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_1" title="local-type: typedef-29.1">local-type: typedef-29.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_1" title="local-type: typedef-40.1">local-type: typedef-40.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether the SITUATION has been verified.</p>
@@ -101598,7 +101598,7 @@ <h3>26.19. The group <code>siri:TemporalGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_2" title="local-type: typedef-29.2">local-type: typedef-29.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_2" title="local-type: typedef-40.2">local-type: typedef-40.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
@@ -101942,7 +101942,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_6" title="local-type: typedef-29.6">local-type: typedef-29.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_6" title="local-type: typedef-40.6">local-type: typedef-40.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Affected OPERATORs, If absent, taken from context. If present, any OPERATORs stated completely replace those from context.</p>
@@ -101957,7 +101957,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_7" title="local-type: typedef-29.7">local-type: typedef-29.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_7" title="local-type: typedef-40.7">local-type: typedef-40.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Networks affected by SITUATION.</p>
@@ -101972,7 +101972,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_9" title="local-type: typedef-29.9">local-type: typedef-29.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_9" title="local-type: typedef-40.9">local-type: typedef-40.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">STOP POINTs affected by SITUATION.</p>
@@ -101987,7 +101987,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_10" title="local-type: typedef-29.10">local-type: typedef-29.10</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_10" title="local-type: typedef-40.10">local-type: typedef-40.10</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Places other than STOP POINTs affected by SITUATION.</p>
@@ -102002,7 +102002,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_11" title="local-type: typedef-29.11">local-type: typedef-29.11</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_11" title="local-type: typedef-40.11">local-type: typedef-40.11</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Places other than STOP POINTs affected by SITUATION.</p>
@@ -102017,7 +102017,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_12" title="local-type: typedef-29.12">local-type: typedef-29.12</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_12" title="local-type: typedef-40.12">local-type: typedef-40.12</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Specific journeys affected by SITUATION.</p>
@@ -102032,7 +102032,7 @@ <h3>26.23. The complex type <code>siri:AffectsScopeStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_13" title="local-type: typedef-29.13">local-type: typedef-29.13</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_13" title="local-type: typedef-40.13">local-type: typedef-40.13</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Specific vehicles affected by SITUATION. ((since SIRI 2.0))</p>
@@ -103066,7 +103066,7 @@ <h3>26.34. The complex type <code>siri:PtConsequenceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_17" title="local-type: typedef-29.17">local-type: typedef-29.17</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_17" title="local-type: typedef-40.17">local-type: typedef-40.17</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Effect on different passenger needs.</p>
@@ -103365,7 +103365,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_1" title="local-type: typedef-29.1">local-type: typedef-29.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_1" title="local-type: typedef-40.1">local-type: typedef-40.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether the SITUATION has been verified.</p>
@@ -103464,7 +103464,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_2" title="local-type: typedef-29.2">local-type: typedef-29.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_2" title="local-type: typedef-40.2">local-type: typedef-40.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
@@ -103755,7 +103755,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_3" title="local-type: typedef-29.3">local-type: typedef-29.3</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_3" title="local-type: typedef-40.3">local-type: typedef-40.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Nature of scope, e.g. general, network.</p>
@@ -103807,7 +103807,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_4" title="local-type: typedef-29.4">local-type: typedef-29.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_4" title="local-type: typedef-40.4">local-type: typedef-40.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Additional reasons</p>
@@ -103904,7 +103904,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_14" title="local-type: typedef-29.14">local-type: typedef-29.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_14" title="local-type: typedef-40.14">local-type: typedef-40.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any images associated with SITUATION.</p>
@@ -103918,7 +103918,7 @@ <h3>26.35. The complex type <code>siri:PtSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_16" title="local-type: typedef-29.16">local-type: typedef-29.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_16" title="local-type: typedef-40.16">local-type: typedef-40.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Hyperlinks to other resources associated with SITUATION.</p>
@@ -104383,7 +104383,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_1" title="local-type: typedef-29.1">local-type: typedef-29.1</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_1" title="local-type: typedef-40.1">local-type: typedef-40.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether the SITUATION has been verified.</p>
@@ -104482,7 +104482,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_2" title="local-type: typedef-29.2">local-type: typedef-29.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_2" title="local-type: typedef-40.2">local-type: typedef-40.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">situation applies only on the repeated day types within the overall validity period(s). For example Sunday.</p>
@@ -104773,7 +104773,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_29_3" title="local-type: typedef-29.3">local-type: typedef-29.3</a></em></p>
+                    <p class="tableblock"><em><a shape="rect" href="/home/runner/work/OJP/OJP/docs/generated/contab/siri.enum-dict.html#local_enum.typedef_40_3" title="local-type: typedef-40.3">local-type: typedef-40.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Nature of scope, e.g. general, network.</p>
@@ -104825,7 +104825,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_4" title="local-type: typedef-29.4">local-type: typedef-29.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_4" title="local-type: typedef-40.4">local-type: typedef-40.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Additional reasons</p>
@@ -104922,7 +104922,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_14" title="local-type: typedef-29.14">local-type: typedef-29.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_14" title="local-type: typedef-40.14">local-type: typedef-40.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Any images associated with SITUATION.</p>
@@ -104936,7 +104936,7 @@ <h3>26.38. The complex type <code>siri:RoadSituationElementStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_16" title="local-type: typedef-29.16">local-type: typedef-29.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_16" title="local-type: typedef-40.16">local-type: typedef-40.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Hyperlinks to other resources associated with SITUATION.</p>
@@ -105432,8 +105432,8 @@ <h3>26.40. The complex type <code>siri:SituationSourceStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_10">
-          <h3>26.41. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-29.10)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_10">
+          <h3>26.41. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-40.10)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105447,7 +105447,7 @@ <h3>26.41. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /StopPlaces #complexType</code><br/><code>  (typedef-29.10)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /StopPlaces #complexType</code><br/><code>  (typedef-40.10)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105475,8 +105475,8 @@ <h3>26.41. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_11">
-          <h3>26.42. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-29.11)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_11">
+          <h3>26.42. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-40.11)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105490,7 +105490,7 @@ <h3>26.42. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Places #complexType</code><br/><code>  (typedef-29.11)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Places #complexType</code><br/><code>  (typedef-40.11)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105518,8 +105518,8 @@ <h3>26.42. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_12">
-          <h3>26.43. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-29.12)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_12">
+          <h3>26.43. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-40.12)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105533,7 +105533,7 @@ <h3>26.43. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /VehicleJourneys #complexType</code><br/><code>  (typedef-29.12)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /VehicleJourneys #complexType</code><br/><code>  (typedef-40.12)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105561,8 +105561,8 @@ <h3>26.43. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_13">
-          <h3>26.44. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-29.13)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_13">
+          <h3>26.44. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-40.13)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105576,7 +105576,7 @@ <h3>26.44. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Vehicles #complexType</code><br/><code>  (typedef-29.13)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Vehicles #complexType</code><br/><code>  (typedef-40.13)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105604,8 +105604,8 @@ <h3>26.44. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_14">
-          <h3>26.45. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-29.14)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_14">
+          <h3>26.45. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-40.14)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105619,7 +105619,7 @@ <h3>26.45. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /Images #complexType</code><br/><code>  (typedef-29.14)</code></p>
+                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /Images #complexType</code><br/><code>  (typedef-40.14)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105637,7 +105637,7 @@ <h3>26.45. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_15" title="local-type: typedef-29.15">local-type: typedef-29.15</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_15" title="local-type: typedef-40.15">local-type: typedef-40.15</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Image description.</p>
@@ -105647,8 +105647,8 @@ <h3>26.45. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_15">
-          <h3>26.46. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-29.15)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_15">
+          <h3>26.46. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-40.15)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105662,7 +105662,7 @@ <h3>26.46. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /Images/Image #complexType</code><br/><code>  (typedef-29.15)</code></p>
+                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /Images/Image #complexType</code><br/><code>  (typedef-40.15)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ImageStructure" title="siri:ImageStructure">siri:ImageStructure</a></p>
@@ -105732,8 +105732,8 @@ <h3>26.46. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_16">
-          <h3>26.47. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-29.16)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_16">
+          <h3>26.47. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-40.16)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105747,7 +105747,7 @@ <h3>26.47. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /InfoLinks #complexType</code><br/><code>  (typedef-29.16)</code></p>
+                    <p class="tableblock"><code>group[siri:DescriptionGroup]</code><br/><code>  /InfoLinks #complexType</code><br/><code>  (typedef-40.16)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105775,8 +105775,8 @@ <h3>26.47. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_17">
-          <h3>26.48. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-29.17)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_17">
+          <h3>26.48. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-40.17)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105790,7 +105790,7 @@ <h3>26.48. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:PtConsequenceStructure]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-29.17)</code></p>
+                    <p class="tableblock"><code>complexType[siri:PtConsequenceStructure]</code><br/><code>  /Suitabilities #complexType</code><br/><code>  (typedef-40.17)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105818,8 +105818,8 @@ <h3>26.48. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_2">
-          <h3>26.49. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-29.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_2">
+          <h3>26.49. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-40.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105833,7 +105833,7 @@ <h3>26.49. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TemporalGroup]</code><br/><code>  /Repetitions #complexType</code><br/><code>  (typedef-29.2)</code></p>
+                    <p class="tableblock"><code>group[siri:TemporalGroup]</code><br/><code>  /Repetitions #complexType</code><br/><code>  (typedef-40.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105861,8 +105861,8 @@ <h3>26.49. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_4">
-          <h3>26.50. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-29.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_4">
+          <h3>26.50. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-40.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105876,7 +105876,7 @@ <h3>26.50. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /SecondaryReasons #complexType</code><br/><code>  (typedef-29.4)</code></p>
+                    <p class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /SecondaryReasons #complexType</code><br/><code>  (typedef-40.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -105894,7 +105894,7 @@ <h3>26.50. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_5" title="local-type: typedef-29.5">local-type: typedef-29.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_5" title="local-type: typedef-40.5">local-type: typedef-40.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Reason</p>
@@ -105904,8 +105904,8 @@ <h3>26.50. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_5">
-          <h3>26.51. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-29.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_5">
+          <h3>26.51. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-40.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -105919,7 +105919,7 @@ <h3>26.51. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /SecondaryReasons/Reason #complexType</code><br/><code>  (typedef-29.5)</code></p>
+                    <p class="tableblock"><code>group[siri:ClassifierGroup]</code><br/><code>  /SecondaryReasons/Reason #complexType</code><br/><code>  (typedef-40.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -106140,8 +106140,8 @@ <h3>26.51. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_6">
-          <h3>26.52. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-29.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_6">
+          <h3>26.52. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-40.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -106155,7 +106155,7 @@ <h3>26.52. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Operators #complexType</code><br/><code>  (typedef-29.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Operators #complexType</code><br/><code>  (typedef-40.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -106209,8 +106209,8 @@ <h3>26.52. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_7">
-          <h3>26.53. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-29.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_7">
+          <h3>26.53. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-40.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -106224,7 +106224,7 @@ <h3>26.53. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Networks #complexType</code><br/><code>  (typedef-29.7)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Networks #complexType</code><br/><code>  (typedef-40.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -106242,7 +106242,7 @@ <h3>26.53. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_29_8" title="local-type: typedef-29.8">local-type: typedef-29.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_40_8" title="local-type: typedef-40.8">local-type: typedef-40.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Networks and Route(s) affected by SITUATION.</p>
@@ -106252,8 +106252,8 @@ <h3>26.53. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_8">
-          <h3>26.54. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-29.8)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_8">
+          <h3>26.54. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-40.8)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -106267,7 +106267,7 @@ <h3>26.54. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Networks/AffectedNetwork #complexType</code><br/><code>  (typedef-29.8)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /Networks/AffectedNetwork #complexType</code><br/><code>  (typedef-40.8)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__AffectedNetworkStructure" title="siri:AffectedNetworkStructure">siri:AffectedNetworkStructure</a></p>
@@ -106609,8 +106609,8 @@ <h3>26.54. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_29_9">
-          <h3>26.55. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-29.9)</code></h3>
+        <div class="sect2" id="local_type_typedef_40_9">
+          <h3>26.55. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-40.9)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -106624,7 +106624,7 @@ <h3>26.55. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-29.9)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectsScopeStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-40.9)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -107233,7 +107233,7 @@ <h3>27.13. The group <code>siri:ActionsGroup</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_3" title="local-type: typedef-33.3">local-type: typedef-33.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_3" title="local-type: typedef-49.3">local-type: typedef-49.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Action: Publish SITUATION to Manual publication channel.</p>
@@ -107386,7 +107386,7 @@ <h3>27.14. The complex type <code>siri:ActionDataStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_2" title="local-type: typedef-33.2">local-type: typedef-33.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_2" title="local-type: typedef-49.2">local-type: typedef-49.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Defines the information area where the action has to be published.</p>
@@ -107499,7 +107499,7 @@ <h3>27.15. The complex type <code>siri:ActionsStructure</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_3" title="local-type: typedef-33.3">local-type: typedef-33.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_3" title="local-type: typedef-49.3">local-type: typedef-49.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Action: Publish SITUATION to Manual publication channel.</p>
@@ -107939,7 +107939,7 @@ <h3>27.20. The complex type <code>siri:NotifyByEmailActionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -108080,7 +108080,7 @@ <h3>27.21. The complex type <code>siri:NotifyByPagerActionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -108232,7 +108232,7 @@ <h3>27.22. The complex type <code>siri:NotifyBySmsActionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -108386,7 +108386,7 @@ <h3>27.23. The complex type <code>siri:NotifyUserActionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -108798,7 +108798,7 @@ <h3>27.26. The complex type <code>siri:PublishingActionStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_4" title="local-type: typedef-33.4">local-type: typedef-33.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_4" title="local-type: typedef-49.4">local-type: typedef-49.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Defines the information area where the action has to be published.</p>
@@ -108921,7 +108921,7 @@ <h3>27.27. The complex type <code>siri:PublishToAlertsActionStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -109600,7 +109600,7 @@ <h3>27.32. The complex type <code>siri:PushedActionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_1" title="local-type: typedef-33.1">local-type: typedef-33.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_1" title="local-type: typedef-49.1">local-type: typedef-49.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Whether reminders should be sent.</p>
@@ -109980,7 +109980,7 @@ <h3>27.38. The complex type <code>siri:TextualContentStructure</code></h3>
                     <p class="tableblock"><span title="optional, multiple">0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_33_3" title="local-type: typedef-33.3">local-type: typedef-33.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_49_3" title="local-type: typedef-49.3">local-type: typedef-49.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Action: Publish SITUATION to Manual publication channel.</p>
@@ -110196,8 +110196,8 @@ <h3>27.38. The complex type <code>siri:TextualContentStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_33_1">
-          <h3>27.39. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-33.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_49_1">
+          <h3>27.39. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-49.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -110211,7 +110211,7 @@ <h3>27.39. The complex type <code>complexType[siri:PushedActionStructure]/Before
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:PushedActionStructure]</code><br/><code>  /BeforeNotices #complexType</code><br/><code>  (typedef-33.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:PushedActionStructure]</code><br/><code>  /BeforeNotices #complexType</code><br/><code>  (typedef-49.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -110239,8 +110239,8 @@ <h3>27.39. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_33_2">
-          <h3>27.40. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-33.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_49_2">
+          <h3>27.40. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-49.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -110254,7 +110254,7 @@ <h3>27.40. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ActionDataStructure]</code><br/><code>  /PublishAtScope #complexType</code><br/><code>  (typedef-33.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ActionDataStructure]</code><br/><code>  /PublishAtScope #complexType</code><br/><code>  (typedef-49.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -110297,8 +110297,8 @@ <h3>27.40. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_33_3">
-          <h3>27.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-33.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_49_3">
+          <h3>27.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-49.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -110312,7 +110312,7 @@ <h3>27.41. The complex type <code>element[siri:ManualAction]#complexType (typede
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ManualAction]</code><br/><code>  #complexType</code><br/><code>  (typedef-33.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ManualAction]</code><br/><code>  #complexType</code><br/><code>  (typedef-49.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ManualActionStructure" title="siri:ManualActionStructure">siri:ManualActionStructure</a></p>
@@ -110390,8 +110390,8 @@ <h3>27.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_33_4">
-          <h3>27.42. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-33.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_49_4">
+          <h3>27.42. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-49.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -110405,7 +110405,7 @@ <h3>27.42. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:PublishingActionStructure]</code><br/><code>  /PublishAtScope #complexType</code><br/><code>  (typedef-33.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:PublishingActionStructure]</code><br/><code>  /PublishAtScope #complexType</code><br/><code>  (typedef-49.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -111720,7 +111720,7 @@ <h3>28.8. The complex type <code>siri:AffectedCallStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_1" title="local-type: typedef-54.1">local-type: typedef-54.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_1" title="local-type: typedef-45.1">local-type: typedef-45.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">CONNECTION links from stop.</p>
@@ -111735,7 +111735,7 @@ <h3>28.8. The complex type <code>siri:AffectedCallStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_2" title="local-type: typedef-54.2">local-type: typedef-54.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_2" title="local-type: typedef-45.2">local-type: typedef-45.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Used to restrict stop points to some lines</p>
@@ -112101,7 +112101,7 @@ <h3>28.8. The complex type <code>siri:AffectedCallStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_16" title="local-type: typedef-54.16">local-type: typedef-54.16</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_16" title="local-type: typedef-45.16">local-type: typedef-45.16</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -112699,7 +112699,7 @@ <h3>28.12. The complex type <code>siri:AffectedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_4" title="local-type: typedef-54.4">local-type: typedef-54.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_4" title="local-type: typedef-45.4">local-type: typedef-45.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Restricts the affected scope to the specified ROUTEs</p>
@@ -112714,7 +112714,7 @@ <h3>28.12. The complex type <code>siri:AffectedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_5" title="local-type: typedef-54.5">local-type: typedef-54.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_5" title="local-type: typedef-45.5">local-type: typedef-45.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Restricts the affected scope to the specified LINE SECTIONs</p>
@@ -112729,7 +112729,7 @@ <h3>28.12. The complex type <code>siri:AffectedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_6" title="local-type: typedef-54.6">local-type: typedef-54.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_6" title="local-type: typedef-45.6">local-type: typedef-45.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Restricts the affected scope to the specified SCHEDULED STOP POINTs</p>
@@ -112744,7 +112744,7 @@ <h3>28.12. The complex type <code>siri:AffectedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_7" title="local-type: typedef-54.7">local-type: typedef-54.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_7" title="local-type: typedef-45.7">local-type: typedef-45.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Restricts the affected scope to the specified STOP PLACEs</p>
@@ -112828,7 +112828,7 @@ <h3>28.13. The complex type <code>siri:AffectedModesStructure</code></h3>
                     <p class="tableblock"><span title="optional, multiple, part of a choice">-0:*</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_3" title="local-type: typedef-54.3">local-type: typedef-54.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_3" title="local-type: typedef-45.3">local-type: typedef-45.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Mode affected by SITUATION.</p>
@@ -113624,7 +113624,7 @@ <h3>28.18. The complex type <code>siri:AffectedRouteStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_9" title="local-type: typedef-54.9">local-type: typedef-54.9</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_9" title="local-type: typedef-45.9">local-type: typedef-45.9</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Sections of ROUTE affected by SITUATION.</p>
@@ -113639,7 +113639,7 @@ <h3>28.18. The complex type <code>siri:AffectedRouteStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_10" title="local-type: typedef-54.10">local-type: typedef-54.10</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_10" title="local-type: typedef-45.10">local-type: typedef-45.10</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Stop Poins of the ROUTE. Can be either all or only affected by SITUATION.</p>
@@ -113654,7 +113654,7 @@ <h3>28.18. The complex type <code>siri:AffectedRouteStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_11" title="local-type: typedef-54.11">local-type: typedef-54.11</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_11" title="local-type: typedef-45.11">local-type: typedef-45.11</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">ROUTE LINKs affected by SITUATION.</p>
@@ -113738,7 +113738,7 @@ <h3>28.19. The complex type <code>siri:AffectedSectionStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_8" title="local-type: typedef-54.8">local-type: typedef-54.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_8" title="local-type: typedef-45.8">local-type: typedef-45.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">An indirect reference to a COMMON SECTION by stating the stop point ref of the first and last POINT IN JOURNEY PATTERN of the section in question. Intermediate POINTs should be added if necessary to distinguish different sections having the same start and end point and is a means to exclude sections not containing those stop points.</p>
@@ -113968,7 +113968,7 @@ <h3>28.20. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_21" title="local-type: typedef-54.21">local-type: typedef-54.21</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_21" title="local-type: typedef-45.21">local-type: typedef-45.21</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities available for component (since SIRI 2.0)</p>
@@ -114139,7 +114139,7 @@ <h3>28.22. The complex type <code>siri:AffectedStopPlaceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_17" title="local-type: typedef-54.17">local-type: typedef-54.17</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_17" title="local-type: typedef-45.17">local-type: typedef-45.17</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities available for VEHICLE JOURNEY (since SIRI 2.0)</p>
@@ -114154,7 +114154,7 @@ <h3>28.22. The complex type <code>siri:AffectedStopPlaceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_18" title="local-type: typedef-54.18">local-type: typedef-54.18</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_18" title="local-type: typedef-45.18">local-type: typedef-45.18</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Quays affected by SITUATION.</p>
@@ -114169,7 +114169,7 @@ <h3>28.22. The complex type <code>siri:AffectedStopPlaceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_19" title="local-type: typedef-54.19">local-type: typedef-54.19</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_19" title="local-type: typedef-45.19">local-type: typedef-45.19</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">PathLinks affected by SITUATION.</p>
@@ -114184,7 +114184,7 @@ <h3>28.22. The complex type <code>siri:AffectedStopPlaceStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_20" title="local-type: typedef-54.20">local-type: typedef-54.20</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_20" title="local-type: typedef-45.20">local-type: typedef-45.20</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Used to restrict STOP PLACEs to some lines</p>
@@ -114420,7 +114420,7 @@ <h3>28.23. The complex type <code>siri:AffectedStopPointStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_1" title="local-type: typedef-54.1">local-type: typedef-54.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_1" title="local-type: typedef-45.1">local-type: typedef-45.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">CONNECTION links from stop.</p>
@@ -114435,7 +114435,7 @@ <h3>28.23. The complex type <code>siri:AffectedStopPointStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_2" title="local-type: typedef-54.2">local-type: typedef-54.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_2" title="local-type: typedef-45.2">local-type: typedef-45.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Used to restrict stop points to some lines</p>
@@ -114639,7 +114639,7 @@ <h3>28.24. The complex type <code>siri:AffectedVehicleJourneyStructure</code></h
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_12" title="local-type: typedef-54.12">local-type: typedef-54.12</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_12" title="local-type: typedef-45.12">local-type: typedef-45.12</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -114654,7 +114654,7 @@ <h3>28.24. The complex type <code>siri:AffectedVehicleJourneyStructure</code></h
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_13" title="local-type: typedef-54.13">local-type: typedef-54.13</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_13" title="local-type: typedef-45.13">local-type: typedef-45.13</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -114800,7 +114800,7 @@ <h3>28.24. The complex type <code>siri:AffectedVehicleJourneyStructure</code></h
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_14" title="local-type: typedef-54.14">local-type: typedef-54.14</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_14" title="local-type: typedef-45.14">local-type: typedef-45.14</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">CALLs making up VEHICLE JOURNEY [equivalent to TPEG pti15 3 stop, 15_5 not-stopping, 15-6 temporary stop route_description_type]</p>
@@ -114815,7 +114815,7 @@ <h3>28.24. The complex type <code>siri:AffectedVehicleJourneyStructure</code></h
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_54_15" title="local-type: typedef-54.15">local-type: typedef-54.15</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_45_15" title="local-type: typedef-45.15">local-type: typedef-45.15</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Facilities available for VEHICLE JOURNEY (since SIRI 2.0)</p>
@@ -115603,8 +115603,8 @@ <h3>28.32. The complex type <code>siri:ZoneRefStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_1">
-          <h3>28.33. The complex type <code>complexType[siri:AffectedStopPointStructure]/ConnectionLinks#complexType (typedef-54.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_1">
+          <h3>28.33. The complex type <code>complexType[siri:AffectedStopPointStructure]/ConnectionLinks#complexType (typedef-45.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115618,7 +115618,7 @@ <h3>28.33. The complex type <code>complexType[siri:AffectedStopPointStructure]/C
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPointStructure]</code><br/><code>  /ConnectionLinks #complexType</code><br/><code>  (typedef-54.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPointStructure]</code><br/><code>  /ConnectionLinks #complexType</code><br/><code>  (typedef-45.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115646,8 +115646,8 @@ <h3>28.33. The complex type <code>complexType[siri:AffectedStopPointStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_10">
-          <h3>28.34. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-54.10)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_10">
+          <h3>28.34. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-45.10)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115661,7 +115661,7 @@ <h3>28.34. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-54.10)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-45.10)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115717,8 +115717,8 @@ <h3>28.34. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_11">
-          <h3>28.35. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-54.11)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_11">
+          <h3>28.35. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-45.11)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115732,7 +115732,7 @@ <h3>28.35. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /RouteLinks #complexType</code><br/><code>  (typedef-54.11)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /RouteLinks #complexType</code><br/><code>  (typedef-45.11)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115760,8 +115760,8 @@ <h3>28.35. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_12">
-          <h3>28.36. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-54.12)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_12">
+          <h3>28.36. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-45.12)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115775,7 +115775,7 @@ <h3>28.36. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-54.12)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-45.12)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115803,8 +115803,8 @@ <h3>28.36. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_13">
-          <h3>28.37. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-54.13)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_13">
+          <h3>28.37. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-45.13)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115818,7 +115818,7 @@ <h3>28.37. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-54.13)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-45.13)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115846,8 +115846,8 @@ <h3>28.37. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_14">
-          <h3>28.38. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-54.14)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_14">
+          <h3>28.38. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-45.14)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115861,7 +115861,7 @@ <h3>28.38. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /Calls #complexType</code><br/><code>  (typedef-54.14)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /Calls #complexType</code><br/><code>  (typedef-45.14)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115889,8 +115889,8 @@ <h3>28.38. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_15">
-          <h3>28.39. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-54.15)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_15">
+          <h3>28.39. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-45.15)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115904,7 +115904,7 @@ <h3>28.39. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /Facilities #complexType</code><br/><code>  (typedef-54.15)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedVehicleJourneyStructure]</code><br/><code>  /Facilities #complexType</code><br/><code>  (typedef-45.15)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115932,8 +115932,8 @@ <h3>28.39. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_16">
-          <h3>28.40. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-54.16)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_16">
+          <h3>28.40. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-45.16)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115947,7 +115947,7 @@ <h3>28.40. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedCallStructure]</code><br/><code>  /AffectedInterchanges #complexType</code><br/><code>  (typedef-54.16)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedCallStructure]</code><br/><code>  /AffectedInterchanges #complexType</code><br/><code>  (typedef-45.16)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -115975,8 +115975,8 @@ <h3>28.40. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_17">
-          <h3>28.41. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedFacilities#complexType (typedef-54.17)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_17">
+          <h3>28.41. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedFacilities#complexType (typedef-45.17)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -115990,7 +115990,7 @@ <h3>28.41. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedFacilities #complexType</code><br/><code>  (typedef-54.17)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedFacilities #complexType</code><br/><code>  (typedef-45.17)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116018,8 +116018,8 @@ <h3>28.41. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_18">
-          <h3>28.42. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedComponents#complexType (typedef-54.18)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_18">
+          <h3>28.42. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedComponents#complexType (typedef-45.18)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116033,7 +116033,7 @@ <h3>28.42. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedComponents #complexType</code><br/><code>  (typedef-54.18)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedComponents #complexType</code><br/><code>  (typedef-45.18)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116061,8 +116061,8 @@ <h3>28.42. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_19">
-          <h3>28.43. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedNavigationPaths#complexType (typedef-54.19)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_19">
+          <h3>28.43. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/AffectedNavigationPaths#complexType (typedef-45.19)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116076,7 +116076,7 @@ <h3>28.43. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedNavigationPaths #complexType</code><br/><code>  (typedef-54.19)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /AffectedNavigationPaths #complexType</code><br/><code>  (typedef-45.19)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116104,8 +116104,8 @@ <h3>28.43. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/A
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_2">
-          <h3>28.44. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-54.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_2">
+          <h3>28.44. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-45.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116119,7 +116119,7 @@ <h3>28.44. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-54.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-45.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116147,8 +116147,8 @@ <h3>28.44. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_20">
-          <h3>28.45. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-54.20)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_20">
+          <h3>28.45. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-45.20)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116162,7 +116162,7 @@ <h3>28.45. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-54.20)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-45.20)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116190,8 +116190,8 @@ <h3>28.45. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_21">
-          <h3>28.46. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-54.21)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_21">
+          <h3>28.46. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-45.21)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116205,7 +116205,7 @@ <h3>28.46. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceComponentStructure]</code><br/><code>  /AffectedFacilities #complexType</code><br/><code>  (typedef-54.21)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedStopPlaceComponentStructure]</code><br/><code>  /AffectedFacilities #complexType</code><br/><code>  (typedef-45.21)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116233,8 +116233,8 @@ <h3>28.46. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_3">
-          <h3>28.47. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-54.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_3">
+          <h3>28.47. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-45.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116248,7 +116248,7 @@ <h3>28.47. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedModesStructure]</code><br/><code>  /Mode #complexType</code><br/><code>  (typedef-54.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedModesStructure]</code><br/><code>  /Mode #complexType</code><br/><code>  (typedef-45.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116433,8 +116433,8 @@ <h3>28.47. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_4">
-          <h3>28.48. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-54.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_4">
+          <h3>28.48. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-45.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116448,7 +116448,7 @@ <h3>28.48. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /Routes #complexType</code><br/><code>  (typedef-54.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /Routes #complexType</code><br/><code>  (typedef-45.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116476,8 +116476,8 @@ <h3>28.48. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_5">
-          <h3>28.49. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-54.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_5">
+          <h3>28.49. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-45.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116491,7 +116491,7 @@ <h3>28.49. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /Sections #complexType</code><br/><code>  (typedef-54.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /Sections #complexType</code><br/><code>  (typedef-45.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116519,8 +116519,8 @@ <h3>28.49. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_6">
-          <h3>28.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-54.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_6">
+          <h3>28.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-45.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116534,7 +116534,7 @@ <h3>28.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-54.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /StopPoints #complexType</code><br/><code>  (typedef-45.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116562,8 +116562,8 @@ <h3>28.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_7">
-          <h3>28.51. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-54.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_7">
+          <h3>28.51. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-45.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116577,7 +116577,7 @@ <h3>28.51. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /StopPlaces #complexType</code><br/><code>  (typedef-54.7)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedLineStructure]</code><br/><code>  /StopPlaces #complexType</code><br/><code>  (typedef-45.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116605,8 +116605,8 @@ <h3>28.51. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_8">
-          <h3>28.52. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-54.8)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_8">
+          <h3>28.52. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-45.8)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116620,7 +116620,7 @@ <h3>28.52. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedSectionStructure]</code><br/><code>  /IndirectSectionRef #complexType</code><br/><code>  (typedef-54.8)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedSectionStructure]</code><br/><code>  /IndirectSectionRef #complexType</code><br/><code>  (typedef-45.8)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -116810,8 +116810,8 @@ <h3>28.52. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_54_9">
-          <h3>28.53. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-54.9)</code></h3>
+        <div class="sect2" id="local_type_typedef_45_9">
+          <h3>28.53. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-45.9)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -116825,7 +116825,7 @@ <h3>28.53. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /Sections #complexType</code><br/><code>  (typedef-54.9)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AffectedRouteStructure]</code><br/><code>  /Sections #complexType</code><br/><code>  (typedef-45.9)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -117452,7 +117452,7 @@ <h3>29.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_36_2" class="tableblock"><code>element[siri:Predictability]</code><br/><code>  #simpleType</code><br/><code>  (typedef-36.2)</code></p>
+                    <p id="local_type_typedef_38_2" class="tableblock"><code>element[siri:Predictability]</code><br/><code>  #simpleType</code><br/><code>  (typedef-38.2)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -117496,7 +117496,7 @@ <h3>29.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_36_1" class="tableblock"><code>element[siri:VerificationStatus]</code><br/><code>  #simpleType</code><br/><code>  (typedef-36.1)</code></p>
+                    <p id="local_type_typedef_38_1" class="tableblock"><code>element[siri:VerificationStatus]</code><br/><code>  #simpleType</code><br/><code>  (typedef-38.1)</code></p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock anno-text">-</p>
@@ -125348,7 +125348,7 @@ <h3>38.4. The complex type <code>siri:AnnotatedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_83_1" title="local-type: typedef-83.1">local-type: typedef-83.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_64_1" title="local-type: typedef-64.1">local-type: typedef-64.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">DESTINATIONs to which the LINE runs. Detail level is 'normal'</p>
@@ -125363,7 +125363,7 @@ <h3>38.4. The complex type <code>siri:AnnotatedLineStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_83_2" title="local-type: typedef-83.2">local-type: typedef-83.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_64_2" title="local-type: typedef-64.2">local-type: typedef-64.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">DIRECTIONs and Stops for the LINE. 'normal'</p>
@@ -125461,7 +125461,7 @@ <h3>38.5. The complex type <code>siri:RouteDirectionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_83_3" title="local-type: typedef-83.3">local-type: typedef-83.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_64_3" title="local-type: typedef-64.3">local-type: typedef-64.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JourneyPatterns in Direction of route (since SIRI 2.0)</p>
@@ -125595,7 +125595,7 @@ <h3>38.6. The complex type <code>siri:StopPointInPatternStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_81_1" title="local-type: typedef-81.1">local-type: typedef-81.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_63_1" title="local-type: typedef-63.1">local-type: typedef-63.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Service features of stop. Detail level is 'full'</p>
@@ -125610,7 +125610,7 @@ <h3>38.6. The complex type <code>siri:StopPointInPatternStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_81_2" title="local-type: typedef-81.2">local-type: typedef-81.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_63_2" title="local-type: typedef-63.2">local-type: typedef-63.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">LINEs that use stop. Detail level is 'full'</p>
@@ -125711,8 +125711,8 @@ <h3>38.6. The complex type <code>siri:StopPointInPatternStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_81_1">
-          <h3>38.7. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-81.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_63_1">
+          <h3>38.7. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-63.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125726,7 +125726,7 @@ <h3>38.7. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-81.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-63.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -125780,8 +125780,8 @@ <h3>38.7. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_81_2">
-          <h3>38.8. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-81.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_63_2">
+          <h3>38.8. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-63.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125795,7 +125795,7 @@ <h3>38.8. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-81.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-63.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -125849,8 +125849,8 @@ <h3>38.8. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_83_1">
-          <h3>38.9. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-83.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_64_1">
+          <h3>38.9. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-64.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125864,7 +125864,7 @@ <h3>38.9. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedLineStructure]</code><br/><code>  /Destinations #complexType</code><br/><code>  (typedef-83.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedLineStructure]</code><br/><code>  /Destinations #complexType</code><br/><code>  (typedef-64.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -125892,8 +125892,8 @@ <h3>38.9. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_83_2">
-          <h3>38.10. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-83.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_64_2">
+          <h3>38.10. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-64.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125907,7 +125907,7 @@ <h3>38.10. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direc
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedLineStructure]</code><br/><code>  /Directions #complexType</code><br/><code>  (typedef-83.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedLineStructure]</code><br/><code>  /Directions #complexType</code><br/><code>  (typedef-64.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -125935,8 +125935,8 @@ <h3>38.10. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_83_3">
-          <h3>38.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-83.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_64_3">
+          <h3>38.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-64.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125950,7 +125950,7 @@ <h3>38.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns #complexType</code><br/><code>  (typedef-83.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns #complexType</code><br/><code>  (typedef-64.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -125968,7 +125968,7 @@ <h3>38.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                     <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_83_4" title="local-type: typedef-83.4">local-type: typedef-83.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_64_4" title="local-type: typedef-64.4">local-type: typedef-64.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JourneyPattern. (since SIRI 2.0)</p>
@@ -125978,8 +125978,8 @@ <h3>38.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_83_4">
-          <h3>38.12. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-83.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_64_4">
+          <h3>38.12. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-64.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -125993,7 +125993,7 @@ <h3>38.12. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns/JourneyPattern #complexType</code><br/><code>  (typedef-83.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns/JourneyPattern #complexType</code><br/><code>  (typedef-64.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -126041,7 +126041,7 @@ <h3>38.12. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_83_5" title="local-type: typedef-83.5">local-type: typedef-83.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_64_5" title="local-type: typedef-64.5">local-type: typedef-64.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Ordered collection of STOP POINTs the LINE and direction . Detail level is 'stops'. (since SIRI 2.0)</p>
@@ -126051,8 +126051,8 @@ <h3>38.12. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_83_5">
-          <h3>38.13. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-83.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_64_5">
+          <h3>38.13. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-64.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -126066,7 +126066,7 @@ <h3>38.13. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code><br/><code>  (typedef-83.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:RouteDirectionStructure]</code><br/><code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code><br/><code>  (typedef-64.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -126229,7 +126229,7 @@ <h3>39.2. The complex type <code>siri:AnnotatedStopPointStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_81_1" title="local-type: typedef-81.1">local-type: typedef-81.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_63_1" title="local-type: typedef-63.1">local-type: typedef-63.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Service features of stop. Detail level is 'full'</p>
@@ -126244,7 +126244,7 @@ <h3>39.2. The complex type <code>siri:AnnotatedStopPointStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_81_2" title="local-type: typedef-81.2">local-type: typedef-81.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_63_2" title="local-type: typedef-63.2">local-type: typedef-63.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">LINEs that use stop. Detail level is 'full'</p>
@@ -126282,8 +126282,8 @@ <h3>39.2. The complex type <code>siri:AnnotatedStopPointStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_81_1">
-          <h3>39.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-81.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_63_1">
+          <h3>39.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-63.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -126297,7 +126297,7 @@ <h3>39.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-81.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Features #complexType</code><br/><code>  (typedef-63.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -126351,8 +126351,8 @@ <h3>39.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_81_2">
-          <h3>39.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-81.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_63_2">
+          <h3>39.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-63.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -126366,7 +126366,7 @@ <h3>39.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-81.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AnnotatedStopPointStructure]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-63.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -127140,7 +127140,7 @@ <h3>40.12. The group <code>siri:ProductionTimetableTopicGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_1" title="local-type: typedef-97.1">local-type: typedef-97.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_1" title="local-type: typedef-103.1">local-type: typedef-103.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only vehicles along the given LINEs.</p>
@@ -127239,7 +127239,7 @@ <h3>40.13. The group <code>siri:SiriProductionTimetableIndexGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_2" title="local-type: typedef-97.2">local-type: typedef-97.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_2" title="local-type: typedef-103.2">local-type: typedef-103.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for a subscription to the Production Timetable Service.</p>
@@ -127267,7 +127267,7 @@ <h3>40.13. The group <code>siri:SiriProductionTimetableIndexGroup</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_3" title="local-type: typedef-97.3">local-type: typedef-97.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_3" title="local-type: typedef-103.3">local-type: typedef-103.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request for information about ProductionTimetable Service Capabilities. Answered with a ProductionTimetableCapabilitiesResponse.</p>
@@ -127940,7 +127940,7 @@ <h3>40.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_7" title="local-type: typedef-97.7">local-type: typedef-97.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_7" title="local-type: typedef-103.7">local-type: typedef-103.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -128520,7 +128520,7 @@ <h3>40.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_1" title="local-type: typedef-97.1">local-type: typedef-97.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_1" title="local-type: typedef-103.1">local-type: typedef-103.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only vehicles along the given LINEs.</p>
@@ -128733,7 +128733,7 @@ <h3>40.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_4" title="local-type: typedef-97.4">local-type: typedef-97.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_4" title="local-type: typedef-103.4">local-type: typedef-103.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -128748,7 +128748,7 @@ <h3>40.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_5" title="local-type: typedef-97.5">local-type: typedef-97.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_5" title="local-type: typedef-103.5">local-type: typedef-103.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policiy capabilities.</p>
@@ -128763,7 +128763,7 @@ <h3>40.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_97_6" title="local-type: typedef-97.6">local-type: typedef-97.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_6" title="local-type: typedef-103.6">local-type: typedef-103.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Subscription Policy capabilities.</p>
@@ -128998,8 +128998,8 @@ <h3>40.22. The complex type <code>siri:TimetableValidityPeriod</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_1">
-          <h3>40.23. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-97.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_1">
+          <h3>40.23. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-103.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129013,7 +129013,7 @@ <h3>40.23. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ProductionTimetableTopicGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-97.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ProductionTimetableTopicGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-103.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -129041,8 +129041,8 @@ <h3>40.23. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_2">
-          <h3>40.24. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-97.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_2">
+          <h3>40.24. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-103.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129056,7 +129056,7 @@ <h3>40.24. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ProductionTimetableSubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-97.2)</code></p>
+                    <p class="tableblock"><code>element[siri:ProductionTimetableSubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ProductionTimetableSubscriptionStructure" title="siri:ProductionTimetableSubscriptionStructure">siri:ProductionTimetableSubscriptionStructure</a></p>
@@ -129172,8 +129172,8 @@ <h3>40.24. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_3">
-          <h3>40.25. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-97.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_3">
+          <h3>40.25. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-103.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129187,7 +129187,7 @@ <h3>40.25. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ProductionTimetableCapabilitiesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-97.3)</code></p>
+                    <p class="tableblock"><code>element[siri:ProductionTimetableCapabilitiesRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceCapabilitiesRequestStructure" title="siri:ServiceCapabilitiesRequestStructure">siri:ServiceCapabilitiesRequestStructure</a></p>
@@ -129276,8 +129276,8 @@ <h3>40.25. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_4">
-          <h3>40.26. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-97.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_4">
+          <h3>40.26. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-103.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129291,7 +129291,7 @@ <h3>40.26. The complex type <code>complexType[siri:ProductionTimetableServiceCap
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-97.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-103.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -129395,8 +129395,8 @@ <h3>40.26. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_5">
-          <h3>40.27. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-97.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_5">
+          <h3>40.27. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-103.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129410,7 +129410,7 @@ <h3>40.27. The complex type <code>complexType[siri:ProductionTimetableServiceCap
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-97.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-103.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -129495,8 +129495,8 @@ <h3>40.27. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_6">
-          <h3>40.28. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-97.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_6">
+          <h3>40.28. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-103.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129510,7 +129510,7 @@ <h3>40.28. The complex type <code>complexType[siri:ProductionTimetableServiceCap
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /SubscriptionPolicy #complexType</code><br/><code>  (typedef-97.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]</code><br/><code>  /SubscriptionPolicy #complexType</code><br/><code>  (typedef-103.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -129536,8 +129536,8 @@ <h3>40.28. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_97_7">
-          <h3>40.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-97.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_103_7">
+          <h3>40.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-103.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -129551,7 +129551,7 @@ <h3>40.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ProductionTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-97.7)</code></p>
+                    <p class="tableblock"><code>element[siri:ProductionTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -130100,7 +130100,7 @@ <h3>41.11. The group <code>siri:SituationExchangePayloadGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_3" title="local-type: typedef-92.3">local-type: typedef-92.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_3" title="local-type: typedef-100.3">local-type: typedef-100.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">SITUATIONs in Delivery.</p>
@@ -130640,7 +130640,7 @@ <h3>41.14. The group <code>siri:SituationExchangeTopicGroup</code></h3>
                     <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_2" title="local-type: typedef-92.2">local-type: typedef-92.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_2" title="local-type: typedef-100.2">local-type: typedef-100.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only situations along the given LINEs.</p>
@@ -130835,7 +130835,7 @@ <h3>41.14. The group <code>siri:SituationExchangeTopicGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_1" title="local-type: typedef-92.1">local-type: typedef-92.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_1" title="local-type: typedef-100.1">local-type: typedef-100.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Parameters to filter Situation Exchange Service requests, based on the SITUATION Road. Logically ANDed with other values.</p>
@@ -131096,7 +131096,7 @@ <h3>41.17. The group <code>siri:SituationNetworkFilterGroup</code></h3>
                     <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_2" title="local-type: typedef-92.2">local-type: typedef-92.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_2" title="local-type: typedef-100.2">local-type: typedef-100.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only situations along the given LINEs.</p>
@@ -131887,7 +131887,7 @@ <h3>41.26. The complex type <code>siri:SituationExchangeCapabilitiesResponseStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_8" title="local-type: typedef-92.8">local-type: typedef-92.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_8" title="local-type: typedef-100.8">local-type: typedef-100.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -132211,7 +132211,7 @@ <h3>41.28. The complex type <code>siri:SituationExchangeDeliveryStructure</code>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_3" title="local-type: typedef-92.3">local-type: typedef-92.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_3" title="local-type: typedef-100.3">local-type: typedef-100.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">SITUATIONs in Delivery.</p>
@@ -132713,7 +132713,7 @@ <h3>41.29. The complex type <code>siri:SituationExchangeRequestStructure</code><
                     <p class="tableblock"><span title="optional, single, part of a choice">-0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_2" title="local-type: typedef-92.2">local-type: typedef-92.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_2" title="local-type: typedef-100.2">local-type: typedef-100.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filter the results to include only situations along the given LINEs.</p>
@@ -132908,7 +132908,7 @@ <h3>41.29. The complex type <code>siri:SituationExchangeRequestStructure</code><
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_1" title="local-type: typedef-92.1">local-type: typedef-92.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_1" title="local-type: typedef-100.1">local-type: typedef-100.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Parameters to filter Situation Exchange Service requests, based on the SITUATION Road. Logically ANDed with other values.</p>
@@ -133057,7 +133057,7 @@ <h3>41.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_4" title="local-type: typedef-92.4">local-type: typedef-92.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_4" title="local-type: typedef-100.4">local-type: typedef-100.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Filtering Capabilities.</p>
@@ -133072,7 +133072,7 @@ <h3>41.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_5" title="local-type: typedef-92.5">local-type: typedef-92.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_5" title="local-type: typedef-100.5">local-type: typedef-100.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -133102,7 +133102,7 @@ <h3>41.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_6" title="local-type: typedef-92.6">local-type: typedef-92.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_6" title="local-type: typedef-100.6">local-type: typedef-100.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Access control capabilities.</p>
@@ -133117,7 +133117,7 @@ <h3>41.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_92_7" title="local-type: typedef-92.7">local-type: typedef-92.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_7" title="local-type: typedef-100.7">local-type: typedef-100.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Response capabilities.</p>
@@ -133221,7 +133221,7 @@ <h3>41.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -133241,7 +133241,7 @@ <h3>41.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -133256,7 +133256,7 @@ <h3>41.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -133417,8 +133417,8 @@ <h3>41.32. The complex type <code>siri:SituationExchangeSubscriptionStructure</c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>41.33. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>41.33. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133432,7 +133432,7 @@ <h3>41.33. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133484,8 +133484,8 @@ <h3>41.33. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>41.34. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>41.34. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133499,7 +133499,7 @@ <h3>41.34. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133551,8 +133551,8 @@ <h3>41.34. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>41.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>41.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133566,7 +133566,7 @@ <h3>41.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133605,8 +133605,8 @@ <h3>41.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_1">
-          <h3>41.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-92.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_1">
+          <h3>41.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-100.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133620,7 +133620,7 @@ <h3>41.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:SituationExchangeTopicGroup]</code><br/><code>  /SituationRoadFilter #complexType</code><br/><code>  (typedef-92.1)</code></p>
+                    <p class="tableblock"><code>group[siri:SituationExchangeTopicGroup]</code><br/><code>  /SituationRoadFilter #complexType</code><br/><code>  (typedef-100.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133648,8 +133648,8 @@ <h3>41.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_2">
-          <h3>41.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-92.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_2">
+          <h3>41.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-100.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133663,7 +133663,7 @@ <h3>41.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:SituationNetworkFilterGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-92.2)</code></p>
+                    <p class="tableblock"><code>group[siri:SituationNetworkFilterGroup]</code><br/><code>  /Lines #complexType</code><br/><code>  (typedef-100.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133691,8 +133691,8 @@ <h3>41.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_3">
-          <h3>41.38. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-92.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_3">
+          <h3>41.38. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-100.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133706,7 +133706,7 @@ <h3>41.38. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:SituationExchangePayloadGroup]</code><br/><code>  /Situations #complexType</code><br/><code>  (typedef-92.3)</code></p>
+                    <p class="tableblock"><code>group[siri:SituationExchangePayloadGroup]</code><br/><code>  /Situations #complexType</code><br/><code>  (typedef-100.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133749,8 +133749,8 @@ <h3>41.38. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_4">
-          <h3>41.39. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-92.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_4">
+          <h3>41.39. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-100.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133764,7 +133764,7 @@ <h3>41.39. The complex type <code>complexType[siri:SituationExchangeServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-92.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-100.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -133961,8 +133961,8 @@ <h3>41.39. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_5">
-          <h3>41.40. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-92.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_5">
+          <h3>41.40. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-100.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -133976,7 +133976,7 @@ <h3>41.40. The complex type <code>complexType[siri:SituationExchangeServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-92.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-100.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -134079,8 +134079,8 @@ <h3>41.40. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_6">
-          <h3>41.41. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-92.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_6">
+          <h3>41.41. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-100.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -134094,7 +134094,7 @@ <h3>41.41. The complex type <code>complexType[siri:SituationExchangeServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-92.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-100.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityAccessControlStructure" title="siri:CapabilityAccessControlStructure">siri:CapabilityAccessControlStructure</a></p>
@@ -134156,8 +134156,8 @@ <h3>41.41. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_7">
-          <h3>41.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-92.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_7">
+          <h3>41.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-100.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -134171,7 +134171,7 @@ <h3>41.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-92.7)</code></p>
+                    <p class="tableblock"><code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-100.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -134184,8 +134184,8 @@ <h3>41.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_92_8">
-          <h3>41.43. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-92.8)</code></h3>
+        <div class="sect2" id="local_type_typedef_100_8">
+          <h3>41.43. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-100.8)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -134199,7 +134199,7 @@ <h3>41.43. The complex type <code>element[siri:SituationExchangePermissions]#com
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SituationExchangePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-92.8)</code></p>
+                    <p class="tableblock"><code>element[siri:SituationExchangePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-100.8)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -135355,7 +135355,7 @@ <h3>42.20. The group <code>siri:StopMonitoringRequestPolicyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_1" title="local-type: typedef-91.1">local-type: typedef-91.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_1" title="local-type: typedef-101.1">local-type: typedef-101.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">If calls are to be returned, maximum number of calls to include in response. If absent, exclude all calls.</p>
@@ -137000,7 +137000,7 @@ <h3>42.32. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_5" title="local-type: typedef-91.5">local-type: typedef-91.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_5" title="local-type: typedef-101.5">local-type: typedef-101.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participants permissions to use the service, Only returned if requested.</p>
@@ -137846,7 +137846,7 @@ <h3>42.36. The complex type <code>siri:StopMonitoringFilterStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_1" title="local-type: typedef-91.1">local-type: typedef-91.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_1" title="local-type: typedef-101.1">local-type: typedef-101.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">If calls are to be returned, maximum number of calls to include in response. If absent, exclude all calls.</p>
@@ -138273,7 +138273,7 @@ <h3>42.38. The complex type <code>siri:StopMonitoringRequestStructure</code></h3
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_1" title="local-type: typedef-91.1">local-type: typedef-91.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_1" title="local-type: typedef-101.1">local-type: typedef-101.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">If calls are to be returned, maximum number of calls to include in response. If absent, exclude all calls.</p>
@@ -138371,7 +138371,7 @@ <h3>42.39. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_2" title="local-type: typedef-91.2">local-type: typedef-91.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_2" title="local-type: typedef-101.2">local-type: typedef-101.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Available Filtering Capabilities.</p>
@@ -138386,7 +138386,7 @@ <h3>42.39. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_3" title="local-type: typedef-91.3">local-type: typedef-91.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_3" title="local-type: typedef-101.3">local-type: typedef-101.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Available Request Policy capabilities.</p>
@@ -138431,7 +138431,7 @@ <h3>42.39. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_4" title="local-type: typedef-91.4">local-type: typedef-91.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_4" title="local-type: typedef-101.4">local-type: typedef-101.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Available Optional Response capabilities.</p>
@@ -138520,7 +138520,7 @@ <h3>42.40. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -138540,7 +138540,7 @@ <h3>42.40. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -138555,7 +138555,7 @@ <h3>42.40. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -138570,7 +138570,7 @@ <h3>42.40. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_91_6" title="local-type: typedef-91.6">local-type: typedef-91.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_101_6" title="local-type: typedef-101.6">local-type: typedef-101.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The monitoring points that the participant may access.</p>
@@ -139010,8 +139010,8 @@ <h3>42.43. The complex type <code>siri:StopNoticeStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>42.44. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>42.44. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139025,7 +139025,7 @@ <h3>42.44. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139077,8 +139077,8 @@ <h3>42.44. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>42.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>42.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139092,7 +139092,7 @@ <h3>42.45. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139144,8 +139144,8 @@ <h3>42.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139159,7 +139159,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139198,8 +139198,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_1">
-          <h3>42.47. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-91.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_1">
+          <h3>42.47. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-101.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139213,7 +139213,7 @@ <h3>42.47. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:StopMonitoringRequestPolicyGroup]</code><br/><code>  /MaximumNumberOfCalls #complexType</code><br/><code>  (typedef-91.1)</code></p>
+                    <p class="tableblock"><code>group[siri:StopMonitoringRequestPolicyGroup]</code><br/><code>  /MaximumNumberOfCalls #complexType</code><br/><code>  (typedef-101.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139252,8 +139252,8 @@ <h3>42.47. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_2">
-          <h3>42.48. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-91.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_2">
+          <h3>42.48. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-101.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139267,7 +139267,7 @@ <h3>42.48. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-91.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-101.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139373,8 +139373,8 @@ <h3>42.48. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_3">
-          <h3>42.49. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-91.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_3">
+          <h3>42.49. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-101.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139388,7 +139388,7 @@ <h3>42.49. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-91.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-101.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__StopMonitoringCapabilityRequestPolicyStructure" title="siri:StopMonitoringCapabilityRequestPolicyStructure">siri:StopMonitoringCapabilityRequestPolicyStructure</a></p>
@@ -139591,8 +139591,8 @@ <h3>42.49. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_4">
-          <h3>42.50. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-91.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_4">
+          <h3>42.50. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-101.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139606,7 +139606,7 @@ <h3>42.50. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-91.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-101.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -139645,8 +139645,8 @@ <h3>42.50. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_5">
-          <h3>42.51. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-91.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_5">
+          <h3>42.51. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-101.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139660,7 +139660,7 @@ <h3>42.51. The complex type <code>element[siri:StopMonitoringPermissions]#comple
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-91.5)</code></p>
+                    <p class="tableblock"><code>element[siri:StopMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-101.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -139713,8 +139713,8 @@ <h3>42.51. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_91_6">
-          <h3>42.52. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-91.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_101_6">
+          <h3>42.52. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-101.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -139728,7 +139728,7 @@ <h3>42.52. The complex type <code>complexType[siri:StopMonitoringServicePermissi
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopMonitoringServicePermissionStructure]</code><br/><code>  /StopMonitorPermissions #complexType</code><br/><code>  (typedef-91.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopMonitoringServicePermissionStructure]</code><br/><code>  /StopMonitorPermissions #complexType</code><br/><code>  (typedef-101.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -140525,7 +140525,7 @@ <h3>43.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_3" title="local-type: typedef-100.3">local-type: typedef-100.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_3" title="local-type: typedef-99.3">local-type: typedef-99.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -141256,7 +141256,7 @@ <h3>43.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_1" title="local-type: typedef-100.1">local-type: typedef-100.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_1" title="local-type: typedef-99.1">local-type: typedef-99.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Available Filtering Capabilities.</p>
@@ -141286,7 +141286,7 @@ <h3>43.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_2" title="local-type: typedef-100.2">local-type: typedef-100.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_2" title="local-type: typedef-99.2">local-type: typedef-99.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Access control that can be used.</p>
@@ -141390,7 +141390,7 @@ <h3>43.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -141410,7 +141410,7 @@ <h3>43.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -141425,7 +141425,7 @@ <h3>43.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -141440,7 +141440,7 @@ <h3>43.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_100_4" title="local-type: typedef-100.4">local-type: typedef-100.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_99_4" title="local-type: typedef-99.4">local-type: typedef-99.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The monitoring points that the participant may access.</p>
@@ -142047,8 +142047,8 @@ <h3>43.22. The complex type <code>siri:TimetabledStopVisitStructure</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>43.23. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>43.23. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142062,7 +142062,7 @@ <h3>43.23. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -142114,8 +142114,8 @@ <h3>43.23. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>43.24. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>43.24. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142129,7 +142129,7 @@ <h3>43.24. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -142181,8 +142181,8 @@ <h3>43.24. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>43.25. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>43.25. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142196,7 +142196,7 @@ <h3>43.25. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -142235,8 +142235,8 @@ <h3>43.25. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_100_1">
-          <h3>43.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-100.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_99_1">
+          <h3>43.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-99.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142250,7 +142250,7 @@ <h3>43.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-100.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopTimetableServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-99.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -142302,8 +142302,8 @@ <h3>43.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_100_2">
-          <h3>43.27. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-100.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_99_2">
+          <h3>43.27. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-99.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142317,7 +142317,7 @@ <h3>43.27. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopTimetableServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-100.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopTimetableServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-99.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityAccessControlStructure" title="siri:CapabilityAccessControlStructure">siri:CapabilityAccessControlStructure</a></p>
@@ -142392,8 +142392,8 @@ <h3>43.27. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_100_3">
-          <h3>43.28. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-100.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_99_3">
+          <h3>43.28. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-99.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142407,7 +142407,7 @@ <h3>43.28. The complex type <code>element[siri:StopTimetablePermissions]#complex
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:StopTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-100.3)</code></p>
+                    <p class="tableblock"><code>element[siri:StopTimetablePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-99.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -142460,8 +142460,8 @@ <h3>43.28. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_100_4">
-          <h3>43.29. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-100.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_99_4">
+          <h3>43.29. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-99.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -142475,7 +142475,7 @@ <h3>43.29. The complex type <code>complexType[siri:StopTimetableServicePermissio
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:StopTimetableServicePermissionStructure]</code><br/><code>  /StopMonitorPermissions #complexType</code><br/><code>  (typedef-100.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:StopTimetableServicePermissionStructure]</code><br/><code>  /StopMonitorPermissions #complexType</code><br/><code>  (typedef-99.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -143414,7 +143414,7 @@ <h3>46.2. The complex type <code>siri:AbstractPermissionStructure</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -143506,8 +143506,8 @@ <h3>46.4. The complex type <code>siri:CapabilityAccessControlStructure</code></h
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>46.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>46.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -143521,7 +143521,7 @@ <h3>46.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -143707,7 +143707,7 @@ <h3>47.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local_type_typedef_55_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-55.1)</code></p>
+                    <p id="local_type_typedef_30_1" class="tableblock"><code>attribute[lang]</code><br/><code>  #simpleType</code><br/><code>  (typedef-30.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">Union({xs:language}, {xs:string: (empty restriction)})</p>
@@ -145334,7 +145334,7 @@ <h3>49.12. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code></h3>
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_1" title="local-type: typedef-103.1">local-type: typedef-103.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_1" title="local-type: typedef-94.1">local-type: typedef-94.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">If calls are to be returned, maximum number of calls to include in response. If absent, exclude all calls. (since SIRI 2.0).</p>
@@ -146070,7 +146070,7 @@ <h3>49.17. The complex type <code>siri:VehicleActivityStructure</code></h3>
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_2" title="local-type: typedef-103.2">local-type: typedef-103.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_2" title="local-type: typedef-94.2">local-type: typedef-94.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Monitored VEHICLE JOURNEY that VEHICLE is following.</p>
@@ -146267,7 +146267,7 @@ <h3>49.18. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_7" title="local-type: typedef-103.7">local-type: typedef-103.7</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_7" title="local-type: typedef-94.7">local-type: typedef-94.7</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Participant's permissions to use the service.</p>
@@ -146993,7 +146993,7 @@ <h3>49.23. The complex type <code>siri:VehicleMonitoringRequestStructure</code><
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_1" title="local-type: typedef-103.1">local-type: typedef-103.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_1" title="local-type: typedef-94.1">local-type: typedef-94.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">If calls are to be returned, maximum number of calls to include in response. If absent, exclude all calls. (since SIRI 2.0).</p>
@@ -147103,7 +147103,7 @@ <h3>49.24. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_3" title="local-type: typedef-103.3">local-type: typedef-103.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_3" title="local-type: typedef-94.3">local-type: typedef-94.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Topic Filtering Capabilities.</p>
@@ -147118,7 +147118,7 @@ <h3>49.24. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_4" title="local-type: typedef-103.4">local-type: typedef-103.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_4" title="local-type: typedef-94.4">local-type: typedef-94.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request Policy capabilities.</p>
@@ -147148,7 +147148,7 @@ <h3>49.24. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_5" title="local-type: typedef-103.5">local-type: typedef-103.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_5" title="local-type: typedef-94.5">local-type: typedef-94.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Access control capabilities.</p>
@@ -147163,7 +147163,7 @@ <h3>49.24. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_6" title="local-type: typedef-103.6">local-type: typedef-103.6</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_6" title="local-type: typedef-94.6">local-type: typedef-94.6</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Optional Response capabilities.</p>
@@ -147267,7 +147267,7 @@ <h3>49.25. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_57_1" title="local-type: typedef-57.1">local-type: typedef-57.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_85_1" title="local-type: typedef-85.1">local-type: typedef-85.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Permissions for general capabilities.</p>
@@ -147287,7 +147287,7 @@ <h3>49.25. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_2" title="local-type: typedef-51.2">local-type: typedef-51.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_2" title="local-type: typedef-42.2">local-type: typedef-42.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The OPERATOR data that the participant may access.</p>
@@ -147302,7 +147302,7 @@ <h3>49.25. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_51_1" title="local-type: typedef-51.1">local-type: typedef-51.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_42_1" title="local-type: typedef-42.1">local-type: typedef-42.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The LINEs that the participant may access.</p>
@@ -147317,7 +147317,7 @@ <h3>49.25. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                     <p class="tableblock"><strong title="mandatory, single">1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_103_8" title="local-type: typedef-103.8">local-type: typedef-103.8</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_94_8" title="local-type: typedef-94.8">local-type: typedef-94.8</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">The Vehicle Monitors (DIUSPLAY ASSIGNMENTs) that the participant may access.</p>
@@ -147583,8 +147583,8 @@ <h3>49.27. The complex type <code>siri:VehicleMonitorPermissionStructure</code><
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_2">
-          <h3>49.28. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-35.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_2">
+          <h3>49.28. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-36.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147598,7 +147598,7 @@ <h3>49.28. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-35.2)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /TrainElements #complexType</code><br/><code>  (typedef-36.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147652,8 +147652,8 @@ <h3>49.28. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_3">
-          <h3>49.29. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-35.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_3">
+          <h3>49.29. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-36.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147667,7 +147667,7 @@ <h3>49.29. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-35.3)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /Trains #complexType</code><br/><code>  (typedef-36.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147719,8 +147719,8 @@ <h3>49.29. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_35_4">
-          <h3>49.30. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-35.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_36_4">
+          <h3>49.30. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-36.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147734,7 +147734,7 @@ <h3>49.30. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-35.4)</code></p>
+                    <p class="tableblock"><code>group[siri:JourneyFormationGroup]</code><br/><code>  /CompoundTrains #complexType</code><br/><code>  (typedef-36.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147786,8 +147786,8 @@ <h3>49.30. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_43_4">
-          <h3>49.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-43.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_1">
+          <h3>49.31. The complex type <code>element[siri:LinePermissions]#complexType (typedef-42.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147801,7 +147801,7 @@ <h3>49.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-43.4)</code></p>
+                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147810,70 +147810,51 @@ <h3>49.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                     <p class="tableblock anno-text">-</p>
                   </td>
                 </tr>
+                <tr>
+                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-b)</p>
+                  </td>
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:TrainNumberRef</strong></code></p>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>a</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AllowAll" title="siri:AllowAll">siri:AllowAll</a></strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__TrainNumberRefStructure" title="siri:TrainNumberRefStructure">siri:TrainNumberRefStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">TRAIN NUMBER assigned to VEHICLE JOURNEY. +SIRI 2.0</p>
+                    <p class="tableblock darkbrown">Allow access to all topics known to the service.</p>
                   </td>
                 </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-        <div class="sect2" id="local_type_typedef_43_5">
-          <h3>49.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-43.5)</code></h3>
-          <div class="sectionbody">
-            <table class="tableblock frame-all grid-all spread">
-              <colgroup span="1">
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:11.9047619047619%"/>
-                <col span="1" style="width:1.19047619047619%"/>
-                <col span="1" style="width:23.8095238095238%"/>
-                <col span="1" style="width:35.7142857142857%"/>
-              </colgroup>
-              <tbody>
                 <tr>
-                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-43.5)</code></p>
-                  </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"></p>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><em>b</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">-</p>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:JourneyPartInfo</strong></code></p>
+                    <p class="tableblock"><code><strong>siri:LinePermission</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
+                    <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__JourneyPartInfoStructure" title="siri:JourneyPartInfoStructure">siri:JourneyPartInfoStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LinePermissionStructure" title="siri:LinePermissionStructure">siri:LinePermissionStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Information about Parts of JOURNEY (since SIRI 2.0)</p>
+                    <p class="tableblock darkbrown">Participant's permission for this LINE.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_1">
-          <h3>49.33. The complex type <code>element[siri:LinePermissions]#complexType (typedef-51.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_42_2">
+          <h3>49.32. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-42.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147887,7 +147868,7 @@ <h3>49.33. The complex type <code>element[siri:LinePermissions]#complexType (typ
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:LinePermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.1)</code></p>
+                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-42.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147923,24 +147904,24 @@ <h3>49.33. The complex type <code>element[siri:LinePermissions]#complexType (typ
                     <p class="tableblock"><em>b</em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:LinePermission</strong></code></p>
+                    <p class="tableblock"><code><strong>siri:OperatorPermission</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__LinePermissionStructure" title="siri:LinePermissionStructure">siri:LinePermissionStructure</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__OperatorPermissionStructure" title="siri:OperatorPermissionStructure">siri:OperatorPermissionStructure</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Participant's permission for this LINE.</p>
+                    <p class="tableblock darkbrown">Participant's permission for this OPERATOR.</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_51_2">
-          <h3>49.34. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-51.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_56_4">
+          <h3>49.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-56.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -147954,7 +147935,7 @@ <h3>49.34. The complex type <code>element[siri:OperatorPermissions]#complexType
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:OperatorPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-51.2)</code></p>
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /TrainNumbers #complexType</code><br/><code>  (typedef-56.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -147963,51 +147944,70 @@ <h3>49.34. The complex type <code>element[siri:OperatorPermissions]#complexType
                     <p class="tableblock anno-text">-</p>
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="6" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock">The element contains <em>one</em> of the following elements (a-b)</p>
-                  </td>
-                </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>a</em></p>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>siri:TrainNumberRef</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>→‍<a shape="rect" href="#element_siri__AllowAll" title="siri:AllowAll">siri:AllowAll</a></strong></code></p>
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
+                    <p class="tableblock"><em>&gt;<a shape="rect" href="#type_siri__TrainNumberRefStructure" title="siri:TrainNumberRefStructure">siri:TrainNumberRefStructure</a></em></p>
                   </td>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Allow access to all topics known to the service.</p>
+                    <p class="tableblock darkbrown">TRAIN NUMBER assigned to VEHICLE JOURNEY. +SIRI 2.0</p>
                   </td>
                 </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="sect2" id="local_type_typedef_56_5">
+          <h3>49.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-56.5)</code></h3>
+          <div class="sectionbody">
+            <table class="tableblock frame-all grid-all spread">
+              <colgroup span="1">
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:11.9047619047619%"/>
+                <col span="1" style="width:1.19047619047619%"/>
+                <col span="1" style="width:23.8095238095238%"/>
+                <col span="1" style="width:35.7142857142857%"/>
+              </colgroup>
+              <tbody>
                 <tr>
-                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
-                  <td colspan="" rowspan="" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>b</em></p>
+                  <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code>group[siri:TrainOperationalInfoGroup]</code><br/><code>  /JourneyParts #complexType</code><br/><code>  (typedef-56.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code><strong>siri:OperatorPermission</strong></code></p>
+                    <p class="tableblock"></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><strong title="mandatory, at least one, part of a choice">-1:*</strong></p>
+                    <p class="tableblock anno-text">-</p>
+                  </td>
+                </tr>
+                <tr>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top"></td>
+                  <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock"><code><strong>siri:JourneyPartInfo</strong></code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__OperatorPermissionStructure" title="siri:OperatorPermissionStructure">siri:OperatorPermissionStructure</a></em></p>
+                    <p class="tableblock"><strong title="mandatory, at least one">1:*</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock darkbrown">Participant's permission for this OPERATOR.</p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#type_siri__JourneyPartInfoStructure" title="siri:JourneyPartInfoStructure">siri:JourneyPartInfoStructure</a></em></p>
+                  </td>
+                  <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
+                    <p class="tableblock darkbrown">Information about Parts of JOURNEY (since SIRI 2.0)</p>
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_57_1">
-          <h3>49.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-57.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_85_1">
+          <h3>49.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-85.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -148021,7 +148021,7 @@ <h3>49.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-57.1)</code></p>
+                    <p class="tableblock"><code>complexType[siri:AbstractPermissionStructure]</code><br/><code>  /GeneralCapabilities #complexType</code><br/><code>  (typedef-85.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -148060,8 +148060,8 @@ <h3>49.35. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_1">
-          <h3>49.36. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-103.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_1">
+          <h3>49.36. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-94.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -148075,7 +148075,7 @@ <h3>49.36. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:VehicleMonitoringRequestPolicyGroup]</code><br/><code>  /MaximumNumberOfCalls #complexType</code><br/><code>  (typedef-103.1)</code></p>
+                    <p class="tableblock"><code>group[siri:VehicleMonitoringRequestPolicyGroup]</code><br/><code>  /MaximumNumberOfCalls #complexType</code><br/><code>  (typedef-94.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -148114,8 +148114,8 @@ <h3>49.36. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_2">
-          <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-103.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_2">
+          <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-94.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -148129,7 +148129,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleActivityStructure]</code><br/><code>  /MonitoredVehicleJourney #complexType</code><br/><code>  (typedef-103.2)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleActivityStructure]</code><br/><code>  /MonitoredVehicleJourney #complexType</code><br/><code>  (typedef-94.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__MonitoredVehicleJourneyStructure" title="siri:MonitoredVehicleJourneyStructure">siri:MonitoredVehicleJourneyStructure</a></p>
@@ -149047,7 +149047,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_4" title="local-type: typedef-43.4">local-type: typedef-43.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_4" title="local-type: typedef-56.4">local-type: typedef-56.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">TRAIN NUMBERs for journey. (since SIRI 2.0)</p>
@@ -149061,7 +149061,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_43_5" title="local-type: typedef-43.5">local-type: typedef-43.5</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_56_5" title="local-type: typedef-56.5">local-type: typedef-56.5</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">JOURNEY PARTs making up JOURNEY +SIRIv2.0 e.</p>
@@ -149076,7 +149076,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_2" title="local-type: typedef-35.2">local-type: typedef-35.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_2" title="local-type: typedef-36.2">local-type: typedef-36.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -149090,7 +149090,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_3" title="local-type: typedef-35.3">local-type: typedef-35.3</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_3" title="local-type: typedef-36.3">local-type: typedef-36.3</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -149104,7 +149104,7 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_35_4" title="local-type: typedef-35.4">local-type: typedef-35.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_36_4" title="local-type: typedef-36.4">local-type: typedef-36.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown"></p>
@@ -149169,8 +149169,8 @@ <h3>49.37. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_3">
-          <h3>49.38. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-103.3)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_3">
+          <h3>49.38. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-94.3)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149184,7 +149184,7 @@ <h3>49.38. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-103.3)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /TopicFiltering #complexType</code><br/><code>  (typedef-94.3)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -149264,8 +149264,8 @@ <h3>49.38. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_4">
-          <h3>49.39. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-103.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_4">
+          <h3>49.39. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-94.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149279,7 +149279,7 @@ <h3>49.39. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-103.4)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /RequestPolicy #complexType</code><br/><code>  (typedef-94.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityRequestPolicyStructure" title="siri:CapabilityRequestPolicyStructure">siri:CapabilityRequestPolicyStructure</a></p>
@@ -149444,8 +149444,8 @@ <h3>49.39. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_5">
-          <h3>49.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-103.5)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_5">
+          <h3>49.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-94.5)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149459,7 +149459,7 @@ <h3>49.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-103.5)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /AccessControl #complexType</code><br/><code>  (typedef-94.5)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__CapabilityAccessControlStructure" title="siri:CapabilityAccessControlStructure">siri:CapabilityAccessControlStructure</a></p>
@@ -149534,8 +149534,8 @@ <h3>49.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_6">
-          <h3>49.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-103.6)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_6">
+          <h3>49.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-94.6)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149549,7 +149549,7 @@ <h3>49.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-103.6)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]</code><br/><code>  /ResponseFeatures #complexType</code><br/><code>  (typedef-94.6)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -149588,8 +149588,8 @@ <h3>49.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_7">
-          <h3>49.42. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-103.7)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_7">
+          <h3>49.42. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-94.7)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149603,7 +149603,7 @@ <h3>49.42. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:VehicleMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-103.7)</code></p>
+                    <p class="tableblock"><code>element[siri:VehicleMonitoringPermissions]</code><br/><code>  #complexType</code><br/><code>  (typedef-94.7)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__PermissionsStructure" title="siri:PermissionsStructure">siri:PermissionsStructure</a></p>
@@ -149656,8 +149656,8 @@ <h3>49.42. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_103_8">
-          <h3>49.43. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-103.8)</code></h3>
+        <div class="sect2" id="local_type_typedef_94_8">
+          <h3>49.43. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-94.8)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -149671,7 +149671,7 @@ <h3>49.43. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServicePermissionStructure]</code><br/><code>  /VehicleMonitoringPermissions #complexType</code><br/><code>  (typedef-103.8)</code></p>
+                    <p class="tableblock"><code>complexType[siri:VehicleMonitoringServicePermissionStructure]</code><br/><code>  /VehicleMonitoringPermissions #complexType</code><br/><code>  (typedef-94.8)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -149790,7 +149790,7 @@ <h3>50.1. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -149807,7 +149807,7 @@ <h3>50.1. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_86_2" title="local-type: typedef-86.2">local-type: typedef-86.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_58_2" title="local-type: typedef-58.2">local-type: typedef-58.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -150029,7 +150029,7 @@ <h3>50.1. The toplevel element <code>siri:Siri</code></h3>
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -150137,8 +150137,8 @@ <h3>50.1. The toplevel element <code>siri:Siri</code></h3>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_86_2">
-          <h3>50.2. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_58_2">
+          <h3>50.2. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-58.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -150152,7 +150152,7 @@ <h3>50.2. The complex type <code>element[siri:SubscriptionRequest]#complexType (
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-86.2)</code></p>
+                    <p class="tableblock"><code>element[siri:SubscriptionRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-58.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__SubscriptionRequestStructure" title="siri:SubscriptionRequestStructure">siri:SubscriptionRequestStructure</a></p>
@@ -150337,8 +150337,8 @@ <h3>50.2. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_88_1">
-          <h3>50.3. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-88.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_61_1">
+          <h3>50.3. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-61.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -150352,7 +150352,7 @@ <h3>50.3. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-88.1)</code></p>
+                    <p class="tableblock"><code>group[siri:ServiceDeliveryRequestStatusGroup]</code><br/><code>  /ErrorCondition #complexType</code><br/><code>  (typedef-61.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -150421,8 +150421,8 @@ <h3>50.3. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_102_1">
-          <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)</code></h3>
+        <div class="sect2" id="local_type_typedef_95_1">
+          <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-95.1)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -150436,7 +150436,7 @@ <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)<
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:Siri]</code><br/><code>  #complexType</code><br/><code>  (typedef-102.1)</code></p>
+                    <p class="tableblock"><code>element[siri:Siri]</code><br/><code>  #complexType</code><br/><code>  (typedef-95.1)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"></p>
@@ -150485,7 +150485,7 @@ <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)<
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_2" title="local-type: typedef-104.2">local-type: typedef-104.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_2" title="local-type: typedef-98.2">local-type: typedef-98.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Consumer to Producer for immediate delivery of data. Answered with a ServiceDelivery (or a DataReadyRequest)</p>
@@ -150502,7 +150502,7 @@ <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)<
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_86_2" title="local-type: typedef-86.2">local-type: typedef-86.2</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_58_2" title="local-type: typedef-58.2">local-type: typedef-58.2</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Request from Subscriber to Producer for a subscription. Answered with a SubscriptionResponse.</p>
@@ -150724,7 +150724,7 @@ <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)<
                     <p class="tableblock"><strong title="mandatory, single, part of a choice">-1:1</strong></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_104_4" title="local-type: typedef-104.4">local-type: typedef-104.4</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_98_4" title="local-type: typedef-98.4">local-type: typedef-98.4</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Response from Producer to Consumer to deliver payload data. Either answers a direct ServiceRequest, or asynchronously satisfies a subscription. May be sent directly in one step, or fetched in response to a DataSupply Request.</p>
@@ -150832,8 +150832,8 @@ <h3>50.4. The complex type <code>element[siri:Siri]#complexType (typedef-102.1)<
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_2">
-          <h3>50.5. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-104.2)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_2">
+          <h3>50.5. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-98.2)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -150847,7 +150847,7 @@ <h3>50.5. The complex type <code>element[siri:ServiceRequest]#complexType (typed
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.2)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceRequest]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.2)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceRequestStructure" title="siri:ServiceRequestStructure">siri:ServiceRequestStructure</a></p>
@@ -150990,8 +150990,8 @@ <h3>50.5. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local_type_typedef_104_4">
-          <h3>50.6. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-104.4)</code></h3>
+        <div class="sect2" id="local_type_typedef_98_4">
+          <h3>50.6. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-98.4)</code></h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
               <colgroup span="1">
@@ -151005,7 +151005,7 @@ <h3>50.6. The complex type <code>element[siri:ServiceDelivery]#complexType (type
               <tbody>
                 <tr>
                   <td colspan="4" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-104.4)</code></p>
+                    <p class="tableblock"><code>element[siri:ServiceDelivery]</code><br/><code>  #complexType</code><br/><code>  (typedef-98.4)</code></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock"><a shape="rect" href="#type_siri__ServiceDeliveryStructure" title="siri:ServiceDeliveryStructure">siri:ServiceDeliveryStructure</a></p>
@@ -151154,7 +151154,7 @@ <h3>50.6. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                     <p class="tableblock"><span title="optional, single">0:1</span></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_88_1" title="local-type: typedef-88.1">local-type: typedef-88.1</a></em></p>
+                    <p class="tableblock"><em>+<a shape="rect" href="#local_type_typedef_61_1" title="local-type: typedef-61.1">local-type: typedef-61.1</a></em></p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock darkbrown">Description of any error or warning conditions that appluy to the overall request. More Specific error conditions should be included on each request that fails.</p>