From e15bfee99da36bc1c78de8968a9fbeb6ad3649d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Tue, 7 Jul 2026 17:53:06 +0200
Subject: [PATCH 1/8] Change vehicle modes enum type in ET/PT filtered query

---
 xsd/siri_estimatedTimetable_service.xsd  | 2 +-
 xsd/siri_productionTimetable_service.xsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xsd/siri_estimatedTimetable_service.xsd b/xsd/siri_estimatedTimetable_service.xsd
index adeecd66..ca355b41 100644
--- a/xsd/siri_estimatedTimetable_service.xsd
+++ b/xsd/siri_estimatedTimetable_service.xsd
@@ -168,7 +168,7 @@ Rail transport, Roads and road transport
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="VehicleMode" type="VehicleModesEnumeration" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="VehicleMode" type="VehicleModesOfTransportEnumeration" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>Filter the results to include only journeys of the specified VEHICLE MODE. (since SIRI 2.1)</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/siri_productionTimetable_service.xsd b/xsd/siri_productionTimetable_service.xsd
index 5c71526e..0335f92e 100644
--- a/xsd/siri_productionTimetable_service.xsd
+++ b/xsd/siri_productionTimetable_service.xsd
@@ -174,7 +174,7 @@ Rail transport, Roads and road transport
 					</xsd:sequence>
 				</xsd:complexType>
 			</xsd:element>
-			<xsd:element name="VehicleMode" type="VehicleModesEnumeration" minOccurs="0" maxOccurs="unbounded">
+			<xsd:element name="VehicleMode" type="VehicleModesOfTransportEnumeration" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation>Filter the results to include only journeys of the specified VEHICLE MODE. (since SIRI 2.1)</xsd:documentation>
 				</xsd:annotation>

From 57e67d826b8920717d57183d179c7742fd1fad3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Wed, 15 Jul 2026 10:41:56 +0200
Subject: [PATCH 2/8] Run ./docs/generate-tables.sh locally (work-around for
 #228)

#228 happens because the bot, for some reason, is not able to "write commit" to the repo.

As a temporary work-around, I'm launching the same thing locally, which should ideally result in the bot having nothing to write, hence the PR would go green.

This is theoretical at this point, let's see how it fares.
---
 docs/generated/contab/acsb.html   |   40 +-
 docs/generated/contab/datex2.html |   32 +-
 docs/generated/contab/ifopt.html  |   94 +-
 docs/generated/contab/siri.html   | 2908 ++++++++++++++---------------
 4 files changed, 1537 insertions(+), 1537 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index d1e20447..41b3e41c 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <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>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
+                      <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>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
                       </em>
                     </p>
                   </td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
                       </em>
                     </p>
                   </td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-31.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-31.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-31.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
+        <div class="sect2" id="local-type.typedef-31.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-31.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-15.2)</code>
+                      <code>  (typedef-31.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <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-14.1" class="tableblock">
+                    <p id="local-type.typedef-30.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-30.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-30.1" title="local-type: typedef-30.1">local-type: typedef-30.1</a>
                       </em>
                     </p>
                   </td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-30.1" title="local-type: typedef-30.1">local-type: typedef-30.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index 63eef8fc..37a57bfc 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.1" title="local-type: typedef-70.1">local-type: typedef-70.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.3" title="local-type: typedef-70.3">local-type: typedef-70.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
                       </em>
                     </p>
                   </td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.4" title="local-type: typedef-70.4">local-type: typedef-70.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
                       </em>
                     </p>
                   </td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-                      <code>  (typedef-70.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-                      <code>  (typedef-70.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-70.3)</code>
+        <div class="sect2" id="local-type.typedef-29.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-29.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-                      <code>  (typedef-70.3)</code>
+                      <code>  (typedef-29.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)</code>
+        <div class="sect2" id="local-type.typedef-29.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-29.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-                      <code>  (typedef-70.4)</code>
+                      <code>  (typedef-29.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index 597e1770..92ead162 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,7 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
                       </em>
                     </p>
                   </td>
@@ -8212,7 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
                       </em>
                     </p>
                   </td>
@@ -8237,7 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
                       </em>
                     </p>
                   </td>
@@ -8562,7 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,8 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-9.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8595,7 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-9.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8633,8 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-9.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8654,7 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-9.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8692,8 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8713,7 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8729,8 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8750,7 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9391,7 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -9568,7 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -9597,7 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.2" title="local-type: typedef-13.2">local-type: typedef-13.2</a>
                       </em>
                     </p>
                   </td>
@@ -9659,7 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -9908,7 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
                       </em>
                     </p>
                   </td>
@@ -9941,7 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.3" title="local-type: typedef-55.3">local-type: typedef-55.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-13.3" title="local-type: typedef-13.3">local-type: typedef-13.3</a>
                       </em>
                     </p>
                   </td>
@@ -9953,8 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -9974,7 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10016,8 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10037,7 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10079,8 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)</code>
+        <div class="sect2" id="local-type.typedef-13.2">
+          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-13.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10100,7 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-                      <code>  (typedef-55.2)</code>
+                      <code>  (typedef-13.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10143,8 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10164,7 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10206,8 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-13.1">
+          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10227,7 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-13.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10269,8 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)</code>
+        <div class="sect2" id="local-type.typedef-13.3">
+          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-13.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10290,7 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-                      <code>  (typedef-55.3)</code>
+                      <code>  (typedef-13.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13149,7 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -13161,8 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-57.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13182,7 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-                      <code>  (typedef-57.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13416,8 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13437,7 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index 1f48c491..f6c5307e 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -5535,7 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -5944,7 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -5975,7 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
                       </em>
                     </p>
                   </td>
@@ -6361,7 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -6957,7 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -7063,7 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -7094,7 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -7343,7 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -7405,7 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -7736,7 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -8176,7 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -8670,7 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -8701,7 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -8973,7 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -9035,7 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -9572,7 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -10886,7 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -11433,7 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -12192,7 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -12894,7 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -14410,7 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -15029,7 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -15320,8 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15341,7 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15585,7 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -15646,8 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15667,7 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15778,8 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15799,7 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16033,8 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16054,7 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16134,7 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -16165,7 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
                       </em>
                     </p>
                   </td>
@@ -16551,7 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -16733,8 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16754,7 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16988,8 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-60.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17009,7 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-60.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17317,8 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17338,7 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17582,7 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -17643,8 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17664,7 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17775,8 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17796,7 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18104,8 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18125,7 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18369,7 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -18430,8 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18451,7 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18562,8 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18583,7 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18817,8 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18838,7 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19146,8 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19167,7 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19557,8 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19578,7 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19796,8 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19817,7 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20061,7 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -20122,8 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20143,7 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20254,8 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20275,7 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20386,8 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20407,7 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20641,8 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20662,7 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20970,8 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20991,7 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21381,8 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21402,7 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21620,8 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21641,7 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21791,8 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21812,7 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22009,8 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22030,7 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22180,8 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22201,7 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22312,8 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22333,7 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22444,8 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22465,7 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22662,8 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22683,7 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23212,7 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -23972,7 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -24280,7 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -24311,7 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -24728,7 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -24943,7 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -25062,7 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -25093,7 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -25853,7 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -26555,7 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -27337,7 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -27368,7 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -27617,7 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -27679,7 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </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>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -27979,7 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -28716,8 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-3.3)</code>
+        <div class="sect2" id="local-type.typedef-60.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-60.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -28737,7 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.3)</code>
+                      <code>  (typedef-60.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -28981,7 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -29042,8 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29063,7 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29174,8 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-3.1)</code>
+        <div class="sect2" id="local-type.typedef-60.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-60.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29195,7 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.1)</code>
+                      <code>  (typedef-60.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29463,8 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-60.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29484,7 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-60.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29792,8 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29813,7 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30057,7 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -30118,8 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30139,7 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30250,8 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30271,7 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30505,8 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30526,7 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30834,8 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30855,7 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31099,7 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -31160,8 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31181,7 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31292,8 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31313,7 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31424,8 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31445,7 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31679,8 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31700,7 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32008,8 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32029,7 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32140,8 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32161,7 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32272,8 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32293,7 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32527,8 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32548,7 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32856,8 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32877,7 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33267,8 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33288,7 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33506,8 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33527,7 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33771,7 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -33832,8 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33853,7 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34542,7 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
                       </em>
                     </p>
                   </td>
@@ -34808,7 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.3" title="local-type: typedef-63.3">local-type: typedef-63.3</a>
                       </em>
                     </p>
                   </td>
@@ -37048,7 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
                       </em>
                     </p>
                   </td>
@@ -37386,7 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
                       </em>
                     </p>
                   </td>
@@ -38301,7 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <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>
@@ -38508,7 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.3" title="local-type: typedef-63.3">local-type: typedef-63.3</a>
                       </em>
                     </p>
                   </td>
@@ -39146,7 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
                       </em>
                     </p>
                   </td>
@@ -41623,7 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <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>
@@ -41635,8 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-63.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41656,7 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-63.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41767,8 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-63.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-63.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41788,7 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-63.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41899,8 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-63.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41920,7 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-63.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42031,8 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-63.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42052,7 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-63.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42163,8 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-63.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-63.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42184,7 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-63.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42295,8 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-63.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-63.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42316,7 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-63.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42427,8 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-63.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42448,7 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-63.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42559,8 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-63.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-63.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42580,7 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-63.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -50447,7 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -53179,7 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
+                      <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>
@@ -53207,7 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.3" title="local-type: typedef-5.3">local-type: typedef-5.3</a>
+                      <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>
@@ -55353,8 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55374,7 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55485,8 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)</code>
+        <div class="sect2" id="local-type.typedef-62.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-62.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55506,7 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-                      <code>  (typedef-5.2)</code>
+                      <code>  (typedef-62.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55574,8 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)</code>
+        <div class="sect2" id="local-type.typedef-62.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-62.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55595,7 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-                      <code>  (typedef-5.3)</code>
+                      <code>  (typedef-62.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -57952,7 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </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>+<a shape="rect" href="#local-type.typedef-81.3" title="local-type: typedef-81.3">local-type: typedef-81.3</a>
                       </em>
                     </p>
                   </td>
@@ -59634,7 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-81.1" title="local-type: typedef-81.1">local-type: typedef-81.1</a>
                       </em>
                     </p>
                   </td>
@@ -59658,7 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-81.2" title="local-type: typedef-81.2">local-type: typedef-81.2</a>
                       </em>
                     </p>
                   </td>
@@ -61934,8 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
+        <div class="sect2" id="local-type.typedef-81.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-81.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -61955,7 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-83.3)</code>
+                      <code>  (typedef-81.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -61993,8 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
+        <div class="sect2" id="local-type.typedef-81.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-81.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62014,7 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-83.3)</code>
+                      <code>  (typedef-81.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62052,8 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
+        <div class="sect2" id="local-type.typedef-81.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62073,7 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-83.1)</code>
+                      <code>  (typedef-81.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62182,8 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)</code>
+        <div class="sect2" id="local-type.typedef-81.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-81.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62203,7 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-83.2)</code>
+                      <code>  (typedef-81.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63829,7 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <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>
@@ -64952,7 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -64976,7 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
                       </em>
                     </p>
                   </td>
@@ -66192,8 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66213,7 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66287,8 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66308,7 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66378,8 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-73.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66399,7 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-73.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67846,7 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -67867,7 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -67888,7 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
                       </em>
                     </p>
                   </td>
@@ -67909,7 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.9" title="local-type: typedef-77.9">local-type: typedef-77.9</a>
                       </em>
                     </p>
                   </td>
@@ -67930,7 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.10" title="local-type: typedef-77.10">local-type: typedef-77.10</a>
                       </em>
                     </p>
                   </td>
@@ -68296,7 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <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>
@@ -69772,7 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
                       </em>
                     </p>
                   </td>
@@ -69802,7 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
                       </em>
                     </p>
                   </td>
@@ -69931,7 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
                       </em>
                     </p>
                   </td>
@@ -69961,7 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
                       </em>
                     </p>
                   </td>
@@ -71792,7 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
                       </em>
                     </p>
                   </td>
@@ -71822,7 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
                       </em>
                     </p>
                   </td>
@@ -72554,7 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.14" title="local-type: typedef-72.14">local-type: typedef-72.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.14" title="local-type: typedef-77.14">local-type: typedef-77.14</a>
                       </em>
                     </p>
                   </td>
@@ -73253,7 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -73274,7 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -73295,7 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
                       </em>
                     </p>
                   </td>
@@ -73316,7 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.9" title="local-type: typedef-77.9">local-type: typedef-77.9</a>
                       </em>
                     </p>
                   </td>
@@ -73337,7 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.10" title="local-type: typedef-77.10">local-type: typedef-77.10</a>
                       </em>
                     </p>
                   </td>
@@ -73583,7 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <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>
@@ -74258,7 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <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>
@@ -74522,7 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.11" title="local-type: typedef-72.11">local-type: typedef-72.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.11" title="local-type: typedef-77.11">local-type: typedef-77.11</a>
                       </em>
                     </p>
                   </td>
@@ -74546,7 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.12" title="local-type: typedef-72.12">local-type: typedef-72.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.12" title="local-type: typedef-77.12">local-type: typedef-77.12</a>
                       </em>
                     </p>
                   </td>
@@ -74618,7 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.13" title="local-type: typedef-72.13">local-type: typedef-72.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.13" title="local-type: typedef-77.13">local-type: typedef-77.13</a>
                       </em>
                     </p>
                   </td>
@@ -74752,7 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -74786,7 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -74815,7 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -75563,7 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.15" title="local-type: typedef-72.15">local-type: typedef-72.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.15" title="local-type: typedef-77.15">local-type: typedef-77.15</a>
                       </em>
                     </p>
                   </td>
@@ -76406,7 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.16" title="local-type: typedef-72.16">local-type: typedef-72.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.16" title="local-type: typedef-77.16">local-type: typedef-77.16</a>
                       </em>
                     </p>
                   </td>
@@ -76535,7 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.17" title="local-type: typedef-72.17">local-type: typedef-72.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.17" title="local-type: typedef-77.17">local-type: typedef-77.17</a>
                       </em>
                     </p>
                   </td>
@@ -79917,8 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
+        <div class="sect2" id="local-type.typedef-77.14">
+          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-77.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -79938,7 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.14)</code>
+                      <code>  (typedef-77.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80012,8 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80033,7 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80075,8 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80096,7 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80126,7 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
                       </em>
                     </p>
                   </td>
@@ -80138,8 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-77.4">
+          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-77.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80159,7 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-77.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80329,7 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
                       </em>
                     </p>
                   </td>
@@ -80353,7 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
                       </em>
                     </p>
                   </td>
@@ -80365,8 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
+        <div class="sect2" id="local-type.typedef-77.5">
+          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-77.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80386,7 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.5)</code>
+                      <code>  (typedef-77.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80428,8 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
+        <div class="sect2" id="local-type.typedef-77.6">
+          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-77.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80449,7 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.6)</code>
+                      <code>  (typedef-77.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80491,8 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80512,7 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.7)</code>
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80542,7 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
                       </em>
                     </p>
                   </td>
@@ -80554,8 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80575,7 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-72.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80708,8 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
+        <div class="sect2" id="local-type.typedef-77.9">
+          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-77.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80729,7 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-72.9)</code>
+                      <code>  (typedef-77.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80771,8 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
+        <div class="sect2" id="local-type.typedef-77.10">
+          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-77.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80792,7 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-72.10)</code>
+                      <code>  (typedef-77.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80834,8 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80855,7 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80897,8 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-77.18">
+          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80918,7 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-77.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80960,8 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-77.19">
+          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80981,7 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-77.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81051,8 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-77.18">
+          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81072,7 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-77.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81114,8 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-77.19">
+          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81135,7 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-77.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81205,8 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-77.18">
+          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81226,7 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-77.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81268,8 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-77.19">
+          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81289,7 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-77.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81359,8 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
+        <div class="sect2" id="local-type.typedef-77.14">
+          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-77.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81380,7 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.14)</code>
+                      <code>  (typedef-77.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81454,8 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81475,7 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81517,8 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81538,7 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81568,7 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
                       </em>
                     </p>
                   </td>
@@ -81580,8 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-77.4">
+          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-77.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81601,7 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-77.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81771,7 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
                       </em>
                     </p>
                   </td>
@@ -81795,7 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
                       </em>
                     </p>
                   </td>
@@ -81807,8 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
+        <div class="sect2" id="local-type.typedef-77.5">
+          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-77.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81828,7 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.5)</code>
+                      <code>  (typedef-77.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81870,8 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
+        <div class="sect2" id="local-type.typedef-77.6">
+          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-77.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81891,7 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.6)</code>
+                      <code>  (typedef-77.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81933,8 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81954,7 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.7)</code>
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81984,7 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
                       </em>
                     </p>
                   </td>
@@ -81996,8 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82017,7 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-72.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82150,8 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
+        <div class="sect2" id="local-type.typedef-77.9">
+          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-77.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82171,7 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-72.9)</code>
+                      <code>  (typedef-77.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82213,8 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
+        <div class="sect2" id="local-type.typedef-77.10">
+          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-77.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82234,7 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-72.10)</code>
+                      <code>  (typedef-77.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82276,8 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82297,7 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82339,8 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82360,7 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82402,8 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)</code>
+        <div class="sect2" id="local-type.typedef-77.11">
+          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82423,7 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-72.11)</code>
+                      <code>  (typedef-77.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82555,8 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)</code>
+        <div class="sect2" id="local-type.typedef-77.12">
+          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82576,7 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-72.12)</code>
+                      <code>  (typedef-77.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82794,8 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)</code>
+        <div class="sect2" id="local-type.typedef-77.13">
+          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82815,7 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-72.13)</code>
+                      <code>  (typedef-77.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82852,8 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82873,7 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82941,8 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82962,7 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83047,8 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83068,7 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83153,8 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)</code>
+        <div class="sect2" id="local-type.typedef-77.15">
+          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-77.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83174,7 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-                      <code>  (typedef-72.15)</code>
+                      <code>  (typedef-77.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83325,7 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -83346,7 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -83358,8 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83379,7 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83409,7 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -83421,8 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83442,7 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83557,8 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83578,7 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83620,8 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)</code>
+        <div class="sect2" id="local-type.typedef-77.16">
+          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-77.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83641,7 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-                      <code>  (typedef-72.16)</code>
+                      <code>  (typedef-77.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83683,8 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)</code>
+        <div class="sect2" id="local-type.typedef-77.17">
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-77.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83704,7 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Drive
                       <br/>
                       <code>  /DriverScope #complexType</code>
                       <br/>
-                      <code>  (typedef-72.17)</code>
+                      <code>  (typedef-77.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -86197,7 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -86259,7 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -87027,7 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -87089,7 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-76.2" title="local-type: typedef-76.2">local-type: typedef-76.2</a>
                       </em>
                     </p>
                   </td>
@@ -92109,8 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92130,7 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92348,8 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92369,7 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92759,8 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92780,7 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93170,8 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93191,7 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93409,8 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93430,7 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93820,8 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93841,7 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94894,7 +94894,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
                       </em>
                     </p>
                   </td>
@@ -94916,7 +94916,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -95387,7 +95387,7 @@ <h3>11.15. The complex type <code>siri:EstimatedTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-76.4" title="local-type: typedef-76.4">local-type: typedef-76.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -96301,7 +96301,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-85.1" title="local-type: typedef-85.1">local-type: typedef-85.1</a>
                       </em>
                     </p>
                   </td>
@@ -96323,7 +96323,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -96634,7 +96634,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -96658,7 +96658,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -97174,8 +97174,8 @@ <h3>11.22. The complex type <code>siri:EstimatedVersionFrameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.4">
-          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97195,7 +97195,7 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.4)</code>
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97269,8 +97269,8 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-85.1">
+          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-85.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97290,7 +97290,7 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-85.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97332,8 +97332,8 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.4">
-          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97353,7 +97353,7 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.4)</code>
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97427,8 +97427,8 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-85.1">
+          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-85.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97448,7 +97448,7 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-85.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97490,8 +97490,8 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97511,7 +97511,7 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97701,8 +97701,8 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.3">
-          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-76.3)</code>
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97722,7 +97722,7 @@ <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-76.3)</code>
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99633,7 +99633,7 @@ <h3>12.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -100830,7 +100830,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -100854,7 +100854,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -100902,7 +100902,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -100926,7 +100926,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -101085,7 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -101119,7 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -101148,7 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -101404,8 +101404,8 @@ <h3>12.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.5">
-          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101425,7 +101425,7 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101499,8 +101499,8 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.5">
-          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101520,7 +101520,7 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101594,8 +101594,8 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101615,7 +101615,7 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101880,8 +101880,8 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101901,7 +101901,7 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102073,8 +102073,8 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102094,7 +102094,7 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-73.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102195,8 +102195,8 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.4">
-          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102216,7 +102216,7 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-73.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102276,8 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102297,7 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102365,8 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102386,7 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102471,8 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102492,7 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103671,7 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -104614,7 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -104796,7 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -104829,7 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -105655,8 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105676,7 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105750,8 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105771,7 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105845,8 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105866,7 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105932,8 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105953,7 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -106021,8 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -106042,7 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -110248,7 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
+                      <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>
@@ -110269,7 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
+                      <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>
@@ -110293,7 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -110314,7 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -110335,7 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -110363,7 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-21.1" title="local-type: typedef-21.1">local-type: typedef-21.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-38.1" title="local-type: typedef-38.1">local-type: typedef-38.1</a>
                       </em>
                     </p>
                   </td>
@@ -111078,7 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-21.2" title="local-type: typedef-21.2">local-type: typedef-21.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-38.2" title="local-type: typedef-38.2">local-type: typedef-38.2</a>
                       </em>
                     </p>
                   </td>
@@ -113113,8 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
+        <div class="sect2" id="local-type.typedef-45.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113134,7 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.6)</code>
+                      <code>  (typedef-45.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113176,8 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
+        <div class="sect2" id="local-type.typedef-45.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113197,7 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.7)</code>
+                      <code>  (typedef-45.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113239,8 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113260,7 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113347,8 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113368,7 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113455,8 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113476,7 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113563,8 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-21.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)</code>
+        <div class="sect2" id="local-type.typedef-38.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-38.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113584,7 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-21.1)</code>
+                      <code>  (typedef-38.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113627,8 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-21.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)</code>
+        <div class="sect2" id="local-type.typedef-38.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-38.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113648,7 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-21.2)</code>
+                      <code>  (typedef-38.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -119107,7 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <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>
@@ -119128,7 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <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>
@@ -119152,7 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -119173,7 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -119194,7 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -119218,7 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-35.1" title="local-type: typedef-35.1">local-type: typedef-35.1</a>
                       </em>
                     </p>
                   </td>
@@ -119242,7 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-35.2" title="local-type: typedef-35.2">local-type: typedef-35.2</a>
                       </em>
                     </p>
                   </td>
@@ -120624,8 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120645,7 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120687,8 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-45.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120708,7 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-45.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120750,8 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120771,7 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120858,8 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120879,7 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120966,8 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120987,7 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121074,8 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)</code>
+        <div class="sect2" id="local-type.typedef-35.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-35.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121095,7 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-36.1)</code>
+                      <code>  (typedef-35.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121138,8 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-36.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)</code>
+        <div class="sect2" id="local-type.typedef-35.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-35.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121159,7 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-36.2)</code>
+                      <code>  (typedef-35.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -126321,7 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
                       </em>
                     </p>
                   </td>
@@ -126342,7 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
                       </em>
                     </p>
                   </td>
@@ -127039,7 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.6" title="local-type: typedef-46.6">local-type: typedef-46.6</a>
                       </em>
                     </p>
                   </td>
@@ -127323,7 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.5" title="local-type: typedef-46.5">local-type: typedef-46.5</a>
                       </em>
                     </p>
                   </td>
@@ -128258,7 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
                       </em>
                     </p>
                   </td>
@@ -128378,7 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
                       </em>
                     </p>
                   </td>
@@ -128399,7 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
                       </em>
                     </p>
                   </td>
@@ -128810,7 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.4" title="local-type: typedef-46.4">local-type: typedef-46.4</a>
                       </em>
                     </p>
                   </td>
@@ -129317,8 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-46.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-46.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129338,7 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-46.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129494,8 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
+        <div class="sect2" id="local-type.typedef-46.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-46.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129515,7 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.3)</code>
+                      <code>  (typedef-46.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129557,8 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)</code>
+        <div class="sect2" id="local-type.typedef-46.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-46.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129578,7 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-22.6)</code>
+                      <code>  (typedef-46.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129620,8 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)</code>
+        <div class="sect2" id="local-type.typedef-46.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-46.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129641,7 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-                      <code>  (typedef-22.5)</code>
+                      <code>  (typedef-46.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129897,7 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.4" title="local-type: typedef-46.4">local-type: typedef-46.4</a>
                       </em>
                     </p>
                   </td>
@@ -129934,8 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
+        <div class="sect2" id="local-type.typedef-46.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-46.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129955,7 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-22.4)</code>
+                      <code>  (typedef-46.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129998,8 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)</code>
+        <div class="sect2" id="local-type.typedef-46.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-46.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130019,7 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-22.1)</code>
+                      <code>  (typedef-46.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130061,8 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-46.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-46.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130082,7 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-46.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130238,8 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
+        <div class="sect2" id="local-type.typedef-46.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-46.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130259,7 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.3)</code>
+                      <code>  (typedef-46.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130301,8 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
+        <div class="sect2" id="local-type.typedef-46.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-46.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130322,7 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-22.4)</code>
+                      <code>  (typedef-46.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131790,12 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-18.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -135452,7 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -135473,7 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -135494,7 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -135712,7 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <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>
@@ -139290,7 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.5" title="local-type: typedef-49.5">local-type: typedef-49.5</a>
                       </em>
                     </p>
                   </td>
@@ -139671,7 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.7" title="local-type: typedef-49.7">local-type: typedef-49.7</a>
                       </em>
                     </p>
                   </td>
@@ -140824,7 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
                       </em>
                     </p>
                   </td>
@@ -141002,7 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
                       </em>
                     </p>
                   </td>
@@ -141139,7 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
                       </em>
                     </p>
                   </td>
@@ -141789,7 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
                       </em>
                     </p>
                   </td>
@@ -141967,7 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
                       </em>
                     </p>
                   </td>
@@ -141991,7 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.6" title="local-type: typedef-49.6">local-type: typedef-49.6</a>
                       </em>
                     </p>
                   </td>
@@ -143152,7 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <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>
@@ -146171,7 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <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>
@@ -147562,7 +147562,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
                       </em>
                     </p>
                   </td>
@@ -147740,7 +147740,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
                       </em>
                     </p>
                   </td>
@@ -148173,7 +148173,7 @@ <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.7" title="local-type: typedef-49.7">local-type: typedef-49.7</a>
                       </em>
                     </p>
                   </td>
@@ -148421,7 +148421,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
                       </em>
                     </p>
                   </td>
@@ -148599,7 +148599,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
                       </em>
                     </p>
                   </td>
@@ -148665,7 +148665,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-49.5" title="local-type: typedef-49.5">local-type: typedef-49.5</a>
                       </em>
                     </p>
                   </td>
@@ -149519,8 +149519,8 @@ <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149540,7 +149540,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149627,8 +149627,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149648,7 +149648,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149735,8 +149735,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149756,7 +149756,7 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149843,8 +149843,8 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-49.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149864,7 +149864,7 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-49.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149906,8 +149906,8 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
+        <div class="sect2" id="local-type.typedef-49.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-49.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149927,7 +149927,7 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-18.5)</code>
+                      <code>  (typedef-49.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150014,8 +150014,8 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
+        <div class="sect2" id="local-type.typedef-49.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-49.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150035,7 +150035,7 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-18.7)</code>
+                      <code>  (typedef-49.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150077,8 +150077,8 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-49.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150098,7 +150098,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-49.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150140,8 +150140,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-49.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150161,7 +150161,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-49.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150281,8 +150281,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-49.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150302,7 +150302,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-49.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150344,8 +150344,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-49.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150365,7 +150365,7 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-49.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150407,8 +150407,8 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-49.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150428,7 +150428,7 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-49.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150548,8 +150548,8 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.6">
-          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
+        <div class="sect2" id="local-type.typedef-49.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-49.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150569,7 +150569,7 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-                      <code>  (typedef-18.6)</code>
+                      <code>  (typedef-49.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150656,8 +150656,8 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-49.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150677,7 +150677,7 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-49.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150719,8 +150719,8 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-49.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150740,7 +150740,7 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-49.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150782,8 +150782,8 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-49.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150803,7 +150803,7 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-49.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150845,8 +150845,8 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-49.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150866,7 +150866,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-49.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150986,8 +150986,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
+        <div class="sect2" id="local-type.typedef-49.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-49.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151007,7 +151007,7 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-18.7)</code>
+                      <code>  (typedef-49.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151049,8 +151049,8 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-49.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151070,7 +151070,7 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-49.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151112,8 +151112,8 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-49.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151133,7 +151133,7 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-49.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151253,8 +151253,8 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
+        <div class="sect2" id="local-type.typedef-49.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-49.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151274,7 +151274,7 @@ <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-18.5)</code>
+                      <code>  (typedef-49.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -156431,7 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -156465,7 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -156494,7 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -156523,7 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.3" title="local-type: typedef-27.3">local-type: typedef-27.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.3" title="local-type: typedef-48.3">local-type: typedef-48.3</a>
                       </em>
                     </p>
                   </td>
@@ -157075,8 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
+        <div class="sect2" id="local-type.typedef-48.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-48.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157096,7 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.3)</code>
+                      <code>  (typedef-48.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157181,8 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157202,7 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157287,8 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157308,7 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157393,8 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157414,7 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157482,8 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157503,7 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157588,8 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157609,7 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157694,8 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
+        <div class="sect2" id="local-type.typedef-48.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-48.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157715,7 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.3)</code>
+                      <code>  (typedef-48.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -163928,7 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
+                      <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>
@@ -163949,7 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
+                      <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>
@@ -163973,7 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -163994,7 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -164015,7 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -166738,7 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.1" title="local-type: typedef-28.1">local-type: typedef-28.1</a>
+                      <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>
@@ -166759,7 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.2" title="local-type: typedef-28.2">local-type: typedef-28.2</a>
+                      <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>
@@ -166780,7 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.3" title="local-type: typedef-28.3">local-type: typedef-28.3</a>
+                      <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>
@@ -167885,7 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <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>
@@ -167906,7 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <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>
@@ -167930,7 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -167951,7 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -167972,7 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -171315,7 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <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>
@@ -171336,7 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <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>
@@ -171360,7 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -171381,7 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -171402,7 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -172064,8 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
+        <div class="sect2" id="local-type.typedef-45.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172085,7 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.6)</code>
+                      <code>  (typedef-45.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172127,8 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
+        <div class="sect2" id="local-type.typedef-45.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172148,7 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.7)</code>
+                      <code>  (typedef-45.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172190,8 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172211,7 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172298,8 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172319,7 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172406,8 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172427,7 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172514,8 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)</code>
+        <div class="sect2" id="local-type.typedef-45.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-45.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172535,7 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-                      <code>  (typedef-28.1)</code>
+                      <code>  (typedef-45.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172599,8 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)</code>
+        <div class="sect2" id="local-type.typedef-45.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-45.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172620,7 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-                      <code>  (typedef-28.2)</code>
+                      <code>  (typedef-45.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172707,8 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)</code>
+        <div class="sect2" id="local-type.typedef-45.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-45.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172728,7 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-                      <code>  (typedef-28.3)</code>
+                      <code>  (typedef-45.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172792,8 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172813,7 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172855,8 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-45.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172876,7 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-45.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172918,8 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172939,7 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173026,8 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173047,7 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173134,8 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173155,7 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173242,8 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173263,7 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173305,8 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-45.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173326,7 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-45.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173368,8 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173389,7 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173476,8 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173497,7 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173584,8 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173605,7 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -178315,12 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-34.3" class="tableblock">
+                    <p id="local-type.typedef-52.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-52.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178501,12 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-34.1" class="tableblock">
+                    <p id="local-type.typedef-52.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-52.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178567,12 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-18.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -179200,7 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -179284,7 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -180050,7 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -180071,7 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -180224,7 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -180383,7 +180383,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -180931,7 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -181015,7 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -181164,7 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -181185,7 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -181871,7 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -182030,7 +182030,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -182578,7 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -182662,7 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -182811,7 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -182832,7 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -183195,7 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -183385,7 +183385,7 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -183885,7 +183885,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.6" title="local-type: typedef-34.6">local-type: typedef-34.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.6" title="local-type: typedef-52.6">local-type: typedef-52.6</a>
                       </em>
                     </p>
                   </td>
@@ -183909,7 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.7" title="local-type: typedef-34.7">local-type: typedef-34.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.7" title="local-type: typedef-52.7">local-type: typedef-52.7</a>
                       </em>
                     </p>
                   </td>
@@ -183933,7 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.9" title="local-type: typedef-34.9">local-type: typedef-34.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.9" title="local-type: typedef-52.9">local-type: typedef-52.9</a>
                       </em>
                     </p>
                   </td>
@@ -183957,7 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.10" title="local-type: typedef-34.10">local-type: typedef-34.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.10" title="local-type: typedef-52.10">local-type: typedef-52.10</a>
                       </em>
                     </p>
                   </td>
@@ -183981,7 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.11" title="local-type: typedef-34.11">local-type: typedef-34.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.11" title="local-type: typedef-52.11">local-type: typedef-52.11</a>
                       </em>
                     </p>
                   </td>
@@ -184005,7 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.12" title="local-type: typedef-34.12">local-type: typedef-34.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.12" title="local-type: typedef-52.12">local-type: typedef-52.12</a>
                       </em>
                     </p>
                   </td>
@@ -184029,7 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.13" title="local-type: typedef-34.13">local-type: typedef-34.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.13" title="local-type: typedef-52.13">local-type: typedef-52.13</a>
                       </em>
                     </p>
                   </td>
@@ -185577,7 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.17" title="local-type: typedef-34.17">local-type: typedef-34.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.17" title="local-type: typedef-52.17">local-type: typedef-52.17</a>
                       </em>
                     </p>
                   </td>
@@ -186074,7 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -186233,7 +186233,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -186781,7 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -186865,7 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -187014,7 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -187035,7 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -187757,7 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -187916,7 +187916,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
                       </em>
                     </p>
                   </td>
@@ -188464,7 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
                       </em>
                     </p>
                   </td>
@@ -188548,7 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
                       </em>
                     </p>
                   </td>
@@ -188697,7 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
                       </em>
                     </p>
                   </td>
@@ -188718,7 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
                       </em>
                     </p>
                   </td>
@@ -189503,8 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189524,7 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -189554,7 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -189566,8 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189587,7 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190016,8 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190037,7 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190067,7 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -190079,8 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190100,7 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190215,8 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190236,7 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190278,8 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190299,7 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190343,8 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190364,7 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190394,7 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -190406,8 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190427,7 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190856,8 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190877,7 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190907,7 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -190919,8 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190940,7 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191055,8 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191076,7 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191118,8 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191139,7 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191183,8 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191204,7 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191234,7 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -191246,8 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191267,7 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191696,8 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191717,7 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191747,7 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -191759,8 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191780,7 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191895,8 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191916,7 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191958,8 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191979,7 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192023,8 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)</code>
+        <div class="sect2" id="local-type.typedef-52.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-52.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192044,7 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-                      <code>  (typedef-34.6)</code>
+                      <code>  (typedef-52.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192130,8 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)</code>
+        <div class="sect2" id="local-type.typedef-52.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-52.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192151,7 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.7)</code>
+                      <code>  (typedef-52.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192181,7 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.8" title="local-type: typedef-34.8">local-type: typedef-34.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.8" title="local-type: typedef-52.8">local-type: typedef-52.8</a>
                       </em>
                     </p>
                   </td>
@@ -192193,8 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)</code>
+        <div class="sect2" id="local-type.typedef-52.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-52.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192214,7 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-                      <code>  (typedef-34.8)</code>
+                      <code>  (typedef-52.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192809,8 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)</code>
+        <div class="sect2" id="local-type.typedef-52.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-52.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192830,7 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-34.9)</code>
+                      <code>  (typedef-52.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192872,8 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)</code>
+        <div class="sect2" id="local-type.typedef-52.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-52.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192893,7 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-34.10)</code>
+                      <code>  (typedef-52.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192935,8 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)</code>
+        <div class="sect2" id="local-type.typedef-52.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-52.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192956,7 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-                      <code>  (typedef-34.11)</code>
+                      <code>  (typedef-52.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192998,8 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)</code>
+        <div class="sect2" id="local-type.typedef-52.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-52.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193019,7 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-                      <code>  (typedef-34.12)</code>
+                      <code>  (typedef-52.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193061,8 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)</code>
+        <div class="sect2" id="local-type.typedef-52.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-52.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193082,7 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-                      <code>  (typedef-34.13)</code>
+                      <code>  (typedef-52.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193124,8 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)</code>
+        <div class="sect2" id="local-type.typedef-52.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-52.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193145,7 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-34.17)</code>
+                      <code>  (typedef-52.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193187,8 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193208,7 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193252,8 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193273,7 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193303,7 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -193315,8 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193336,7 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193765,8 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193786,7 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193816,7 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -193828,8 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193849,7 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193964,8 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193985,7 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194027,8 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-52.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194048,7 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-52.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194092,8 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-52.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194113,7 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-52.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194143,7 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
                       </em>
                     </p>
                   </td>
@@ -194155,8 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-52.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194176,7 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-52.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194605,8 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-52.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194626,7 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-52.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194656,7 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
                       </em>
                     </p>
                   </td>
@@ -194668,8 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-52.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194689,7 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-52.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194804,8 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-52.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194825,7 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-52.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195664,7 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -195904,7 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -196070,7 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -196768,7 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -197003,7 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -197259,7 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -197517,7 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -198253,7 +198253,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -198464,7 +198464,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -199607,7 +199607,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -200157,7 +200157,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -200501,8 +200501,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-34.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200522,7 +200522,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200663,8 +200663,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-34.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200684,7 +200684,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200825,8 +200825,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200846,7 +200846,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-23.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200913,8 +200913,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-34.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200934,7 +200934,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201075,8 +201075,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201096,7 +201096,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201135,8 +201135,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201156,7 +201156,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201195,8 +201195,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201216,7 +201216,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201255,8 +201255,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201276,7 +201276,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201315,8 +201315,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201336,7 +201336,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-23.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201403,8 +201403,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201424,7 +201424,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201463,8 +201463,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-34.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201484,7 +201484,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201523,8 +201523,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-34.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201544,7 +201544,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203436,7 +203436,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
                       </em>
                     </p>
                   </td>
@@ -203460,7 +203460,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -204066,7 +204066,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.16" title="local-type: typedef-40.16">local-type: typedef-40.16</a>
                       </em>
                     </p>
                   </td>
@@ -205024,7 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.4" title="local-type: typedef-40.4">local-type: typedef-40.4</a>
                       </em>
                     </p>
                   </td>
@@ -205048,7 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.5" title="local-type: typedef-40.5">local-type: typedef-40.5</a>
                       </em>
                     </p>
                   </td>
@@ -205072,7 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.6" title="local-type: typedef-40.6">local-type: typedef-40.6</a>
                       </em>
                     </p>
                   </td>
@@ -205096,7 +205096,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.7" title="local-type: typedef-40.7">local-type: typedef-40.7</a>
                       </em>
                     </p>
                   </td>
@@ -205322,7 +205322,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.3" title="local-type: typedef-40.3">local-type: typedef-40.3</a>
                       </em>
                     </p>
                   </td>
@@ -206598,7 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.9" title="local-type: typedef-40.9">local-type: typedef-40.9</a>
                       </em>
                     </p>
                   </td>
@@ -206622,7 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.10" title="local-type: typedef-40.10">local-type: typedef-40.10</a>
                       </em>
                     </p>
                   </td>
@@ -206646,7 +206646,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.11" title="local-type: typedef-40.11">local-type: typedef-40.11</a>
                       </em>
                     </p>
                   </td>
@@ -206769,7 +206769,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.8" title="local-type: typedef-40.8">local-type: typedef-40.8</a>
                       </em>
                     </p>
                   </td>
@@ -207125,7 +207125,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.21" title="local-type: typedef-29.21">local-type: typedef-29.21</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.21" title="local-type: typedef-40.21">local-type: typedef-40.21</a>
                       </em>
                     </p>
                   </td>
@@ -207392,7 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.18" title="local-type: typedef-40.18">local-type: typedef-40.18</a>
                       </em>
                     </p>
                   </td>
@@ -207416,7 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.19" title="local-type: typedef-40.19">local-type: typedef-40.19</a>
                       </em>
                     </p>
                   </td>
@@ -207440,7 +207440,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.20" title="local-type: typedef-40.20">local-type: typedef-40.20</a>
                       </em>
                     </p>
                   </td>
@@ -207469,7 +207469,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.17" title="local-type: typedef-40.17">local-type: typedef-40.17</a>
                       </em>
                     </p>
                   </td>
@@ -207686,7 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.18" title="local-type: typedef-40.18">local-type: typedef-40.18</a>
                       </em>
                     </p>
                   </td>
@@ -207710,7 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.19" title="local-type: typedef-40.19">local-type: typedef-40.19</a>
                       </em>
                     </p>
                   </td>
@@ -207734,7 +207734,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.20" title="local-type: typedef-40.20">local-type: typedef-40.20</a>
                       </em>
                     </p>
                   </td>
@@ -208086,7 +208086,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
                       </em>
                     </p>
                   </td>
@@ -208115,7 +208115,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.2" title="local-type: typedef-40.2">local-type: typedef-40.2</a>
                       </em>
                     </p>
                   </td>
@@ -208485,7 +208485,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
                       </em>
                     </p>
                   </td>
@@ -208829,7 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.12" title="local-type: typedef-40.12">local-type: typedef-40.12</a>
                       </em>
                     </p>
                   </td>
@@ -208853,7 +208853,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.13" title="local-type: typedef-40.13">local-type: typedef-40.13</a>
                       </em>
                     </p>
                   </td>
@@ -209092,7 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.14" title="local-type: typedef-40.14">local-type: typedef-40.14</a>
                       </em>
                     </p>
                   </td>
@@ -209116,7 +209116,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-40.15" title="local-type: typedef-40.15">local-type: typedef-40.15</a>
                       </em>
                     </p>
                   </td>
@@ -210336,8 +210336,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-40.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210357,7 +210357,7 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-40.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210399,8 +210399,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
+        <div class="sect2" id="local-type.typedef-40.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-40.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210420,7 +210420,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.2)</code>
+                      <code>  (typedef-40.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210462,8 +210462,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)</code>
+        <div class="sect2" id="local-type.typedef-40.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-40.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210483,7 +210483,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-                      <code>  (typedef-29.16)</code>
+                      <code>  (typedef-40.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210521,8 +210521,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)</code>
+        <div class="sect2" id="local-type.typedef-40.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-40.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210542,7 +210542,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-                      <code>  (typedef-29.4)</code>
+                      <code>  (typedef-40.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210584,8 +210584,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)</code>
+        <div class="sect2" id="local-type.typedef-40.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-40.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210605,7 +210605,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-29.5)</code>
+                      <code>  (typedef-40.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210647,8 +210647,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)</code>
+        <div class="sect2" id="local-type.typedef-40.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-40.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210668,7 +210668,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-29.6)</code>
+                      <code>  (typedef-40.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210710,8 +210710,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)</code>
+        <div class="sect2" id="local-type.typedef-40.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-40.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210731,7 +210731,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-29.7)</code>
+                      <code>  (typedef-40.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210773,8 +210773,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)</code>
+        <div class="sect2" id="local-type.typedef-40.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-40.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210794,7 +210794,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-                      <code>  (typedef-29.3)</code>
+                      <code>  (typedef-40.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211123,8 +211123,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)</code>
+        <div class="sect2" id="local-type.typedef-40.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-40.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211144,7 +211144,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-29.9)</code>
+                      <code>  (typedef-40.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211186,8 +211186,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)</code>
+        <div class="sect2" id="local-type.typedef-40.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-40.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211207,7 +211207,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-29.10)</code>
+                      <code>  (typedef-40.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211296,8 +211296,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)</code>
+        <div class="sect2" id="local-type.typedef-40.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-40.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211317,7 +211317,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.11)</code>
+                      <code>  (typedef-40.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211359,8 +211359,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)</code>
+        <div class="sect2" id="local-type.typedef-40.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-40.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211380,7 +211380,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-                      <code>  (typedef-29.8)</code>
+                      <code>  (typedef-40.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211706,8 +211706,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)</code>
+        <div class="sect2" id="local-type.typedef-40.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-40.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211727,7 +211727,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.21)</code>
+                      <code>  (typedef-40.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211769,8 +211769,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
+        <div class="sect2" id="local-type.typedef-40.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-40.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211790,7 +211790,7 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.18)</code>
+                      <code>  (typedef-40.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211832,8 +211832,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
+        <div class="sect2" id="local-type.typedef-40.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-40.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211853,7 +211853,7 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-29.19)</code>
+                      <code>  (typedef-40.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211891,8 +211891,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
+        <div class="sect2" id="local-type.typedef-40.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-40.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211912,7 +211912,7 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-29.20)</code>
+                      <code>  (typedef-40.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211954,8 +211954,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)</code>
+        <div class="sect2" id="local-type.typedef-40.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-40.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211975,7 +211975,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.17)</code>
+                      <code>  (typedef-40.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212017,8 +212017,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
+        <div class="sect2" id="local-type.typedef-40.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-40.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212038,7 +212038,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.18)</code>
+                      <code>  (typedef-40.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212080,8 +212080,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
+        <div class="sect2" id="local-type.typedef-40.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-40.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212101,7 +212101,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-29.19)</code>
+                      <code>  (typedef-40.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212139,8 +212139,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
+        <div class="sect2" id="local-type.typedef-40.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-40.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212160,7 +212160,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-29.20)</code>
+                      <code>  (typedef-40.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212202,8 +212202,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-40.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212223,7 +212223,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-40.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212265,8 +212265,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
+        <div class="sect2" id="local-type.typedef-40.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-40.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212286,7 +212286,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.2)</code>
+                      <code>  (typedef-40.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212328,8 +212328,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-40.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212349,7 +212349,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-40.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212391,8 +212391,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)</code>
+        <div class="sect2" id="local-type.typedef-40.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-40.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212412,7 +212412,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-29.12)</code>
+                      <code>  (typedef-40.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212454,8 +212454,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)</code>
+        <div class="sect2" id="local-type.typedef-40.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-40.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212475,7 +212475,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-29.13)</code>
+                      <code>  (typedef-40.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212517,8 +212517,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)</code>
+        <div class="sect2" id="local-type.typedef-40.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-40.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212538,7 +212538,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-                      <code>  (typedef-29.14)</code>
+                      <code>  (typedef-40.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212580,8 +212580,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)</code>
+        <div class="sect2" id="local-type.typedef-40.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-40.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212601,7 +212601,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.15)</code>
+                      <code>  (typedef-40.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213266,12 +213266,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-39.2" class="tableblock">
+                    <p id="local-type.typedef-41.2" class="tableblock">
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-39.2)</code>
+                      <code>  (typedef-41.2)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -213316,12 +213316,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-39.1" class="tableblock">
+                    <p id="local-type.typedef-41.1" class="tableblock">
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-41.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223116,7 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-19.1" title="local-type: typedef-19.1">local-type: typedef-19.1</a>
                       </em>
                     </p>
                   </td>
@@ -223140,7 +223140,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-19.2" title="local-type: typedef-19.2">local-type: typedef-19.2</a>
                       </em>
                     </p>
                   </td>
@@ -223284,7 +223284,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.3" title="local-type: typedef-69.3">local-type: typedef-69.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-19.3" title="local-type: typedef-19.3">local-type: typedef-19.3</a>
                       </em>
                     </p>
                   </td>
@@ -223494,7 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -223518,7 +223518,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
                       </em>
                     </p>
                   </td>
@@ -223682,8 +223682,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)</code>
+        <div class="sect2" id="local-type.typedef-19.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-19.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223703,7 +223703,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-                      <code>  (typedef-69.1)</code>
+                      <code>  (typedef-19.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223746,8 +223746,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)</code>
+        <div class="sect2" id="local-type.typedef-19.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-19.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223767,7 +223767,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-                      <code>  (typedef-69.2)</code>
+                      <code>  (typedef-19.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223809,8 +223809,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)</code>
+        <div class="sect2" id="local-type.typedef-19.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-19.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223830,7 +223830,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-                      <code>  (typedef-69.3)</code>
+                      <code>  (typedef-19.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223860,7 +223860,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.4" title="local-type: typedef-69.4">local-type: typedef-69.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-19.4" title="local-type: typedef-19.4">local-type: typedef-19.4</a>
                       </em>
                     </p>
                   </td>
@@ -223872,8 +223872,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)</code>
+        <div class="sect2" id="local-type.typedef-19.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-19.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223893,7 +223893,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-69.4)</code>
+                      <code>  (typedef-19.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223968,7 +223968,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.5" title="local-type: typedef-69.5">local-type: typedef-69.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-19.5" title="local-type: typedef-19.5">local-type: typedef-19.5</a>
                       </em>
                     </p>
                   </td>
@@ -223980,8 +223980,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)</code>
+        <div class="sect2" id="local-type.typedef-19.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-19.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224001,7 +224001,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-69.5)</code>
+                      <code>  (typedef-19.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224043,8 +224043,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224064,7 +224064,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-67.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224150,8 +224150,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
+        <div class="sect2" id="local-type.typedef-23.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-23.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224171,7 +224171,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-67.2)</code>
+                      <code>  (typedef-23.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224459,7 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -224483,7 +224483,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
                       </em>
                     </p>
                   </td>
@@ -224542,8 +224542,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224563,7 +224563,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-67.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224649,8 +224649,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
+        <div class="sect2" id="local-type.typedef-23.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-23.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224670,7 +224670,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-67.2)</code>
+                      <code>  (typedef-23.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -225794,7 +225794,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
                       </em>
                     </p>
                   </td>
@@ -225816,7 +225816,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -225944,7 +225944,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -225996,7 +225996,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -227056,7 +227056,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
                       </em>
                     </p>
                   </td>
@@ -227966,7 +227966,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
                       </em>
                     </p>
                   </td>
@@ -227988,7 +227988,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -228297,7 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -228321,7 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
                       </em>
                     </p>
                   </td>
@@ -228345,7 +228345,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
                       </em>
                     </p>
                   </td>
@@ -228717,8 +228717,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228738,7 +228738,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228888,8 +228888,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
+        <div class="sect2" id="local-type.typedef-78.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-78.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228909,7 +228909,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.7)</code>
+                      <code>  (typedef-78.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228984,8 +228984,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229005,7 +229005,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229202,8 +229202,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-78.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-78.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229223,7 +229223,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-78.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229265,8 +229265,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229286,7 +229286,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229483,8 +229483,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229504,7 +229504,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229654,8 +229654,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
+        <div class="sect2" id="local-type.typedef-78.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-78.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229675,7 +229675,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.7)</code>
+                      <code>  (typedef-78.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229750,8 +229750,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-78.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-78.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229771,7 +229771,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-78.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229813,8 +229813,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229834,7 +229834,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230031,8 +230031,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
+        <div class="sect2" id="local-type.typedef-78.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230052,7 +230052,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-82.5)</code>
+                      <code>  (typedef-78.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230196,8 +230196,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)</code>
+        <div class="sect2" id="local-type.typedef-78.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-78.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230217,7 +230217,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-82.6)</code>
+                      <code>  (typedef-78.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230932,7 +230932,7 @@ <h3>42.11. The group <code>siri:SituationExchangePayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
+                      <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>
@@ -231798,7 +231798,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <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>
@@ -232111,7 +232111,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -232485,7 +232485,7 @@ <h3>42.17. The group <code>siri:SituationNetworkFilterGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <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>
@@ -233650,7 +233650,7 @@ <h3>42.26. The complex type <code>siri:SituationExchangeCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.8" title="local-type: typedef-84.8">local-type: typedef-84.8</a>
                       </em>
                     </p>
                   </td>
@@ -234158,7 +234158,7 @@ <h3>42.28. The complex type <code>siri:SituationExchangeDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
+                      <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>
@@ -234993,7 +234993,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <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>
@@ -235306,7 +235306,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -235531,7 +235531,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
+                      <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>
@@ -235555,7 +235555,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.5" title="local-type: typedef-84.5">local-type: typedef-84.5</a>
                       </em>
                     </p>
                   </td>
@@ -235603,7 +235603,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.6" title="local-type: typedef-84.6">local-type: typedef-84.6</a>
                       </em>
                     </p>
                   </td>
@@ -235627,7 +235627,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-84.7" title="local-type: typedef-84.7">local-type: typedef-84.7</a>
                       </em>
                     </p>
                   </td>
@@ -235786,7 +235786,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -235820,7 +235820,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -235849,7 +235849,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -236105,8 +236105,8 @@ <h3>42.32. The complex type <code>siri:SituationExchangeSubscriptionStructure</c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
+        <div class="sect2" id="local-type.typedef-84.8">
+          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-84.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236126,7 +236126,7 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.8)</code>
+                      <code>  (typedef-84.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236200,8 +236200,8 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236221,7 +236221,7 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-77.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236284,8 +236284,8 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236305,7 +236305,7 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236347,8 +236347,8 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236368,7 +236368,7 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236410,8 +236410,8 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236431,7 +236431,7 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236473,8 +236473,8 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
+        <div class="sect2" id="local-type.typedef-84.8">
+          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-84.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236494,7 +236494,7 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.8)</code>
+                      <code>  (typedef-84.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236568,8 +236568,8 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236589,7 +236589,7 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-77.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236652,8 +236652,8 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236673,7 +236673,7 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236715,8 +236715,8 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236736,7 +236736,7 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236778,8 +236778,8 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.4)</code>
+        <div class="sect2" id="local-type.typedef-84.4">
+          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236799,7 +236799,7 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-77.4)</code>
+                      <code>  (typedef-84.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237148,8 +237148,8 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.5">
-          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.5)</code>
+        <div class="sect2" id="local-type.typedef-84.5">
+          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237169,7 +237169,7 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-77.5)</code>
+                      <code>  (typedef-84.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237341,8 +237341,8 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.6">
-          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.6)</code>
+        <div class="sect2" id="local-type.typedef-84.6">
+          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-84.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237362,7 +237362,7 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-77.6)</code>
+                      <code>  (typedef-84.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237463,8 +237463,8 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.7)</code>
+        <div class="sect2" id="local-type.typedef-84.7">
+          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-84.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237484,7 +237484,7 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-77.7)</code>
+                      <code>  (typedef-84.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237498,8 +237498,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237519,7 +237519,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237587,8 +237587,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237608,7 +237608,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237693,8 +237693,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237714,7 +237714,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -239249,7 +239249,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -241802,7 +241802,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
                       </em>
                     </p>
                   </td>
@@ -243134,7 +243134,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -243813,7 +243813,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -243953,7 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -243977,7 +243977,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -244049,7 +244049,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
                       </em>
                     </p>
                   </td>
@@ -244183,7 +244183,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -244217,7 +244217,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -244246,7 +244246,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -244274,7 +244274,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
                       </em>
                     </p>
                   </td>
@@ -244977,8 +244977,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-74.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-74.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -244998,7 +244998,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-74.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245072,8 +245072,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245093,7 +245093,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245153,8 +245153,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-74.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-74.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245174,7 +245174,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-74.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245248,8 +245248,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245269,7 +245269,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245329,8 +245329,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245350,7 +245350,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245410,8 +245410,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245431,7 +245431,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-80.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245624,8 +245624,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245645,7 +245645,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-80.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245985,8 +245985,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
+        <div class="sect2" id="local-type.typedef-74.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-74.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246006,7 +246006,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-80.4)</code>
+                      <code>  (typedef-74.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246066,8 +246066,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246087,7 +246087,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246155,8 +246155,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246176,7 +246176,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246261,8 +246261,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246282,7 +246282,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246367,8 +246367,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
+        <div class="sect2" id="local-type.typedef-74.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-74.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246388,7 +246388,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-80.6)</code>
+                      <code>  (typedef-74.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -247532,7 +247532,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -248676,7 +248676,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -248724,7 +248724,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -248883,7 +248883,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -248917,7 +248917,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -248946,7 +248946,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -248974,7 +248974,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -249930,8 +249930,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249951,7 +249951,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250025,8 +250025,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250046,7 +250046,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250120,8 +250120,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250141,7 +250141,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250235,8 +250235,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250256,7 +250256,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250381,8 +250381,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250402,7 +250402,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250470,8 +250470,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250491,7 +250491,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250576,8 +250576,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250597,7 +250597,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250682,8 +250682,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250703,7 +250703,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-75.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252104,7 +252104,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -252232,8 +252232,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -252253,7 +252253,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252516,12 +252516,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-18.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254795,7 +254795,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <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>
@@ -255918,7 +255918,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <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>
@@ -256232,7 +256232,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.7" title="local-type: typedef-80.7">local-type: typedef-80.7</a>
                       </em>
                     </p>
                   </td>
@@ -257372,7 +257372,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <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>
@@ -257532,7 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
                       </em>
                     </p>
                   </td>
@@ -257556,7 +257556,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
                       </em>
                     </p>
                   </td>
@@ -257604,7 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
                       </em>
                     </p>
                   </td>
@@ -257628,7 +257628,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
                       </em>
                     </p>
                   </td>
@@ -257787,7 +257787,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-66.1" title="local-type: typedef-66.1">local-type: typedef-66.1</a>
                       </em>
                     </p>
                   </td>
@@ -257821,7 +257821,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
                       </em>
                     </p>
                   </td>
@@ -257850,7 +257850,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
                       </em>
                     </p>
                   </td>
@@ -257878,7 +257878,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.8" title="local-type: typedef-80.8">local-type: typedef-80.8</a>
                       </em>
                     </p>
                   </td>
@@ -258291,8 +258291,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-80.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258312,7 +258312,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-80.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258386,8 +258386,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258407,7 +258407,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258467,8 +258467,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-80.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258488,7 +258488,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-80.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259955,7 +259955,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <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>
@@ -259976,7 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <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>
@@ -260000,7 +260000,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <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>
@@ -260021,7 +260021,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <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>
@@ -260042,7 +260042,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <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>
@@ -260140,8 +260140,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-45.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260161,7 +260161,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-45.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260203,8 +260203,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-45.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260224,7 +260224,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-45.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260266,8 +260266,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-49.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260287,7 +260287,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-49.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260374,8 +260374,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-49.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260395,7 +260395,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-49.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260482,8 +260482,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-49.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260503,7 +260503,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-49.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260590,8 +260590,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-80.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260611,7 +260611,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-80.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260685,8 +260685,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260706,7 +260706,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260766,8 +260766,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-80.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260787,7 +260787,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-80.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260929,8 +260929,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-80.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260950,7 +260950,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-80.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261224,8 +261224,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261245,7 +261245,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261369,8 +261369,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)</code>
+        <div class="sect2" id="local-type.typedef-80.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261390,7 +261390,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-79.6)</code>
+                      <code>  (typedef-80.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261450,8 +261450,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-66.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261471,7 +261471,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-66.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261539,8 +261539,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-48.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261560,7 +261560,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-48.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261645,8 +261645,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-48.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261666,7 +261666,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-48.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261751,8 +261751,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)</code>
+        <div class="sect2" id="local-type.typedef-80.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261772,7 +261772,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.8)</code>
+                      <code>  (typedef-80.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261955,7 +261955,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -261986,7 +261986,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
                       </em>
                     </p>
                   </td>
@@ -262372,7 +262372,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -262554,8 +262554,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262575,7 +262575,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262653,7 +262653,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -262684,7 +262684,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
                       </em>
                     </p>
                   </td>
@@ -263070,7 +263070,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -263252,8 +263252,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263273,7 +263273,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263507,8 +263507,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-60.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263528,7 +263528,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-60.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263836,8 +263836,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263857,7 +263857,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264101,7 +264101,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <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>
@@ -264162,8 +264162,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-62.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264183,7 +264183,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-62.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">

From 4b304187b419cab63af47753913306fd9d888d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Wed, 15 Jul 2026 16:40:50 +0200
Subject: [PATCH 3/8] Revert "Run ./docs/generate-tables.sh locally
 (work-around for #228)"

This reverts commit 57e67d826b8920717d57183d179c7742fd1fad3a.
---
 docs/generated/contab/acsb.html   |   40 +-
 docs/generated/contab/datex2.html |   32 +-
 docs/generated/contab/ifopt.html  |   94 +-
 docs/generated/contab/siri.html   | 2908 ++++++++++++++---------------
 4 files changed, 1537 insertions(+), 1537 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index 41b3e41c..d1e20447 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
                       </em>
                     </p>
                   </td>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-31.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-31.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-31.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-31.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-31.2)</code>
+        <div class="sect2" id="local-type.typedef-15.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-31.2)</code>
+                      <code>  (typedef-15.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-1
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <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-30.1" class="tableblock">
+                    <p id="local-type.typedef-14.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-                      <code>  (typedef-30.1)</code>
+                      <code>  (typedef-14.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-30.1" title="local-type: typedef-30.1">local-type: typedef-30.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-30.1" title="local-type: typedef-30.1">local-type: typedef-30.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index 37a57bfc..63eef8fc 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.1" title="local-type: typedef-70.1">local-type: typedef-70.1</a>
                       </em>
                     </p>
                   </td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </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>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.3" title="local-type: typedef-70.3">local-type: typedef-70.3</a>
                       </em>
                     </p>
                   </td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </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>+<a shape="rect" href="#local-type.typedef-70.4" title="local-type: typedef-70.4">local-type: typedef-70.4</a>
                       </em>
                     </p>
                   </td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-70.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-70.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-29.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-                      <code>  (typedef-29.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-29.3)</code>
+        <div class="sect2" id="local-type.typedef-70.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-70.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-                      <code>  (typedef-29.3)</code>
+                      <code>  (typedef-70.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-29.4)</code>
+        <div class="sect2" id="local-type.typedef-70.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-                      <code>  (typedef-29.4)</code>
+                      <code>  (typedef-70.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index 92ead162..597e1770 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,7 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8212,7 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-9.1" title="local-type: typedef-9.1">local-type: typedef-9.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8237,7 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8562,7 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,8 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-9.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8595,7 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-9.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8633,8 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-9.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-9.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8654,7 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-9.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8692,8 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8713,7 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8729,8 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8750,7 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9391,7 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9568,7 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9597,7 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.2" title="local-type: typedef-13.2">local-type: typedef-13.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
                       </em>
                     </p>
                   </td>
@@ -9659,7 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9908,7 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.1" title="local-type: typedef-13.1">local-type: typedef-13.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9941,7 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-13.3" title="local-type: typedef-13.3">local-type: typedef-13.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.3" title="local-type: typedef-55.3">local-type: typedef-55.3</a>
                       </em>
                     </p>
                   </td>
@@ -9953,8 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -9974,7 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10016,8 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10037,7 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10079,8 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-13.2)</code>
+        <div class="sect2" id="local-type.typedef-55.2">
+          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10100,7 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-                      <code>  (typedef-13.2)</code>
+                      <code>  (typedef-55.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10143,8 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10164,7 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10206,8 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-13.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10227,7 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-13.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10269,8 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-13.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-13.3)</code>
+        <div class="sect2" id="local-type.typedef-55.3">
+          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10290,7 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-                      <code>  (typedef-13.3)</code>
+                      <code>  (typedef-55.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13149,7 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-57.1" title="local-type: typedef-57.1">local-type: typedef-57.1</a>
                       </em>
                     </p>
                   </td>
@@ -13161,8 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-57.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13182,7 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-57.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13416,8 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13437,7 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index f6c5307e..1f48c491 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -5535,7 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -5944,7 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -5975,7 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -6361,7 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -6957,7 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -7063,7 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -7094,7 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -7343,7 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -7405,7 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -7736,7 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -8176,7 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -8670,7 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -8701,7 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -8973,7 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -9035,7 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -9572,7 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -10886,7 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -11433,7 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -12192,7 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -12894,7 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -14410,7 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15029,7 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15320,8 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15341,7 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15585,7 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -15646,8 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15667,7 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15778,8 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15799,7 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16033,8 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-78.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16054,7 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-78.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16134,7 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -16165,7 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -16551,7 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -16733,8 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-86.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16754,7 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16988,8 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17009,7 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-60.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17317,8 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17338,7 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17582,7 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -17643,8 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17664,7 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17775,8 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17796,7 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18104,8 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18125,7 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18369,7 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -18430,8 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18451,7 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18562,8 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18583,7 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18817,8 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18838,7 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19146,8 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19167,7 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19557,8 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19578,7 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19796,8 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19817,7 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20061,7 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -20122,8 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20143,7 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20254,8 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20275,7 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20386,8 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20407,7 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20641,8 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20662,7 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20970,8 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20991,7 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21381,8 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21402,7 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21620,8 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21641,7 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21791,8 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21812,7 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22009,8 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22030,7 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22180,8 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22201,7 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22312,8 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22333,7 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22444,8 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22465,7 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22662,8 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22683,7 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23212,7 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -23972,7 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24280,7 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -24311,7 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -24728,7 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24943,7 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -25062,7 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -25093,7 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -25853,7 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -26555,7 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -27337,7 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -27368,7 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -27617,7 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -27679,7 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -27979,7 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -28716,8 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-60.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-60.3)</code>
+        <div class="sect2" id="local-type.typedef-3.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-3.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -28737,7 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-60.3)</code>
+                      <code>  (typedef-3.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -28981,7 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -29042,8 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29063,7 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29174,8 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-60.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-60.1)</code>
+        <div class="sect2" id="local-type.typedef-3.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-3.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29195,7 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-60.1)</code>
+                      <code>  (typedef-3.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29463,8 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29484,7 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-60.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29792,8 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29813,7 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30057,7 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -30118,8 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30139,7 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30250,8 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30271,7 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30505,8 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30526,7 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30834,8 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30855,7 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31099,7 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -31160,8 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31181,7 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31292,8 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31313,7 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31424,8 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31445,7 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31679,8 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31700,7 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32008,8 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32029,7 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32140,8 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32161,7 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32272,8 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32293,7 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32527,8 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32548,7 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32856,8 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32877,7 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33267,8 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33288,7 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33506,8 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33527,7 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33771,7 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -33832,8 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33853,7 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34542,7 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -34808,7 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.3" title="local-type: typedef-63.3">local-type: typedef-63.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -37048,7 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -37386,7 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -38301,7 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -38508,7 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.3" title="local-type: typedef-63.3">local-type: typedef-63.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -39146,7 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-63.4" title="local-type: typedef-63.4">local-type: typedef-63.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -41623,7 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -41635,8 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41656,7 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41767,8 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-63.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41788,7 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41899,8 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41920,7 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42031,8 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42052,7 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42163,8 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-63.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42184,7 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42295,8 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-63.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42316,7 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42427,8 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-63.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42448,7 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42559,8 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-63.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-63.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42580,7 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-63.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -50447,7 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -53179,7 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </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>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
                       </em>
                     </p>
                   </td>
@@ -53207,7 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </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>+<a shape="rect" href="#local-type.typedef-5.3" title="local-type: typedef-5.3">local-type: typedef-5.3</a>
                       </em>
                     </p>
                   </td>
@@ -55353,8 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55374,7 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55485,8 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-62.2)</code>
+        <div class="sect2" id="local-type.typedef-5.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55506,7 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-                      <code>  (typedef-62.2)</code>
+                      <code>  (typedef-5.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55574,8 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-62.3)</code>
+        <div class="sect2" id="local-type.typedef-5.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55595,7 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-                      <code>  (typedef-62.3)</code>
+                      <code>  (typedef-5.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -57952,7 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-81.3" title="local-type: typedef-81.3">local-type: typedef-81.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
                       </em>
                     </p>
                   </td>
@@ -59634,7 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
                       </em>
                     </p>
                   </td>
@@ -59658,7 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
                       </em>
                     </p>
                   </td>
@@ -61934,8 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-81.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -61955,7 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -61993,8 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-81.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62014,7 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62052,8 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.1)</code>
+        <div class="sect2" id="local-type.typedef-83.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62073,7 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-81.1)</code>
+                      <code>  (typedef-83.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62182,8 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-81.2)</code>
+        <div class="sect2" id="local-type.typedef-83.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62203,7 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-81.2)</code>
+                      <code>  (typedef-83.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63829,7 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -64952,7 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -64976,7 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -66192,8 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66213,7 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66287,8 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66308,7 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66378,8 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66399,7 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-73.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67846,7 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -67867,7 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -67888,7 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -67909,7 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.9" title="local-type: typedef-77.9">local-type: typedef-77.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -67930,7 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.10" title="local-type: typedef-77.10">local-type: typedef-77.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -68296,7 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -69772,7 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69802,7 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -69931,7 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69961,7 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -71792,7 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.18" title="local-type: typedef-77.18">local-type: typedef-77.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -71822,7 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.19" title="local-type: typedef-77.19">local-type: typedef-77.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -72554,7 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.14" title="local-type: typedef-77.14">local-type: typedef-77.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.14" title="local-type: typedef-72.14">local-type: typedef-72.14</a>
                       </em>
                     </p>
                   </td>
@@ -73253,7 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -73274,7 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -73295,7 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -73316,7 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.9" title="local-type: typedef-77.9">local-type: typedef-77.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -73337,7 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.10" title="local-type: typedef-77.10">local-type: typedef-77.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -73583,7 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74258,7 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74522,7 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.11" title="local-type: typedef-77.11">local-type: typedef-77.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.11" title="local-type: typedef-72.11">local-type: typedef-72.11</a>
                       </em>
                     </p>
                   </td>
@@ -74546,7 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.12" title="local-type: typedef-77.12">local-type: typedef-77.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.12" title="local-type: typedef-72.12">local-type: typedef-72.12</a>
                       </em>
                     </p>
                   </td>
@@ -74618,7 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.13" title="local-type: typedef-77.13">local-type: typedef-77.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.13" title="local-type: typedef-72.13">local-type: typedef-72.13</a>
                       </em>
                     </p>
                   </td>
@@ -74752,7 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -74786,7 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -74815,7 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -75563,7 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.15" title="local-type: typedef-77.15">local-type: typedef-77.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.15" title="local-type: typedef-72.15">local-type: typedef-72.15</a>
                       </em>
                     </p>
                   </td>
@@ -76406,7 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.16" title="local-type: typedef-77.16">local-type: typedef-77.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.16" title="local-type: typedef-72.16">local-type: typedef-72.16</a>
                       </em>
                     </p>
                   </td>
@@ -76535,7 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.17" title="local-type: typedef-77.17">local-type: typedef-77.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.17" title="local-type: typedef-72.17">local-type: typedef-72.17</a>
                       </em>
                     </p>
                   </td>
@@ -79917,8 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-77.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -79938,7 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80012,8 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80033,7 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80075,8 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-77.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80096,7 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80126,7 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -80138,8 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-77.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80159,7 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80329,7 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -80353,7 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -80365,8 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-77.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80386,7 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80428,8 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-77.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80449,7 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80491,8 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-77.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80512,7 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80542,7 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -80554,8 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-77.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80575,7 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-77.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80708,8 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-77.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80729,7 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-77.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80771,8 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-77.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80792,7 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-77.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80834,8 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80855,7 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80897,8 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80918,7 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-77.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80960,8 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80981,7 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-77.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81051,8 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81072,7 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-77.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81114,8 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81135,7 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-77.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81205,8 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-77.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81226,7 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-77.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81268,8 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-77.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81289,7 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-77.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81359,8 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-77.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81380,7 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-77.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81454,8 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-77.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81475,7 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81517,8 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-77.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81538,7 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81568,7 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -81580,8 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-77.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81601,7 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81771,7 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -81795,7 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -81807,8 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-77.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81828,7 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81870,8 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-77.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81891,7 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81933,8 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-77.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81954,7 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-77.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81984,7 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -81996,8 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-77.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82017,7 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-77.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82150,8 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-77.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82171,7 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-77.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82213,8 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-77.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82234,7 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-77.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82276,8 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82297,7 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82339,8 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-77.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82360,7 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-77.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82402,8 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.11)</code>
+        <div class="sect2" id="local-type.typedef-72.11">
+          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82423,7 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-77.11)</code>
+                      <code>  (typedef-72.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82555,8 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.12)</code>
+        <div class="sect2" id="local-type.typedef-72.12">
+          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82576,7 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-77.12)</code>
+                      <code>  (typedef-72.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82794,8 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.13)</code>
+        <div class="sect2" id="local-type.typedef-72.13">
+          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82815,7 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-77.13)</code>
+                      <code>  (typedef-72.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82852,8 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82873,7 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82941,8 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82962,7 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83047,8 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83068,7 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83153,8 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-77.15)</code>
+        <div class="sect2" id="local-type.typedef-72.15">
+          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83174,7 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-                      <code>  (typedef-77.15)</code>
+                      <code>  (typedef-72.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83325,7 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -83346,7 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -83358,8 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83379,7 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83409,7 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -83421,8 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83442,7 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83557,8 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83578,7 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83620,8 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-77.16)</code>
+        <div class="sect2" id="local-type.typedef-72.16">
+          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83641,7 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-                      <code>  (typedef-77.16)</code>
+                      <code>  (typedef-72.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83683,8 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-77.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-77.17)</code>
+        <div class="sect2" id="local-type.typedef-72.17">
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83704,7 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Drive
                       <br/>
                       <code>  /DriverScope #complexType</code>
                       <br/>
-                      <code>  (typedef-77.17)</code>
+                      <code>  (typedef-72.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -86197,7 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -86259,7 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -87027,7 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -87089,7 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -92109,8 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92130,7 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92348,8 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92369,7 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92759,8 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92780,7 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93170,8 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93191,7 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93409,8 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-76.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93430,7 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93820,8 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-76.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-76.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93841,7 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-76.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94894,7 +94894,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -94916,7 +94916,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -95387,7 +95387,7 @@ <h3>11.15. The complex type <code>siri:EstimatedTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-76.4" title="local-type: typedef-76.4">local-type: typedef-76.4</a>
                       </em>
                     </p>
                   </td>
@@ -96301,7 +96301,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-76.1" title="local-type: typedef-76.1">local-type: typedef-76.1</a>
                       </em>
                     </p>
                   </td>
@@ -96323,7 +96323,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -96634,7 +96634,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <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>
@@ -96658,7 +96658,7 @@ <h3>11.20. The complex type <code>siri:EstimatedTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <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>
@@ -97174,8 +97174,8 @@ <h3>11.22. The complex type <code>siri:EstimatedVersionFrameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-76.4">
+          <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97195,7 +97195,7 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-76.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97269,8 +97269,8 @@ <h3>11.23. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-85.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97290,7 +97290,7 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-85.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97332,8 +97332,8 @@ <h3>11.24. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-76.4">
+          <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#complexType (typedef-76.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97353,7 +97353,7 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-76.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97427,8 +97427,8 @@ <h3>11.25. The complex type <code>element[siri:EstimatedTimetablePermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-85.1)</code>
+        <div class="sect2" id="local-type.typedef-76.1">
+          <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines#complexType (typedef-76.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97448,7 +97448,7 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-85.1)</code>
+                      <code>  (typedef-76.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97490,8 +97490,8 @@ <h3>11.26. The complex type <code>group[siri:EstimatedTimetableTopicGroup]/Lines
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-76.2">
+          <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-76.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97511,7 +97511,7 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-76.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -97701,8 +97701,8 @@ <h3>11.27. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-76.3">
+          <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-76.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -97722,7 +97722,7 @@ <h3>11.28. The complex type <code>complexType[siri:EstimatedTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-76.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99633,7 +99633,7 @@ <h3>12.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
                       </em>
                     </p>
                   </td>
@@ -100830,7 +100830,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <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>
@@ -100854,7 +100854,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -100902,7 +100902,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
                       </em>
                     </p>
                   </td>
@@ -100926,7 +100926,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
                       </em>
                     </p>
                   </td>
@@ -101085,7 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -101119,7 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -101148,7 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -101404,8 +101404,8 @@ <h3>12.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-73.5">
+          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101425,7 +101425,7 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-73.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101499,8 +101499,8 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-73.5">
+          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101520,7 +101520,7 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-73.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101594,8 +101594,8 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101615,7 +101615,7 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101880,8 +101880,8 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101901,7 +101901,7 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102073,8 +102073,8 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-73.3">
+          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102094,7 +102094,7 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-73.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102195,8 +102195,8 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-73.4">
+          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102216,7 +102216,7 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-73.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102276,8 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102297,7 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102365,8 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102386,7 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102471,8 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102492,7 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103671,7 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
+                      <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>
@@ -104614,7 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <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>
@@ -104796,7 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -104829,7 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
+                      <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>
@@ -105655,8 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105676,7 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105750,8 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105771,7 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105845,8 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105866,7 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105932,8 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105953,7 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -106021,8 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -106042,7 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -110248,7 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -110269,7 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -110293,7 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -110314,7 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -110335,7 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -110363,7 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-38.1" title="local-type: typedef-38.1">local-type: typedef-38.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.1" title="local-type: typedef-21.1">local-type: typedef-21.1</a>
                       </em>
                     </p>
                   </td>
@@ -111078,7 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-38.2" title="local-type: typedef-38.2">local-type: typedef-38.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.2" title="local-type: typedef-21.2">local-type: typedef-21.2</a>
                       </em>
                     </p>
                   </td>
@@ -113113,8 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113134,7 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113176,8 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113197,7 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113239,8 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113260,7 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113347,8 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113368,7 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113455,8 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113476,7 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113563,8 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-38.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-38.1)</code>
+        <div class="sect2" id="local-type.typedef-21.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113584,7 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-38.1)</code>
+                      <code>  (typedef-21.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113627,8 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-38.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-38.2)</code>
+        <div class="sect2" id="local-type.typedef-21.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113648,7 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-38.2)</code>
+                      <code>  (typedef-21.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -119107,7 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -119128,7 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -119152,7 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -119173,7 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -119194,7 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -119218,7 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-36.1" title="local-type: typedef-36.1">local-type: typedef-36.1</a>
                       </em>
                     </p>
                   </td>
@@ -119242,7 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-36.2" title="local-type: typedef-36.2">local-type: typedef-36.2</a>
                       </em>
                     </p>
                   </td>
@@ -120624,8 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120645,7 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120687,8 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120708,7 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120750,8 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120771,7 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120858,8 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120879,7 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120966,8 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120987,7 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121074,8 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-35.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-35.1)</code>
+        <div class="sect2" id="local-type.typedef-36.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121095,7 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-35.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121138,8 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-35.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-35.2)</code>
+        <div class="sect2" id="local-type.typedef-36.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121159,7 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-35.2)</code>
+                      <code>  (typedef-36.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -126321,7 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -126342,7 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -127039,7 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.6" title="local-type: typedef-46.6">local-type: typedef-46.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
                       </em>
                     </p>
                   </td>
@@ -127323,7 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.5" title="local-type: typedef-46.5">local-type: typedef-46.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
                       </em>
                     </p>
                   </td>
@@ -128258,7 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -128378,7 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -128399,7 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -128810,7 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.4" title="local-type: typedef-46.4">local-type: typedef-46.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129317,8 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-46.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129338,7 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-46.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129494,8 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-46.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129515,7 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-46.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129557,8 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-46.6)</code>
+        <div class="sect2" id="local-type.typedef-22.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129578,7 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-46.6)</code>
+                      <code>  (typedef-22.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129620,8 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-46.5)</code>
+        <div class="sect2" id="local-type.typedef-22.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129641,7 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-                      <code>  (typedef-46.5)</code>
+                      <code>  (typedef-22.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129897,7 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.4" title="local-type: typedef-46.4">local-type: typedef-46.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129934,8 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-46.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129955,7 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-46.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129998,8 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-46.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130019,7 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-46.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130061,8 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-46.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130082,7 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-46.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130238,8 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-46.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130259,7 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-46.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130301,8 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-46.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130322,7 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-46.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131790,12 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-18.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -135452,7 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -135473,7 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -135494,7 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -135712,7 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -139290,7 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.5" title="local-type: typedef-49.5">local-type: typedef-49.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -139671,7 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.7" title="local-type: typedef-49.7">local-type: typedef-49.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -140824,7 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141002,7 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141139,7 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141789,7 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141967,7 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141991,7 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.6" title="local-type: typedef-49.6">local-type: typedef-49.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
                       </em>
                     </p>
                   </td>
@@ -143152,7 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -146171,7 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -147562,7 +147562,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -147740,7 +147740,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148173,7 +148173,7 @@ <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.7" title="local-type: typedef-49.7">local-type: typedef-49.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -148421,7 +148421,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.9" title="local-type: typedef-49.9">local-type: typedef-49.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -148599,7 +148599,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.8" title="local-type: typedef-49.8">local-type: typedef-49.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148665,7 +148665,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-49.5" title="local-type: typedef-49.5">local-type: typedef-49.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -149519,8 +149519,8 @@ <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149540,7 +149540,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149627,8 +149627,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149648,7 +149648,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149735,8 +149735,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149756,7 +149756,7 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149843,8 +149843,8 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.1">
-          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149864,7 +149864,7 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-49.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149906,8 +149906,8 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.5">
-          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-49.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149927,7 +149927,7 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-49.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150014,8 +150014,8 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.7">
-          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-49.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150035,7 +150035,7 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-49.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150077,8 +150077,8 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150098,7 +150098,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150140,8 +150140,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.8">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150161,7 +150161,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150281,8 +150281,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.9">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150302,7 +150302,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150344,8 +150344,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.9">
-          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150365,7 +150365,7 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150407,8 +150407,8 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.8">
-          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150428,7 +150428,7 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150548,8 +150548,8 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.6">
-          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-49.6)</code>
+        <div class="sect2" id="local-type.typedef-18.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150569,7 +150569,7 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-                      <code>  (typedef-49.6)</code>
+                      <code>  (typedef-18.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150656,8 +150656,8 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.1">
-          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150677,7 +150677,7 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-49.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150719,8 +150719,8 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.1">
-          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-49.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150740,7 +150740,7 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-49.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150782,8 +150782,8 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.9">
-          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150803,7 +150803,7 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150845,8 +150845,8 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.8">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150866,7 +150866,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150986,8 +150986,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.7">
-          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-49.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151007,7 +151007,7 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-49.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151049,8 +151049,8 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.9">
-          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-49.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151070,7 +151070,7 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151112,8 +151112,8 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.8">
-          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-49.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151133,7 +151133,7 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-49.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151253,8 +151253,8 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.5">
-          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-49.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151274,7 +151274,7 @@ <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-49.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -156431,7 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -156465,7 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -156494,7 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -156523,7 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.3" title="local-type: typedef-48.3">local-type: typedef-48.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.3" title="local-type: typedef-27.3">local-type: typedef-27.3</a>
                       </em>
                     </p>
                   </td>
@@ -157075,8 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-48.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157096,7 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157181,8 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157202,7 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157287,8 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157308,7 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157393,8 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157414,7 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157482,8 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157503,7 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157588,8 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157609,7 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157694,8 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-48.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157715,7 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -163928,7 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -163949,7 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -163973,7 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -163994,7 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -164015,7 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -166738,7 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.1" title="local-type: typedef-28.1">local-type: typedef-28.1</a>
                       </em>
                     </p>
                   </td>
@@ -166759,7 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.2" title="local-type: typedef-28.2">local-type: typedef-28.2</a>
                       </em>
                     </p>
                   </td>
@@ -166780,7 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.3" title="local-type: typedef-28.3">local-type: typedef-28.3</a>
                       </em>
                     </p>
                   </td>
@@ -167885,7 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -167906,7 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -167930,7 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -167951,7 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -167972,7 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -171315,7 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -171336,7 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -171360,7 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -171381,7 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -171402,7 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -172064,8 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172085,7 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172127,8 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172148,7 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172190,8 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172211,7 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172298,8 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172319,7 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172406,8 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172427,7 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172514,8 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-45.1)</code>
+        <div class="sect2" id="local-type.typedef-28.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172535,7 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-                      <code>  (typedef-45.1)</code>
+                      <code>  (typedef-28.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172599,8 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-45.2)</code>
+        <div class="sect2" id="local-type.typedef-28.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172620,7 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-                      <code>  (typedef-45.2)</code>
+                      <code>  (typedef-28.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172707,8 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-45.3)</code>
+        <div class="sect2" id="local-type.typedef-28.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172728,7 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-                      <code>  (typedef-45.3)</code>
+                      <code>  (typedef-28.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172792,8 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172813,7 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172855,8 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172876,7 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172918,8 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172939,7 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173026,8 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173047,7 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173134,8 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173155,7 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173242,8 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173263,7 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173305,8 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173326,7 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173368,8 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173389,7 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173476,8 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173497,7 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173584,8 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173605,7 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -178315,12 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-52.3" class="tableblock">
+                    <p id="local-type.typedef-34.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-                      <code>  (typedef-52.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178501,12 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-52.1" class="tableblock">
+                    <p id="local-type.typedef-34.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-                      <code>  (typedef-52.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178567,12 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-18.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -179200,7 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -179284,7 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -180050,7 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -180071,7 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -180224,7 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -180383,7 +180383,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -180931,7 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -181015,7 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -181164,7 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -181185,7 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -181871,7 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -182030,7 +182030,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -182578,7 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -182662,7 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -182811,7 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -182832,7 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -183195,7 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -183385,7 +183385,7 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -183885,7 +183885,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.6" title="local-type: typedef-52.6">local-type: typedef-52.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.6" title="local-type: typedef-34.6">local-type: typedef-34.6</a>
                       </em>
                     </p>
                   </td>
@@ -183909,7 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.7" title="local-type: typedef-52.7">local-type: typedef-52.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.7" title="local-type: typedef-34.7">local-type: typedef-34.7</a>
                       </em>
                     </p>
                   </td>
@@ -183933,7 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.9" title="local-type: typedef-52.9">local-type: typedef-52.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.9" title="local-type: typedef-34.9">local-type: typedef-34.9</a>
                       </em>
                     </p>
                   </td>
@@ -183957,7 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.10" title="local-type: typedef-52.10">local-type: typedef-52.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.10" title="local-type: typedef-34.10">local-type: typedef-34.10</a>
                       </em>
                     </p>
                   </td>
@@ -183981,7 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.11" title="local-type: typedef-52.11">local-type: typedef-52.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.11" title="local-type: typedef-34.11">local-type: typedef-34.11</a>
                       </em>
                     </p>
                   </td>
@@ -184005,7 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.12" title="local-type: typedef-52.12">local-type: typedef-52.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.12" title="local-type: typedef-34.12">local-type: typedef-34.12</a>
                       </em>
                     </p>
                   </td>
@@ -184029,7 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.13" title="local-type: typedef-52.13">local-type: typedef-52.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.13" title="local-type: typedef-34.13">local-type: typedef-34.13</a>
                       </em>
                     </p>
                   </td>
@@ -185577,7 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.17" title="local-type: typedef-52.17">local-type: typedef-52.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.17" title="local-type: typedef-34.17">local-type: typedef-34.17</a>
                       </em>
                     </p>
                   </td>
@@ -186074,7 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -186233,7 +186233,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -186781,7 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -186865,7 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -187014,7 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -187035,7 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -187757,7 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -187916,7 +187916,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.2" title="local-type: typedef-52.2">local-type: typedef-52.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -188464,7 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/Users/thbar/git/transport/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-52.3" title="local-type: typedef-52.3">local-type: typedef-52.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -188548,7 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.4" title="local-type: typedef-52.4">local-type: typedef-52.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -188697,7 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.14" title="local-type: typedef-52.14">local-type: typedef-52.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -188718,7 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.16" title="local-type: typedef-52.16">local-type: typedef-52.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -189503,8 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189524,7 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -189554,7 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -189566,8 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189587,7 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190016,8 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190037,7 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190067,7 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190079,8 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190100,7 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190215,8 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190236,7 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190278,8 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190299,7 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190343,8 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190364,7 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190394,7 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -190406,8 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190427,7 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190856,8 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190877,7 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190907,7 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190919,8 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190940,7 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191055,8 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191076,7 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191118,8 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191139,7 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191183,8 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191204,7 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191234,7 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -191246,8 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191267,7 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191696,8 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191717,7 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191747,7 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -191759,8 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191780,7 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191895,8 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191916,7 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191958,8 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191979,7 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192023,8 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-52.6)</code>
+        <div class="sect2" id="local-type.typedef-34.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192044,7 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-                      <code>  (typedef-52.6)</code>
+                      <code>  (typedef-34.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192130,8 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-52.7)</code>
+        <div class="sect2" id="local-type.typedef-34.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192151,7 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.7)</code>
+                      <code>  (typedef-34.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192181,7 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.8" title="local-type: typedef-52.8">local-type: typedef-52.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.8" title="local-type: typedef-34.8">local-type: typedef-34.8</a>
                       </em>
                     </p>
                   </td>
@@ -192193,8 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-52.8)</code>
+        <div class="sect2" id="local-type.typedef-34.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192214,7 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-                      <code>  (typedef-52.8)</code>
+                      <code>  (typedef-34.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192809,8 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-52.9)</code>
+        <div class="sect2" id="local-type.typedef-34.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192830,7 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-52.9)</code>
+                      <code>  (typedef-34.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192872,8 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-52.10)</code>
+        <div class="sect2" id="local-type.typedef-34.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192893,7 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-52.10)</code>
+                      <code>  (typedef-34.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192935,8 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-52.11)</code>
+        <div class="sect2" id="local-type.typedef-34.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192956,7 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-                      <code>  (typedef-52.11)</code>
+                      <code>  (typedef-34.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192998,8 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-52.12)</code>
+        <div class="sect2" id="local-type.typedef-34.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193019,7 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-                      <code>  (typedef-52.12)</code>
+                      <code>  (typedef-34.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193061,8 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-52.13)</code>
+        <div class="sect2" id="local-type.typedef-34.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193082,7 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-                      <code>  (typedef-52.13)</code>
+                      <code>  (typedef-34.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193124,8 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-52.17)</code>
+        <div class="sect2" id="local-type.typedef-34.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193145,7 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-52.17)</code>
+                      <code>  (typedef-34.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193187,8 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193208,7 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193252,8 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193273,7 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193303,7 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -193315,8 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193336,7 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193765,8 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193786,7 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193816,7 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -193828,8 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193849,7 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193964,8 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193985,7 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194027,8 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-52.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194048,7 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-52.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194092,8 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-52.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194113,7 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-52.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194143,7 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.5" title="local-type: typedef-52.5">local-type: typedef-52.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -194155,8 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-52.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194176,7 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-52.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194605,8 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-52.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194626,7 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-52.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194656,7 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.15" title="local-type: typedef-52.15">local-type: typedef-52.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -194668,8 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-52.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194689,7 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-52.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194804,8 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-52.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194825,7 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-52.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195664,7 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -195904,7 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
                       </em>
                     </p>
                   </td>
@@ -196070,7 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -196768,7 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197003,7 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197259,7 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197517,7 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -198253,7 +198253,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
                       </em>
                     </p>
                   </td>
@@ -198464,7 +198464,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -199607,7 +199607,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -200157,7 +200157,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -200501,8 +200501,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200522,7 +200522,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200663,8 +200663,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200684,7 +200684,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200825,8 +200825,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-23.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200846,7 +200846,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-23.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200913,8 +200913,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200934,7 +200934,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201075,8 +201075,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201096,7 +201096,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201135,8 +201135,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201156,7 +201156,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201195,8 +201195,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201216,7 +201216,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201255,8 +201255,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201276,7 +201276,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201315,8 +201315,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-23.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201336,7 +201336,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-23.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201403,8 +201403,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201424,7 +201424,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201463,8 +201463,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-34.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201484,7 +201484,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201523,8 +201523,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-34.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201544,7 +201544,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203436,7 +203436,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -203460,7 +203460,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -204066,7 +204066,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.16" title="local-type: typedef-29.16">local-type: typedef-29.16</a>
                       </em>
                     </p>
                   </td>
@@ -205024,7 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
                       </em>
                     </p>
                   </td>
@@ -205048,7 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.5" title="local-type: typedef-29.5">local-type: typedef-29.5</a>
                       </em>
                     </p>
                   </td>
@@ -205072,7 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.6" title="local-type: typedef-29.6">local-type: typedef-29.6</a>
                       </em>
                     </p>
                   </td>
@@ -205096,7 +205096,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.7" title="local-type: typedef-29.7">local-type: typedef-29.7</a>
                       </em>
                     </p>
                   </td>
@@ -205322,7 +205322,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.3" title="local-type: typedef-40.3">local-type: typedef-40.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
                       </em>
                     </p>
                   </td>
@@ -206598,7 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.9" title="local-type: typedef-29.9">local-type: typedef-29.9</a>
                       </em>
                     </p>
                   </td>
@@ -206622,7 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.10" title="local-type: typedef-29.10">local-type: typedef-29.10</a>
                       </em>
                     </p>
                   </td>
@@ -206646,7 +206646,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.11" title="local-type: typedef-29.11">local-type: typedef-29.11</a>
                       </em>
                     </p>
                   </td>
@@ -206769,7 +206769,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.8" title="local-type: typedef-29.8">local-type: typedef-29.8</a>
                       </em>
                     </p>
                   </td>
@@ -207125,7 +207125,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.21" title="local-type: typedef-40.21">local-type: typedef-40.21</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.21" title="local-type: typedef-29.21">local-type: typedef-29.21</a>
                       </em>
                     </p>
                   </td>
@@ -207392,7 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.18" title="local-type: typedef-40.18">local-type: typedef-40.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207416,7 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.19" title="local-type: typedef-40.19">local-type: typedef-40.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207440,7 +207440,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.20" title="local-type: typedef-40.20">local-type: typedef-40.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -207469,7 +207469,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.17" title="local-type: typedef-29.17">local-type: typedef-29.17</a>
                       </em>
                     </p>
                   </td>
@@ -207686,7 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.18" title="local-type: typedef-40.18">local-type: typedef-40.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207710,7 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.19" title="local-type: typedef-40.19">local-type: typedef-40.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207734,7 +207734,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.20" title="local-type: typedef-40.20">local-type: typedef-40.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -208086,7 +208086,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208115,7 +208115,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -208485,7 +208485,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-40.1" title="local-type: typedef-40.1">local-type: typedef-40.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208829,7 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.12" title="local-type: typedef-29.12">local-type: typedef-29.12</a>
                       </em>
                     </p>
                   </td>
@@ -208853,7 +208853,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.13" title="local-type: typedef-29.13">local-type: typedef-29.13</a>
                       </em>
                     </p>
                   </td>
@@ -209092,7 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.14" title="local-type: typedef-29.14">local-type: typedef-29.14</a>
                       </em>
                     </p>
                   </td>
@@ -209116,7 +209116,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-29.15" title="local-type: typedef-29.15">local-type: typedef-29.15</a>
                       </em>
                     </p>
                   </td>
@@ -210336,8 +210336,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210357,7 +210357,7 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-40.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210399,8 +210399,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-40.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210420,7 +210420,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-40.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210462,8 +210462,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-40.16)</code>
+        <div class="sect2" id="local-type.typedef-29.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210483,7 +210483,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-                      <code>  (typedef-40.16)</code>
+                      <code>  (typedef-29.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210521,8 +210521,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-40.4)</code>
+        <div class="sect2" id="local-type.typedef-29.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210542,7 +210542,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-                      <code>  (typedef-40.4)</code>
+                      <code>  (typedef-29.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210584,8 +210584,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-40.5)</code>
+        <div class="sect2" id="local-type.typedef-29.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210605,7 +210605,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-40.5)</code>
+                      <code>  (typedef-29.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210647,8 +210647,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-40.6)</code>
+        <div class="sect2" id="local-type.typedef-29.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210668,7 +210668,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-40.6)</code>
+                      <code>  (typedef-29.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210710,8 +210710,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-40.7)</code>
+        <div class="sect2" id="local-type.typedef-29.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210731,7 +210731,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-40.7)</code>
+                      <code>  (typedef-29.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210773,8 +210773,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-40.3)</code>
+        <div class="sect2" id="local-type.typedef-29.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210794,7 +210794,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-                      <code>  (typedef-40.3)</code>
+                      <code>  (typedef-29.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211123,8 +211123,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-40.9)</code>
+        <div class="sect2" id="local-type.typedef-29.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211144,7 +211144,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-40.9)</code>
+                      <code>  (typedef-29.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211186,8 +211186,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-40.10)</code>
+        <div class="sect2" id="local-type.typedef-29.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211207,7 +211207,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-40.10)</code>
+                      <code>  (typedef-29.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211296,8 +211296,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-40.11)</code>
+        <div class="sect2" id="local-type.typedef-29.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211317,7 +211317,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-40.11)</code>
+                      <code>  (typedef-29.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211359,8 +211359,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-40.8)</code>
+        <div class="sect2" id="local-type.typedef-29.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211380,7 +211380,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-                      <code>  (typedef-40.8)</code>
+                      <code>  (typedef-29.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211706,8 +211706,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-40.21)</code>
+        <div class="sect2" id="local-type.typedef-29.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211727,7 +211727,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-40.21)</code>
+                      <code>  (typedef-29.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211769,8 +211769,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-40.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211790,7 +211790,7 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-40.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211832,8 +211832,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-40.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211853,7 +211853,7 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-40.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211891,8 +211891,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-40.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211912,7 +211912,7 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-40.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211954,8 +211954,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-40.17)</code>
+        <div class="sect2" id="local-type.typedef-29.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211975,7 +211975,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-40.17)</code>
+                      <code>  (typedef-29.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212017,8 +212017,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-40.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212038,7 +212038,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-40.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212080,8 +212080,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-40.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212101,7 +212101,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-40.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212139,8 +212139,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-40.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212160,7 +212160,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-40.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212202,8 +212202,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212223,7 +212223,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-40.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212265,8 +212265,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-40.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212286,7 +212286,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-40.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212328,8 +212328,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-40.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212349,7 +212349,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-40.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212391,8 +212391,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-40.12)</code>
+        <div class="sect2" id="local-type.typedef-29.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212412,7 +212412,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-40.12)</code>
+                      <code>  (typedef-29.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212454,8 +212454,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-40.13)</code>
+        <div class="sect2" id="local-type.typedef-29.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212475,7 +212475,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-40.13)</code>
+                      <code>  (typedef-29.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212517,8 +212517,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-40.14)</code>
+        <div class="sect2" id="local-type.typedef-29.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212538,7 +212538,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-                      <code>  (typedef-40.14)</code>
+                      <code>  (typedef-29.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212580,8 +212580,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-40.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-40.15)</code>
+        <div class="sect2" id="local-type.typedef-29.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212601,7 +212601,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-40.15)</code>
+                      <code>  (typedef-29.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213266,12 +213266,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-41.2" class="tableblock">
+                    <p id="local-type.typedef-39.2" class="tableblock">
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-41.2)</code>
+                      <code>  (typedef-39.2)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -213316,12 +213316,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-41.1" class="tableblock">
+                    <p id="local-type.typedef-39.1" class="tableblock">
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-41.1)</code>
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223116,7 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-19.1" title="local-type: typedef-19.1">local-type: typedef-19.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.1" title="local-type: typedef-69.1">local-type: typedef-69.1</a>
                       </em>
                     </p>
                   </td>
@@ -223140,7 +223140,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-19.2" title="local-type: typedef-19.2">local-type: typedef-19.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
                       </em>
                     </p>
                   </td>
@@ -223284,7 +223284,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-19.3" title="local-type: typedef-19.3">local-type: typedef-19.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.3" title="local-type: typedef-69.3">local-type: typedef-69.3</a>
                       </em>
                     </p>
                   </td>
@@ -223494,7 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -223518,7 +223518,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -223682,8 +223682,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-19.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-19.1)</code>
+        <div class="sect2" id="local-type.typedef-69.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223703,7 +223703,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-                      <code>  (typedef-19.1)</code>
+                      <code>  (typedef-69.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223746,8 +223746,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-19.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-19.2)</code>
+        <div class="sect2" id="local-type.typedef-69.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223767,7 +223767,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-                      <code>  (typedef-19.2)</code>
+                      <code>  (typedef-69.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223809,8 +223809,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-19.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-19.3)</code>
+        <div class="sect2" id="local-type.typedef-69.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223830,7 +223830,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-                      <code>  (typedef-19.3)</code>
+                      <code>  (typedef-69.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223860,7 +223860,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-19.4" title="local-type: typedef-19.4">local-type: typedef-19.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.4" title="local-type: typedef-69.4">local-type: typedef-69.4</a>
                       </em>
                     </p>
                   </td>
@@ -223872,8 +223872,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-19.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-19.4)</code>
+        <div class="sect2" id="local-type.typedef-69.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223893,7 +223893,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-19.4)</code>
+                      <code>  (typedef-69.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223968,7 +223968,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-19.5" title="local-type: typedef-19.5">local-type: typedef-19.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.5" title="local-type: typedef-69.5">local-type: typedef-69.5</a>
                       </em>
                     </p>
                   </td>
@@ -223980,8 +223980,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-19.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-19.5)</code>
+        <div class="sect2" id="local-type.typedef-69.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224001,7 +224001,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-19.5)</code>
+                      <code>  (typedef-69.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224043,8 +224043,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224064,7 +224064,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224150,8 +224150,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-23.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224171,7 +224171,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-23.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224459,7 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -224483,7 +224483,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -224542,8 +224542,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224563,7 +224563,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224649,8 +224649,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-23.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224670,7 +224670,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-23.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -225794,7 +225794,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -225816,7 +225816,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -225944,7 +225944,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -225996,7 +225996,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -227056,7 +227056,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.7" title="local-type: typedef-78.7">local-type: typedef-78.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
                       </em>
                     </p>
                   </td>
@@ -227966,7 +227966,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.1" title="local-type: typedef-78.1">local-type: typedef-78.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -227988,7 +227988,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -228297,7 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -228321,7 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.5" title="local-type: typedef-78.5">local-type: typedef-78.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
                       </em>
                     </p>
                   </td>
@@ -228345,7 +228345,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.6" title="local-type: typedef-78.6">local-type: typedef-78.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
                       </em>
                     </p>
                   </td>
@@ -228717,8 +228717,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228738,7 +228738,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228888,8 +228888,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-78.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228909,7 +228909,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228984,8 +228984,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229005,7 +229005,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229202,8 +229202,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229223,7 +229223,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229265,8 +229265,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229286,7 +229286,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229483,8 +229483,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229504,7 +229504,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229654,8 +229654,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-78.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229675,7 +229675,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229750,8 +229750,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229771,7 +229771,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229813,8 +229813,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229834,7 +229834,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230031,8 +230031,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-78.5)</code>
+        <div class="sect2" id="local-type.typedef-82.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230052,7 +230052,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-78.5)</code>
+                      <code>  (typedef-82.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230196,8 +230196,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-78.6)</code>
+        <div class="sect2" id="local-type.typedef-82.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230217,7 +230217,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-78.6)</code>
+                      <code>  (typedef-82.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230932,7 +230932,7 @@ <h3>42.11. The group <code>siri:SituationExchangePayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -231798,7 +231798,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -232111,7 +232111,7 @@ <h3>42.14. The group <code>siri:SituationExchangeTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -232485,7 +232485,7 @@ <h3>42.17. The group <code>siri:SituationNetworkFilterGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -233650,7 +233650,7 @@ <h3>42.26. The complex type <code>siri:SituationExchangeCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.8" title="local-type: typedef-84.8">local-type: typedef-84.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.8" title="local-type: typedef-77.8">local-type: typedef-77.8</a>
                       </em>
                     </p>
                   </td>
@@ -234158,7 +234158,7 @@ <h3>42.28. The complex type <code>siri:SituationExchangeDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.3" title="local-type: typedef-77.3">local-type: typedef-77.3</a>
                       </em>
                     </p>
                   </td>
@@ -234993,7 +234993,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.2" title="local-type: typedef-77.2">local-type: typedef-77.2</a>
                       </em>
                     </p>
                   </td>
@@ -235306,7 +235306,7 @@ <h3>42.29. The complex type <code>siri:SituationExchangeRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.1" title="local-type: typedef-77.1">local-type: typedef-77.1</a>
                       </em>
                     </p>
                   </td>
@@ -235531,7 +235531,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-77.4" title="local-type: typedef-77.4">local-type: typedef-77.4</a>
                       </em>
                     </p>
                   </td>
@@ -235555,7 +235555,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.5" title="local-type: typedef-84.5">local-type: typedef-84.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.5" title="local-type: typedef-77.5">local-type: typedef-77.5</a>
                       </em>
                     </p>
                   </td>
@@ -235603,7 +235603,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.6" title="local-type: typedef-84.6">local-type: typedef-84.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.6" title="local-type: typedef-77.6">local-type: typedef-77.6</a>
                       </em>
                     </p>
                   </td>
@@ -235627,7 +235627,7 @@ <h3>42.30. The complex type <code>siri:SituationExchangeServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-84.7" title="local-type: typedef-84.7">local-type: typedef-84.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-77.7" title="local-type: typedef-77.7">local-type: typedef-77.7</a>
                       </em>
                     </p>
                   </td>
@@ -235786,7 +235786,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -235820,7 +235820,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -235849,7 +235849,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -236105,8 +236105,8 @@ <h3>42.32. The complex type <code>siri:SituationExchangeSubscriptionStructure</c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.8">
-          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-84.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236126,7 +236126,7 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236200,8 +236200,8 @@ <h3>42.33. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236221,7 +236221,7 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236284,8 +236284,8 @@ <h3>42.34. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236305,7 +236305,7 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236347,8 +236347,8 @@ <h3>42.35. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236368,7 +236368,7 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236410,8 +236410,8 @@ <h3>42.36. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236431,7 +236431,7 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236473,8 +236473,8 @@ <h3>42.37. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.8">
-          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-84.8)</code>
+        <div class="sect2" id="local-type.typedef-77.8">
+          <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#complexType (typedef-77.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236494,7 +236494,7 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.8)</code>
+                      <code>  (typedef-77.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236568,8 +236568,8 @@ <h3>42.38. The complex type <code>element[siri:SituationExchangePermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-77.3">
+          <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situations#complexType (typedef-77.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236589,7 +236589,7 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
                       <br/>
                       <code>  /Situations #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-77.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236652,8 +236652,8 @@ <h3>42.39. The complex type <code>group[siri:SituationExchangePayloadGroup]/Situ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-77.2">
+          <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#complexType (typedef-77.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236673,7 +236673,7 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-77.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236715,8 +236715,8 @@ <h3>42.40. The complex type <code>group[siri:SituationNetworkFilterGroup]/Lines#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-77.1">
+          <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/SituationRoadFilter#complexType (typedef-77.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236736,7 +236736,7 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
                       <br/>
                       <code>  /SituationRoadFilter #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-77.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -236778,8 +236778,8 @@ <h3>42.41. The complex type <code>group[siri:SituationExchangeTopicGroup]/Situat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.4">
-          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.4)</code>
+        <div class="sect2" id="local-type.typedef-77.4">
+          <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-77.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -236799,7 +236799,7 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-84.4)</code>
+                      <code>  (typedef-77.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237148,8 +237148,8 @@ <h3>42.42. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.5">
-          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.5)</code>
+        <div class="sect2" id="local-type.typedef-77.5">
+          <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-77.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237169,7 +237169,7 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-84.5)</code>
+                      <code>  (typedef-77.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237341,8 +237341,8 @@ <h3>42.43. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.6">
-          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-84.6)</code>
+        <div class="sect2" id="local-type.typedef-77.6">
+          <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/AccessControl#complexType (typedef-77.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237362,7 +237362,7 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-84.6)</code>
+                      <code>  (typedef-77.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237463,8 +237463,8 @@ <h3>42.44. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.7">
-          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-84.7)</code>
+        <div class="sect2" id="local-type.typedef-77.7">
+          <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-77.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237484,7 +237484,7 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-84.7)</code>
+                      <code>  (typedef-77.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237498,8 +237498,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237519,7 +237519,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237587,8 +237587,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237608,7 +237608,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237693,8 +237693,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237714,7 +237714,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -239249,7 +239249,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <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>
@@ -241802,7 +241802,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
                       </em>
                     </p>
                   </td>
@@ -243134,7 +243134,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <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>
@@ -243813,7 +243813,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <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>
@@ -243953,7 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <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>
@@ -243977,7 +243977,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
                       </em>
                     </p>
                   </td>
@@ -244049,7 +244049,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
                       </em>
                     </p>
                   </td>
@@ -244183,7 +244183,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -244217,7 +244217,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -244246,7 +244246,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -244274,7 +244274,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
                       </em>
                     </p>
                   </td>
@@ -244977,8 +244977,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-74.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -244998,7 +244998,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245072,8 +245072,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245093,7 +245093,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245153,8 +245153,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-74.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245174,7 +245174,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245248,8 +245248,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245269,7 +245269,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245329,8 +245329,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245350,7 +245350,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245410,8 +245410,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-80.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245431,7 +245431,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-80.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245624,8 +245624,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-80.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245645,7 +245645,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-80.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245985,8 +245985,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-74.4)</code>
+        <div class="sect2" id="local-type.typedef-80.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246006,7 +246006,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-74.4)</code>
+                      <code>  (typedef-80.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246066,8 +246066,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246087,7 +246087,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246155,8 +246155,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246176,7 +246176,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246261,8 +246261,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246282,7 +246282,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246367,8 +246367,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-74.6)</code>
+        <div class="sect2" id="local-type.typedef-80.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246388,7 +246388,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-74.6)</code>
+                      <code>  (typedef-80.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -247532,7 +247532,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -248676,7 +248676,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -248724,7 +248724,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -248883,7 +248883,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -248917,7 +248917,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -248946,7 +248946,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -248974,7 +248974,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
                       </em>
                     </p>
                   </td>
@@ -249930,8 +249930,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249951,7 +249951,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250025,8 +250025,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250046,7 +250046,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250120,8 +250120,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250141,7 +250141,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250235,8 +250235,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250256,7 +250256,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250381,8 +250381,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250402,7 +250402,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250470,8 +250470,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250491,7 +250491,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250576,8 +250576,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250597,7 +250597,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250682,8 +250682,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-75.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250703,7 +250703,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-75.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252104,7 +252104,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -252232,8 +252232,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -252253,7 +252253,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252516,12 +252516,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-18.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254795,7 +254795,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -255918,7 +255918,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -256232,7 +256232,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.7" title="local-type: typedef-80.7">local-type: typedef-80.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
                       </em>
                     </p>
                   </td>
@@ -257372,7 +257372,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -257532,7 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -257556,7 +257556,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -257604,7 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -257628,7 +257628,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
                       </em>
                     </p>
                   </td>
@@ -257787,7 +257787,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -257821,7 +257821,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.2" title="local-type: typedef-48.2">local-type: typedef-48.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -257850,7 +257850,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-48.1" title="local-type: typedef-48.1">local-type: typedef-48.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -257878,7 +257878,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.8" title="local-type: typedef-80.8">local-type: typedef-80.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
                       </em>
                     </p>
                   </td>
@@ -258291,8 +258291,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258312,7 +258312,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258386,8 +258386,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258407,7 +258407,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258467,8 +258467,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258488,7 +258488,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-                      <code>  (typedef-80.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259955,7 +259955,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -259976,7 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -260000,7 +260000,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -260021,7 +260021,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -260042,7 +260042,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -260140,8 +260140,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-45.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260161,7 +260161,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-45.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260203,8 +260203,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-45.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-45.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260224,7 +260224,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-45.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260266,8 +260266,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-49.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260287,7 +260287,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-49.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260374,8 +260374,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-49.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260395,7 +260395,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260482,8 +260482,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-49.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-49.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260503,7 +260503,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-49.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260590,8 +260590,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260611,7 +260611,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260685,8 +260685,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260706,7 +260706,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260766,8 +260766,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260787,7 +260787,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-80.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260929,8 +260929,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260950,7 +260950,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-80.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261224,8 +261224,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261245,7 +261245,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261369,8 +261369,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6)</code>
+        <div class="sect2" id="local-type.typedef-79.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261390,7 +261390,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-80.6)</code>
+                      <code>  (typedef-79.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261450,8 +261450,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-66.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-66.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261471,7 +261471,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-66.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261539,8 +261539,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-48.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261560,7 +261560,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261645,8 +261645,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-48.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-48.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261666,7 +261666,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-48.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261751,8 +261751,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8)</code>
+        <div class="sect2" id="local-type.typedef-79.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261772,7 +261772,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-80.8)</code>
+                      <code>  (typedef-79.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261955,7 +261955,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -261986,7 +261986,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -262372,7 +262372,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -262554,8 +262554,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-81.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262575,7 +262575,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-81.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262653,7 +262653,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </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>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -262684,7 +262684,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-60.2" title="local-type: typedef-60.2">local-type: typedef-60.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -263070,7 +263070,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -263252,8 +263252,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263273,7 +263273,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263507,8 +263507,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-60.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-60.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263528,7 +263528,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-60.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263836,8 +263836,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263857,7 +263857,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264101,7 +264101,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </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>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -264162,8 +264162,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-62.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-62.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264183,7 +264183,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-62.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">

From 0957f6999ec6cbd3e7767265f630bc0828b13ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Wed, 15 Jul 2026 16:46:39 +0200
Subject: [PATCH 4/8] Allow CI to commit back (docs/generate-tables.sh - #228)

The previous work-around did not work, so I'm trying a larger fix.
---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 118e14ac..4e5387a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,10 @@ jobs:
   run:
     runs-on: ubuntu-latest
 
+    # Needed by the "Commit changes" step to push regenerated tables back to the branch
+    permissions:
+      contents: write
+
     steps:
       - run: echo "Job was automatically triggered by a ${{ github.event_name }} event for branch ${{ github.ref }}"
 

From e66a54e09fc5ba17541242f9f34fcfe66e8b8fe6 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2026 14:47:41 +0000
Subject: [PATCH 5/8] Lint and update documentation tables

---
 docs/generated/contab/acsb.html   |   40 +-
 docs/generated/contab/datex2.html |   32 +-
 docs/generated/contab/ifopt.html  |   94 +-
 docs/generated/contab/siri.html   | 2760 ++++++++++++++---------------
 4 files changed, 1463 insertions(+), 1463 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index d1e20447..9ca12ee4 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-33.1" title="local-type: typedef-33.1">local-type: typedef-33.1</a>
                       </em>
                     </p>
                   </td>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-33.2" title="local-type: typedef-33.2">local-type: typedef-33.2</a>
                       </em>
                     </p>
                   </td>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-43.1" title="local-type: typedef-43.1">local-type: typedef-43.1</a>
                       </em>
                     </p>
                   </td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-43.1" title="local-type: typedef-43.1">local-type: typedef-43.1</a>
                       </em>
                     </p>
                   </td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-33.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-33.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-33.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
+        <div class="sect2" id="local-type.typedef-33.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-33.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-15.2)</code>
+                      <code>  (typedef-33.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-43.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-43.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-43.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-5
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-43.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <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-14.1" class="tableblock">
+                    <p id="local-type.typedef-34.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-                      <code>  (typedef-14.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index 63eef8fc..e5f4c146 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.1" title="local-type: typedef-70.1">local-type: typedef-70.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
                       </em>
                     </p>
                   </td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.3" title="local-type: typedef-70.3">local-type: typedef-70.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
                       </em>
                     </p>
                   </td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.4" title="local-type: typedef-70.4">local-type: typedef-70.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-59.4" title="local-type: typedef-59.4">local-type: typedef-59.4</a>
                       </em>
                     </p>
                   </td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-                      <code>  (typedef-70.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)</code>
+        <div class="sect2" id="local-type.typedef-59.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-59.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-                      <code>  (typedef-70.2)</code>
+                      <code>  (typedef-59.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-70.3)</code>
+        <div class="sect2" id="local-type.typedef-59.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-59.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-                      <code>  (typedef-70.3)</code>
+                      <code>  (typedef-59.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)</code>
+        <div class="sect2" id="local-type.typedef-59.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-59.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-                      <code>  (typedef-70.4)</code>
+                      <code>  (typedef-59.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index 597e1770..cf572751 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,7 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
                       </em>
                     </p>
                   </td>
@@ -8212,7 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
                       </em>
                     </p>
                   </td>
@@ -8237,7 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-43.1" title="local-type: typedef-43.1">local-type: typedef-43.1</a>
                       </em>
                     </p>
                   </td>
@@ -8562,7 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-43.1" title="local-type: typedef-43.1">local-type: typedef-43.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,8 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-53.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-53.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8595,7 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-53.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8633,8 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-54.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
+        <div class="sect2" id="local-type.typedef-53.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-53.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8654,7 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-54.1)</code>
+                      <code>  (typedef-53.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8692,8 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-43.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8713,7 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-43.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8729,8 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-43.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8750,7 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-43.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9391,7 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
                       </em>
                     </p>
                   </td>
@@ -9568,7 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
                       </em>
                     </p>
                   </td>
@@ -9597,7 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
                       </em>
                     </p>
                   </td>
@@ -9659,7 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
                       </em>
                     </p>
                   </td>
@@ -9908,7 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
                       </em>
                     </p>
                   </td>
@@ -9941,7 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.3" title="local-type: typedef-55.3">local-type: typedef-55.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
                       </em>
                     </p>
                   </td>
@@ -9953,8 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-46.1">
+          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -9974,7 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-46.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10016,8 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-46.1">
+          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10037,7 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-46.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10079,8 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)</code>
+        <div class="sect2" id="local-type.typedef-46.2">
+          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-46.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10100,7 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-                      <code>  (typedef-55.2)</code>
+                      <code>  (typedef-46.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10143,8 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-46.1">
+          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10164,7 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-46.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10206,8 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-46.1">
+          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10227,7 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-46.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10269,8 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)</code>
+        <div class="sect2" id="local-type.typedef-46.3">
+          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-46.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10290,7 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-                      <code>  (typedef-55.3)</code>
+                      <code>  (typedef-46.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13149,7 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
                       </em>
                     </p>
                   </td>
@@ -13161,8 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-57.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)</code>
+        <div class="sect2" id="local-type.typedef-52.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-52.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13182,7 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-                      <code>  (typedef-57.1)</code>
+                      <code>  (typedef-52.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13416,8 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-43.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13437,7 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-43.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index 1f48c491..19da9133 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -5535,7 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -5944,7 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -5975,7 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -6361,7 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -6957,7 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -7063,7 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -7094,7 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -7343,7 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -7405,7 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -7736,7 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -8176,7 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -8670,7 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -8701,7 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -8973,7 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -9035,7 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -9572,7 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -10886,7 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -11433,7 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -12192,7 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -12894,7 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -14410,7 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -15029,7 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -15320,8 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15341,7 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15585,7 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -15646,8 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15667,7 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15778,8 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15799,7 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16033,8 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16054,7 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16134,7 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -16165,7 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -16551,7 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -16733,8 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16754,7 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16988,8 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17009,7 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17317,8 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17338,7 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17582,7 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -17643,8 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17664,7 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17775,8 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17796,7 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18104,8 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18125,7 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18369,7 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -18430,8 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18451,7 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18562,8 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18583,7 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18817,8 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18838,7 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19146,8 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19167,7 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19557,8 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19578,7 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19796,8 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19817,7 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20061,7 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -20122,8 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20143,7 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20254,8 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20275,7 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20386,8 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20407,7 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20641,8 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20662,7 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20970,8 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20991,7 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21381,8 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21402,7 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21620,8 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21641,7 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21791,8 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21812,7 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22009,8 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22030,7 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22180,8 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22201,7 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22312,8 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22333,7 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22444,8 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22465,7 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22662,8 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22683,7 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23212,7 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -23972,7 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -24280,7 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -24311,7 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -24728,7 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -24943,7 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -25062,7 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -25093,7 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -25853,7 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -26555,7 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -27337,7 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -27368,7 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -27617,7 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -27679,7 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -27979,7 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -28716,8 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-3.3)</code>
+        <div class="sect2" id="local-type.typedef-70.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-70.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -28737,7 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.3)</code>
+                      <code>  (typedef-70.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -28981,7 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -29042,8 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29063,7 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29174,8 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-3.1)</code>
+        <div class="sect2" id="local-type.typedef-70.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-70.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29195,7 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.1)</code>
+                      <code>  (typedef-70.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29463,8 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29484,7 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29792,8 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29813,7 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30057,7 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -30118,8 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30139,7 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30250,8 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30271,7 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30505,8 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30526,7 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30834,8 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30855,7 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31099,7 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -31160,8 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31181,7 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31292,8 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31313,7 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31424,8 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31445,7 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31679,8 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31700,7 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32008,8 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32029,7 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32140,8 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32161,7 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32272,8 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32293,7 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32527,8 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32548,7 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32856,8 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32877,7 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33267,8 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33288,7 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33506,8 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33527,7 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33771,7 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -33832,8 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33853,7 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34542,7 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
                       </em>
                     </p>
                   </td>
@@ -34808,7 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.3" title="local-type: typedef-67.3">local-type: typedef-67.3</a>
                       </em>
                     </p>
                   </td>
@@ -37048,7 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
                       </em>
                     </p>
                   </td>
@@ -37386,7 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
                       </em>
                     </p>
                   </td>
@@ -38301,7 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -38508,7 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.3" title="local-type: typedef-67.3">local-type: typedef-67.3</a>
                       </em>
                     </p>
                   </td>
@@ -39146,7 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
                       </em>
                     </p>
                   </td>
@@ -41623,7 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -41635,8 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-67.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41656,7 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-67.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41767,8 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-67.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-67.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41788,7 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-67.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41899,8 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-67.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41920,7 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-67.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42031,8 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-67.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42052,7 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-67.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42163,8 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42184,7 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42295,8 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-67.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-67.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42316,7 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-67.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42427,8 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
+        <div class="sect2" id="local-type.typedef-67.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42448,7 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.4)</code>
+                      <code>  (typedef-67.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42559,8 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42580,7 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -50447,7 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -53179,7 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
                       </em>
                     </p>
                   </td>
@@ -53207,7 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.3" title="local-type: typedef-5.3">local-type: typedef-5.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.3" title="local-type: typedef-68.3">local-type: typedef-68.3</a>
                       </em>
                     </p>
                   </td>
@@ -55353,8 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55374,7 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55485,8 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)</code>
+        <div class="sect2" id="local-type.typedef-68.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-68.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55506,7 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-                      <code>  (typedef-5.2)</code>
+                      <code>  (typedef-68.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55574,8 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)</code>
+        <div class="sect2" id="local-type.typedef-68.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-68.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55595,7 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-                      <code>  (typedef-5.3)</code>
+                      <code>  (typedef-68.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -57952,7 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </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>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -59634,7 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -59658,7 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </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>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -61934,8 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -61955,7 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-83.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -61993,8 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62014,7 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-83.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62052,8 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62073,7 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-83.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62182,8 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62203,7 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-83.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63829,7 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <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>
@@ -64952,7 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <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>
@@ -64976,7 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <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>
@@ -66192,8 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66213,7 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66287,8 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66308,7 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66378,8 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66399,7 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67846,7 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -67867,7 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -67888,7 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
                       </em>
                     </p>
                   </td>
@@ -67909,7 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.9" title="local-type: typedef-79.9">local-type: typedef-79.9</a>
                       </em>
                     </p>
                   </td>
@@ -67930,7 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.10" title="local-type: typedef-79.10">local-type: typedef-79.10</a>
                       </em>
                     </p>
                   </td>
@@ -68296,7 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -69772,7 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
                       </em>
                     </p>
                   </td>
@@ -69802,7 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
                       </em>
                     </p>
                   </td>
@@ -69931,7 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
                       </em>
                     </p>
                   </td>
@@ -69961,7 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
                       </em>
                     </p>
                   </td>
@@ -71792,7 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
                       </em>
                     </p>
                   </td>
@@ -71822,7 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
                       </em>
                     </p>
                   </td>
@@ -72554,7 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.14" title="local-type: typedef-72.14">local-type: typedef-72.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.14" title="local-type: typedef-79.14">local-type: typedef-79.14</a>
                       </em>
                     </p>
                   </td>
@@ -73253,7 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -73274,7 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -73295,7 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
                       </em>
                     </p>
                   </td>
@@ -73316,7 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.9" title="local-type: typedef-79.9">local-type: typedef-79.9</a>
                       </em>
                     </p>
                   </td>
@@ -73337,7 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.10" title="local-type: typedef-79.10">local-type: typedef-79.10</a>
                       </em>
                     </p>
                   </td>
@@ -73583,7 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -74258,7 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -74522,7 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.11" title="local-type: typedef-72.11">local-type: typedef-72.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.11" title="local-type: typedef-79.11">local-type: typedef-79.11</a>
                       </em>
                     </p>
                   </td>
@@ -74546,7 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.12" title="local-type: typedef-72.12">local-type: typedef-72.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.12" title="local-type: typedef-79.12">local-type: typedef-79.12</a>
                       </em>
                     </p>
                   </td>
@@ -74618,7 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.13" title="local-type: typedef-72.13">local-type: typedef-72.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.13" title="local-type: typedef-79.13">local-type: typedef-79.13</a>
                       </em>
                     </p>
                   </td>
@@ -74752,7 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -74786,7 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -74815,7 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -75563,7 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.15" title="local-type: typedef-72.15">local-type: typedef-72.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.15" title="local-type: typedef-79.15">local-type: typedef-79.15</a>
                       </em>
                     </p>
                   </td>
@@ -76406,7 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.16" title="local-type: typedef-72.16">local-type: typedef-72.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.16" title="local-type: typedef-79.16">local-type: typedef-79.16</a>
                       </em>
                     </p>
                   </td>
@@ -76535,7 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.17" title="local-type: typedef-72.17">local-type: typedef-72.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.17" title="local-type: typedef-79.17">local-type: typedef-79.17</a>
                       </em>
                     </p>
                   </td>
@@ -79917,8 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
+        <div class="sect2" id="local-type.typedef-79.14">
+          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-79.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -79938,7 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.14)</code>
+                      <code>  (typedef-79.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80012,8 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80033,7 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80075,8 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80096,7 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80126,7 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -80138,8 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80159,7 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80329,7 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -80353,7 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
                       </em>
                     </p>
                   </td>
@@ -80365,8 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80386,7 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80428,8 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
+        <div class="sect2" id="local-type.typedef-79.6">
+          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-79.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80449,7 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.6)</code>
+                      <code>  (typedef-79.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80491,8 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80512,7 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80542,7 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
                       </em>
                     </p>
                   </td>
@@ -80554,8 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
+        <div class="sect2" id="local-type.typedef-79.8">
+          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-79.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80575,7 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-72.8)</code>
+                      <code>  (typedef-79.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80708,8 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
+        <div class="sect2" id="local-type.typedef-79.9">
+          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-79.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80729,7 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-72.9)</code>
+                      <code>  (typedef-79.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80771,8 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
+        <div class="sect2" id="local-type.typedef-79.10">
+          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-79.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80792,7 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-72.10)</code>
+                      <code>  (typedef-79.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80834,8 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80855,7 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80897,8 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-79.18">
+          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80918,7 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-79.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80960,8 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-79.19">
+          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80981,7 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-79.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81051,8 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-79.18">
+          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81072,7 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-79.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81114,8 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-79.19">
+          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81135,7 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-79.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81205,8 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
+        <div class="sect2" id="local-type.typedef-79.18">
+          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81226,7 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-72.18)</code>
+                      <code>  (typedef-79.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81268,8 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
+        <div class="sect2" id="local-type.typedef-79.19">
+          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81289,7 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-72.19)</code>
+                      <code>  (typedef-79.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81359,8 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
+        <div class="sect2" id="local-type.typedef-79.14">
+          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-79.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81380,7 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.14)</code>
+                      <code>  (typedef-79.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81454,8 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81475,7 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81517,8 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81538,7 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81568,7 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -81580,8 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81601,7 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81771,7 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -81795,7 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
                       </em>
                     </p>
                   </td>
@@ -81807,8 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81828,7 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81870,8 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
+        <div class="sect2" id="local-type.typedef-79.6">
+          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-79.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81891,7 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.6)</code>
+                      <code>  (typedef-79.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81933,8 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81954,7 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-72.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81984,7 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
                       </em>
                     </p>
                   </td>
@@ -81996,8 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
+        <div class="sect2" id="local-type.typedef-79.8">
+          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-79.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82017,7 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-72.8)</code>
+                      <code>  (typedef-79.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82150,8 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
+        <div class="sect2" id="local-type.typedef-79.9">
+          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-79.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82171,7 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-72.9)</code>
+                      <code>  (typedef-79.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82213,8 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
+        <div class="sect2" id="local-type.typedef-79.10">
+          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-79.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82234,7 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-72.10)</code>
+                      <code>  (typedef-79.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82276,8 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82297,7 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82339,8 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82360,7 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82402,8 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)</code>
+        <div class="sect2" id="local-type.typedef-79.11">
+          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82423,7 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-72.11)</code>
+                      <code>  (typedef-79.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82555,8 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)</code>
+        <div class="sect2" id="local-type.typedef-79.12">
+          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82576,7 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-72.12)</code>
+                      <code>  (typedef-79.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82794,8 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)</code>
+        <div class="sect2" id="local-type.typedef-79.13">
+          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82815,7 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-72.13)</code>
+                      <code>  (typedef-79.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82852,8 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82873,7 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82941,8 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82962,7 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83047,8 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83068,7 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83153,8 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)</code>
+        <div class="sect2" id="local-type.typedef-79.15">
+          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-79.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83174,7 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-                      <code>  (typedef-72.15)</code>
+                      <code>  (typedef-79.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83325,7 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -83346,7 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -83358,8 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83379,7 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83409,7 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -83421,8 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83442,7 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83557,8 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83578,7 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83620,8 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)</code>
+        <div class="sect2" id="local-type.typedef-79.16">
+          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-79.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83641,7 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-                      <code>  (typedef-72.16)</code>
+                      <code>  (typedef-79.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83683,8 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)</code>
+        <div class="sect2" id="local-type.typedef-79.17">
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-79.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83704,7 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Drive
                       <br/>
                       <code>  /DriverScope #complexType</code>
                       <br/>
-                      <code>  (typedef-72.17)</code>
+                      <code>  (typedef-79.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -86197,7 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -86259,7 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -87027,7 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -87089,7 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -92109,8 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92130,7 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92348,8 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92369,7 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92759,8 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92780,7 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93170,8 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93191,7 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93409,8 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93430,7 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93820,8 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93841,7 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -94916,7 +94916,7 @@ <h3>11.13. The group <code>siri:EstimatedTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -96323,7 +96323,7 @@ <h3>11.19. The complex type <code>siri:EstimatedTimetableRequestStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -99633,7 +99633,7 @@ <h3>12.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.5" title="local-type: typedef-86.5">local-type: typedef-86.5</a>
                       </em>
                     </p>
                   </td>
@@ -100830,7 +100830,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -100854,7 +100854,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -100902,7 +100902,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
                       </em>
                     </p>
                   </td>
@@ -100926,7 +100926,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
                       </em>
                     </p>
                   </td>
@@ -101085,7 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -101119,7 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -101148,7 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -101404,8 +101404,8 @@ <h3>12.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.5">
-          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
+        <div class="sect2" id="local-type.typedef-86.5">
+          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-86.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101425,7 +101425,7 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.5)</code>
+                      <code>  (typedef-86.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101499,8 +101499,8 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.5">
-          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
+        <div class="sect2" id="local-type.typedef-86.5">
+          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-86.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101520,7 +101520,7 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.5)</code>
+                      <code>  (typedef-86.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101594,8 +101594,8 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101615,7 +101615,7 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101880,8 +101880,8 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101901,7 +101901,7 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102073,8 +102073,8 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.3">
-          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3)</code>
+        <div class="sect2" id="local-type.typedef-86.3">
+          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-86.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102094,7 +102094,7 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-73.3)</code>
+                      <code>  (typedef-86.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102195,8 +102195,8 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.4">
-          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4)</code>
+        <div class="sect2" id="local-type.typedef-86.4">
+          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-86.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102216,7 +102216,7 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-73.4)</code>
+                      <code>  (typedef-86.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102276,8 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102297,7 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102365,8 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102386,7 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102471,8 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102492,7 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103671,7 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-81.2" title="local-type: typedef-81.2">local-type: typedef-81.2</a>
                       </em>
                     </p>
                   </td>
@@ -104614,7 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-81.1" title="local-type: typedef-81.1">local-type: typedef-81.1</a>
                       </em>
                     </p>
                   </td>
@@ -104796,7 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -104829,7 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-81.3" title="local-type: typedef-81.3">local-type: typedef-81.3</a>
                       </em>
                     </p>
                   </td>
@@ -105655,8 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-81.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-81.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105676,7 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-81.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105750,8 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-81.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-81.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105771,7 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-81.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105845,8 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-81.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105866,7 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-81.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105932,8 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105953,7 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -106021,8 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-81.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-81.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -106042,7 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-81.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -110248,7 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.6" title="local-type: typedef-8.6">local-type: typedef-8.6</a>
                       </em>
                     </p>
                   </td>
@@ -110269,7 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.7" title="local-type: typedef-8.7">local-type: typedef-8.7</a>
                       </em>
                     </p>
                   </td>
@@ -110293,7 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -110314,7 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -110335,7 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -110363,7 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-21.1" title="local-type: typedef-21.1">local-type: typedef-21.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.1" title="local-type: typedef-3.1">local-type: typedef-3.1</a>
                       </em>
                     </p>
                   </td>
@@ -111078,7 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-21.2" title="local-type: typedef-21.2">local-type: typedef-21.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -113113,8 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
+        <div class="sect2" id="local-type.typedef-8.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113134,7 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.6)</code>
+                      <code>  (typedef-8.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113176,8 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
+        <div class="sect2" id="local-type.typedef-8.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113197,7 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.7)</code>
+                      <code>  (typedef-8.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113239,8 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113260,7 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113347,8 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113368,7 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113455,8 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113476,7 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113563,8 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-21.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)</code>
+        <div class="sect2" id="local-type.typedef-3.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-3.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113584,7 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-21.1)</code>
+                      <code>  (typedef-3.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113627,8 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-21.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113648,7 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-21.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -119107,7 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
                       </em>
                     </p>
                   </td>
@@ -119128,7 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
                       </em>
                     </p>
                   </td>
@@ -119152,7 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -119173,7 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -119194,7 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -119218,7 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
                       </em>
                     </p>
                   </td>
@@ -119242,7 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
                       </em>
                     </p>
                   </td>
@@ -120624,8 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-8.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120645,7 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-8.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120687,8 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-8.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120708,7 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-8.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120750,8 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120771,7 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120858,8 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120879,7 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120966,8 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120987,7 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121074,8 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-36.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)</code>
+        <div class="sect2" id="local-type.typedef-16.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-16.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121095,7 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-36.1)</code>
+                      <code>  (typedef-16.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121138,8 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-36.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)</code>
+        <div class="sect2" id="local-type.typedef-16.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-16.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121159,7 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-36.2)</code>
+                      <code>  (typedef-16.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -126321,7 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.2" title="local-type: typedef-26.2">local-type: typedef-26.2</a>
                       </em>
                     </p>
                   </td>
@@ -126342,7 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.3" title="local-type: typedef-26.3">local-type: typedef-26.3</a>
                       </em>
                     </p>
                   </td>
@@ -127039,7 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.6" title="local-type: typedef-26.6">local-type: typedef-26.6</a>
                       </em>
                     </p>
                   </td>
@@ -127323,7 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.5" title="local-type: typedef-26.5">local-type: typedef-26.5</a>
                       </em>
                     </p>
                   </td>
@@ -128258,7 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.1" title="local-type: typedef-26.1">local-type: typedef-26.1</a>
                       </em>
                     </p>
                   </td>
@@ -128378,7 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.2" title="local-type: typedef-26.2">local-type: typedef-26.2</a>
                       </em>
                     </p>
                   </td>
@@ -128399,7 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.3" title="local-type: typedef-26.3">local-type: typedef-26.3</a>
                       </em>
                     </p>
                   </td>
@@ -128810,7 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.4" title="local-type: typedef-26.4">local-type: typedef-26.4</a>
                       </em>
                     </p>
                   </td>
@@ -129317,8 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-26.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-26.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129338,7 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-26.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129494,8 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
+        <div class="sect2" id="local-type.typedef-26.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-26.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129515,7 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.3)</code>
+                      <code>  (typedef-26.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129557,8 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)</code>
+        <div class="sect2" id="local-type.typedef-26.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-26.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129578,7 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-22.6)</code>
+                      <code>  (typedef-26.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129620,8 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)</code>
+        <div class="sect2" id="local-type.typedef-26.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-26.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129641,7 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-                      <code>  (typedef-22.5)</code>
+                      <code>  (typedef-26.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129897,7 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-26.4" title="local-type: typedef-26.4">local-type: typedef-26.4</a>
                       </em>
                     </p>
                   </td>
@@ -129934,8 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
+        <div class="sect2" id="local-type.typedef-26.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-26.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129955,7 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-22.4)</code>
+                      <code>  (typedef-26.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129998,8 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)</code>
+        <div class="sect2" id="local-type.typedef-26.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-26.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130019,7 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-22.1)</code>
+                      <code>  (typedef-26.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130061,8 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-26.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-26.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130082,7 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-26.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130238,8 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
+        <div class="sect2" id="local-type.typedef-26.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-26.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130259,7 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.3)</code>
+                      <code>  (typedef-26.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130301,8 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
+        <div class="sect2" id="local-type.typedef-26.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-26.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130322,7 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-22.4)</code>
+                      <code>  (typedef-26.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131790,12 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-36.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -135452,7 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -135473,7 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -135494,7 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -135712,7 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
                       </em>
                     </p>
                   </td>
@@ -139290,7 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.5" title="local-type: typedef-24.5">local-type: typedef-24.5</a>
                       </em>
                     </p>
                   </td>
@@ -139671,7 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.7" title="local-type: typedef-24.7">local-type: typedef-24.7</a>
                       </em>
                     </p>
                   </td>
@@ -140824,7 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
                       </em>
                     </p>
                   </td>
@@ -141002,7 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
                       </em>
                     </p>
                   </td>
@@ -141139,7 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
                       </em>
                     </p>
                   </td>
@@ -141789,7 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
                       </em>
                     </p>
                   </td>
@@ -141967,7 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
                       </em>
                     </p>
                   </td>
@@ -141991,7 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.6" title="local-type: typedef-24.6">local-type: typedef-24.6</a>
                       </em>
                     </p>
                   </td>
@@ -143152,7 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
                       </em>
                     </p>
                   </td>
@@ -146171,7 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
                       </em>
                     </p>
                   </td>
@@ -147562,7 +147562,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
                       </em>
                     </p>
                   </td>
@@ -147740,7 +147740,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
                       </em>
                     </p>
                   </td>
@@ -148173,7 +148173,7 @@ <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.7" title="local-type: typedef-24.7">local-type: typedef-24.7</a>
                       </em>
                     </p>
                   </td>
@@ -148421,7 +148421,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
                       </em>
                     </p>
                   </td>
@@ -148599,7 +148599,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
                       </em>
                     </p>
                   </td>
@@ -148665,7 +148665,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.5" title="local-type: typedef-24.5">local-type: typedef-24.5</a>
                       </em>
                     </p>
                   </td>
@@ -149519,8 +149519,8 @@ <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149540,7 +149540,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149627,8 +149627,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149648,7 +149648,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149735,8 +149735,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149756,7 +149756,7 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149843,8 +149843,8 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-24.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149864,7 +149864,7 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-24.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149906,8 +149906,8 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
+        <div class="sect2" id="local-type.typedef-24.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-24.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149927,7 +149927,7 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-18.5)</code>
+                      <code>  (typedef-24.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150014,8 +150014,8 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
+        <div class="sect2" id="local-type.typedef-24.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-24.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150035,7 +150035,7 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-18.7)</code>
+                      <code>  (typedef-24.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150077,8 +150077,8 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-24.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150098,7 +150098,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-24.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150140,8 +150140,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-24.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150161,7 +150161,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-24.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150281,8 +150281,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-24.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150302,7 +150302,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-24.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150344,8 +150344,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-24.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150365,7 +150365,7 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-24.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150407,8 +150407,8 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-24.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150428,7 +150428,7 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-24.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150548,8 +150548,8 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.6">
-          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
+        <div class="sect2" id="local-type.typedef-24.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-24.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150569,7 +150569,7 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-                      <code>  (typedef-18.6)</code>
+                      <code>  (typedef-24.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150656,8 +150656,8 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-24.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150677,7 +150677,7 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-24.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150719,8 +150719,8 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.1">
-          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
+        <div class="sect2" id="local-type.typedef-24.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150740,7 +150740,7 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-18.1)</code>
+                      <code>  (typedef-24.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150782,8 +150782,8 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-24.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150803,7 +150803,7 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-24.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150845,8 +150845,8 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-24.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150866,7 +150866,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-24.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150986,8 +150986,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.7">
-          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
+        <div class="sect2" id="local-type.typedef-24.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-24.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151007,7 +151007,7 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-18.7)</code>
+                      <code>  (typedef-24.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151049,8 +151049,8 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.9">
-          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
+        <div class="sect2" id="local-type.typedef-24.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151070,7 +151070,7 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.9)</code>
+                      <code>  (typedef-24.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151112,8 +151112,8 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.8">
-          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
+        <div class="sect2" id="local-type.typedef-24.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151133,7 +151133,7 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-18.8)</code>
+                      <code>  (typedef-24.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151253,8 +151253,8 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.5">
-          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
+        <div class="sect2" id="local-type.typedef-24.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-24.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151274,7 +151274,7 @@ <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-18.5)</code>
+                      <code>  (typedef-24.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -156431,7 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -156465,7 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -156494,7 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -156523,7 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.3" title="local-type: typedef-27.3">local-type: typedef-27.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -157075,8 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157096,7 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157181,8 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157202,7 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157287,8 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157308,7 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157393,8 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157414,7 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157482,8 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157503,7 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157588,8 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157609,7 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157694,8 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157715,7 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -163928,7 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.6" title="local-type: typedef-8.6">local-type: typedef-8.6</a>
                       </em>
                     </p>
                   </td>
@@ -163949,7 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.7" title="local-type: typedef-8.7">local-type: typedef-8.7</a>
                       </em>
                     </p>
                   </td>
@@ -163973,7 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -163994,7 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -164015,7 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -166738,7 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.1" title="local-type: typedef-28.1">local-type: typedef-28.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
                       </em>
                     </p>
                   </td>
@@ -166759,7 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.2" title="local-type: typedef-28.2">local-type: typedef-28.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
                       </em>
                     </p>
                   </td>
@@ -166780,7 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.3" title="local-type: typedef-28.3">local-type: typedef-28.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.3" title="local-type: typedef-8.3">local-type: typedef-8.3</a>
                       </em>
                     </p>
                   </td>
@@ -167885,7 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
                       </em>
                     </p>
                   </td>
@@ -167906,7 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
                       </em>
                     </p>
                   </td>
@@ -167930,7 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -167951,7 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -167972,7 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -171315,7 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
                       </em>
                     </p>
                   </td>
@@ -171336,7 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
                       </em>
                     </p>
                   </td>
@@ -171360,7 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -171381,7 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -171402,7 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -172064,8 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
+        <div class="sect2" id="local-type.typedef-8.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172085,7 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.6)</code>
+                      <code>  (typedef-8.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172127,8 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
+        <div class="sect2" id="local-type.typedef-8.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172148,7 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.7)</code>
+                      <code>  (typedef-8.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172190,8 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172211,7 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172298,8 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172319,7 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172406,8 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172427,7 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172514,8 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)</code>
+        <div class="sect2" id="local-type.typedef-8.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-8.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172535,7 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-                      <code>  (typedef-28.1)</code>
+                      <code>  (typedef-8.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172599,8 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)</code>
+        <div class="sect2" id="local-type.typedef-8.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-8.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172620,7 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-                      <code>  (typedef-28.2)</code>
+                      <code>  (typedef-8.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172707,8 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)</code>
+        <div class="sect2" id="local-type.typedef-8.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-8.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172728,7 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-                      <code>  (typedef-28.3)</code>
+                      <code>  (typedef-8.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172792,8 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-8.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172813,7 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-8.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172855,8 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-8.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172876,7 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-8.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172918,8 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172939,7 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173026,8 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173047,7 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173134,8 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173155,7 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173242,8 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-8.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173263,7 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-8.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173305,8 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-8.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173326,7 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-8.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173368,8 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173389,7 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173476,8 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173497,7 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173584,8 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173605,7 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -178315,12 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-34.3" class="tableblock">
+                    <p id="local-type.typedef-11.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-                      <code>  (typedef-34.3)</code>
+                      <code>  (typedef-11.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178501,12 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-34.1" class="tableblock">
+                    <p id="local-type.typedef-11.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-11.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178567,12 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-36.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -179200,7 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
                       </em>
                     </p>
                   </td>
@@ -179284,7 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
                       </em>
                     </p>
                   </td>
@@ -180050,7 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -180071,7 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -180224,7 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
                       </em>
                     </p>
                   </td>
@@ -180383,7 +180383,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
                       </em>
                     </p>
                   </td>
@@ -180931,7 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
                       </em>
                     </p>
                   </td>
@@ -181015,7 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
                       </em>
                     </p>
                   </td>
@@ -181164,7 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -181185,7 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -181871,7 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
                       </em>
                     </p>
                   </td>
@@ -182030,7 +182030,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
                       </em>
                     </p>
                   </td>
@@ -182578,7 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
                       </em>
                     </p>
                   </td>
@@ -182662,7 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
                       </em>
                     </p>
                   </td>
@@ -182811,7 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -182832,7 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -183195,7 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
                       </em>
                     </p>
                   </td>
@@ -183385,7 +183385,7 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
                       </em>
                     </p>
                   </td>
@@ -183885,7 +183885,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.6" title="local-type: typedef-34.6">local-type: typedef-34.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.6" title="local-type: typedef-11.6">local-type: typedef-11.6</a>
                       </em>
                     </p>
                   </td>
@@ -183909,7 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.7" title="local-type: typedef-34.7">local-type: typedef-34.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.7" title="local-type: typedef-11.7">local-type: typedef-11.7</a>
                       </em>
                     </p>
                   </td>
@@ -183933,7 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.9" title="local-type: typedef-34.9">local-type: typedef-34.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.9" title="local-type: typedef-11.9">local-type: typedef-11.9</a>
                       </em>
                     </p>
                   </td>
@@ -183957,7 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.10" title="local-type: typedef-34.10">local-type: typedef-34.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.10" title="local-type: typedef-11.10">local-type: typedef-11.10</a>
                       </em>
                     </p>
                   </td>
@@ -183981,7 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.11" title="local-type: typedef-34.11">local-type: typedef-34.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.11" title="local-type: typedef-11.11">local-type: typedef-11.11</a>
                       </em>
                     </p>
                   </td>
@@ -184005,7 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.12" title="local-type: typedef-34.12">local-type: typedef-34.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.12" title="local-type: typedef-11.12">local-type: typedef-11.12</a>
                       </em>
                     </p>
                   </td>
@@ -184029,7 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.13" title="local-type: typedef-34.13">local-type: typedef-34.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.13" title="local-type: typedef-11.13">local-type: typedef-11.13</a>
                       </em>
                     </p>
                   </td>
@@ -185577,7 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.17" title="local-type: typedef-34.17">local-type: typedef-34.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.17" title="local-type: typedef-11.17">local-type: typedef-11.17</a>
                       </em>
                     </p>
                   </td>
@@ -186074,7 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
                       </em>
                     </p>
                   </td>
@@ -186233,7 +186233,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
                       </em>
                     </p>
                   </td>
@@ -186781,7 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
                       </em>
                     </p>
                   </td>
@@ -186865,7 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
                       </em>
                     </p>
                   </td>
@@ -187014,7 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -187035,7 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -187757,7 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
                       </em>
                     </p>
                   </td>
@@ -187916,7 +187916,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
                       </em>
                     </p>
                   </td>
@@ -188464,7 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
                       </em>
                     </p>
                   </td>
@@ -188548,7 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
                       </em>
                     </p>
                   </td>
@@ -188697,7 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
                       </em>
                     </p>
                   </td>
@@ -188718,7 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
                       </em>
                     </p>
                   </td>
@@ -189503,8 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-11.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189524,7 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-11.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -189554,7 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
                       </em>
                     </p>
                   </td>
@@ -189566,8 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-11.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189587,7 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-11.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190016,8 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190037,7 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190067,7 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -190079,8 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190100,7 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190215,8 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190236,7 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190278,8 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-11.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190299,7 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-11.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190343,8 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-11.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190364,7 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-11.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190394,7 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
                       </em>
                     </p>
                   </td>
@@ -190406,8 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-11.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190427,7 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-11.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190856,8 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190877,7 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190907,7 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -190919,8 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190940,7 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191055,8 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191076,7 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191118,8 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-11.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191139,7 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-11.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191183,8 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-11.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191204,7 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-11.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191234,7 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
                       </em>
                     </p>
                   </td>
@@ -191246,8 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-11.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191267,7 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-11.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191696,8 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191717,7 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191747,7 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -191759,8 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191780,7 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191895,8 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191916,7 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191958,8 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-11.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191979,7 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-11.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192023,8 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)</code>
+        <div class="sect2" id="local-type.typedef-11.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-11.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192044,7 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-                      <code>  (typedef-34.6)</code>
+                      <code>  (typedef-11.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192130,8 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)</code>
+        <div class="sect2" id="local-type.typedef-11.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-11.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192151,7 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.7)</code>
+                      <code>  (typedef-11.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192181,7 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.8" title="local-type: typedef-34.8">local-type: typedef-34.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.8" title="local-type: typedef-11.8">local-type: typedef-11.8</a>
                       </em>
                     </p>
                   </td>
@@ -192193,8 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)</code>
+        <div class="sect2" id="local-type.typedef-11.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-11.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192214,7 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-                      <code>  (typedef-34.8)</code>
+                      <code>  (typedef-11.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192809,8 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)</code>
+        <div class="sect2" id="local-type.typedef-11.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-11.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192830,7 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-34.9)</code>
+                      <code>  (typedef-11.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192872,8 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)</code>
+        <div class="sect2" id="local-type.typedef-11.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-11.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192893,7 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-34.10)</code>
+                      <code>  (typedef-11.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192935,8 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)</code>
+        <div class="sect2" id="local-type.typedef-11.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-11.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192956,7 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-                      <code>  (typedef-34.11)</code>
+                      <code>  (typedef-11.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192998,8 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)</code>
+        <div class="sect2" id="local-type.typedef-11.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-11.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193019,7 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-                      <code>  (typedef-34.12)</code>
+                      <code>  (typedef-11.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193061,8 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)</code>
+        <div class="sect2" id="local-type.typedef-11.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-11.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193082,7 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-                      <code>  (typedef-34.13)</code>
+                      <code>  (typedef-11.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193124,8 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)</code>
+        <div class="sect2" id="local-type.typedef-11.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-11.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193145,7 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-34.17)</code>
+                      <code>  (typedef-11.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193187,8 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-11.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193208,7 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-11.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193252,8 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-11.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193273,7 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-11.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193303,7 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
                       </em>
                     </p>
                   </td>
@@ -193315,8 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-11.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193336,7 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-11.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193765,8 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193786,7 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193816,7 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -193828,8 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193849,7 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193964,8 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193985,7 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194027,8 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
+        <div class="sect2" id="local-type.typedef-11.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194048,7 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-34.2)</code>
+                      <code>  (typedef-11.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194092,8 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
+        <div class="sect2" id="local-type.typedef-11.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194113,7 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-34.4)</code>
+                      <code>  (typedef-11.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194143,7 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
                       </em>
                     </p>
                   </td>
@@ -194155,8 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
+        <div class="sect2" id="local-type.typedef-11.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194176,7 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-34.5)</code>
+                      <code>  (typedef-11.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194605,8 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
+        <div class="sect2" id="local-type.typedef-11.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194626,7 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-34.14)</code>
+                      <code>  (typedef-11.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194656,7 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
                       </em>
                     </p>
                   </td>
@@ -194668,8 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
+        <div class="sect2" id="local-type.typedef-11.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194689,7 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-34.15)</code>
+                      <code>  (typedef-11.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194804,8 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-34.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
+        <div class="sect2" id="local-type.typedef-11.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194825,7 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-34.16)</code>
+                      <code>  (typedef-11.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195664,7 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
                       </em>
                     </p>
                   </td>
@@ -195904,7 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
                       </em>
                     </p>
                   </td>
@@ -196070,7 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
                       </em>
                     </p>
                   </td>
@@ -196768,7 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -197003,7 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -197259,7 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -197517,7 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -198253,7 +198253,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.4" title="local-type: typedef-15.4">local-type: typedef-15.4</a>
                       </em>
                     </p>
                   </td>
@@ -198464,7 +198464,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -199607,7 +199607,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -200157,7 +200157,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
                       </em>
                     </p>
                   </td>
@@ -200501,8 +200501,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-15.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200522,7 +200522,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-15.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200663,8 +200663,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-15.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200684,7 +200684,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-15.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200825,8 +200825,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)</code>
+        <div class="sect2" id="local-type.typedef-15.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-15.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200846,7 +200846,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-23.2)</code>
+                      <code>  (typedef-15.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200913,8 +200913,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-15.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200934,7 +200934,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-15.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201075,8 +201075,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201096,7 +201096,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201135,8 +201135,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201156,7 +201156,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201195,8 +201195,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201216,7 +201216,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201255,8 +201255,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201276,7 +201276,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201315,8 +201315,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)</code>
+        <div class="sect2" id="local-type.typedef-15.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-15.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201336,7 +201336,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-23.4)</code>
+                      <code>  (typedef-15.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201403,8 +201403,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201424,7 +201424,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201463,8 +201463,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201484,7 +201484,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-23.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201523,8 +201523,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-23.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
+        <div class="sect2" id="local-type.typedef-15.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201544,7 +201544,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-23.3)</code>
+                      <code>  (typedef-15.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203436,7 +203436,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -203460,7 +203460,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -204066,7 +204066,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.16" title="local-type: typedef-22.16">local-type: typedef-22.16</a>
                       </em>
                     </p>
                   </td>
@@ -205024,7 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -205048,7 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
                       </em>
                     </p>
                   </td>
@@ -205072,7 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
                       </em>
                     </p>
                   </td>
@@ -205096,7 +205096,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.7" title="local-type: typedef-22.7">local-type: typedef-22.7</a>
                       </em>
                     </p>
                   </td>
@@ -205322,7 +205322,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -206598,7 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.9" title="local-type: typedef-22.9">local-type: typedef-22.9</a>
                       </em>
                     </p>
                   </td>
@@ -206622,7 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.10" title="local-type: typedef-22.10">local-type: typedef-22.10</a>
                       </em>
                     </p>
                   </td>
@@ -206646,7 +206646,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.11" title="local-type: typedef-22.11">local-type: typedef-22.11</a>
                       </em>
                     </p>
                   </td>
@@ -206769,7 +206769,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.8" title="local-type: typedef-22.8">local-type: typedef-22.8</a>
                       </em>
                     </p>
                   </td>
@@ -207125,7 +207125,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.21" title="local-type: typedef-29.21">local-type: typedef-29.21</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.21" title="local-type: typedef-22.21">local-type: typedef-22.21</a>
                       </em>
                     </p>
                   </td>
@@ -207392,7 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.18" title="local-type: typedef-22.18">local-type: typedef-22.18</a>
                       </em>
                     </p>
                   </td>
@@ -207416,7 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.19" title="local-type: typedef-22.19">local-type: typedef-22.19</a>
                       </em>
                     </p>
                   </td>
@@ -207440,7 +207440,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.20" title="local-type: typedef-22.20">local-type: typedef-22.20</a>
                       </em>
                     </p>
                   </td>
@@ -207469,7 +207469,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.17" title="local-type: typedef-22.17">local-type: typedef-22.17</a>
                       </em>
                     </p>
                   </td>
@@ -207686,7 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.18" title="local-type: typedef-22.18">local-type: typedef-22.18</a>
                       </em>
                     </p>
                   </td>
@@ -207710,7 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.19" title="local-type: typedef-22.19">local-type: typedef-22.19</a>
                       </em>
                     </p>
                   </td>
@@ -207734,7 +207734,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.20" title="local-type: typedef-22.20">local-type: typedef-22.20</a>
                       </em>
                     </p>
                   </td>
@@ -208086,7 +208086,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -208115,7 +208115,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -208485,7 +208485,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -208829,7 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.12" title="local-type: typedef-22.12">local-type: typedef-22.12</a>
                       </em>
                     </p>
                   </td>
@@ -208853,7 +208853,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.13" title="local-type: typedef-22.13">local-type: typedef-22.13</a>
                       </em>
                     </p>
                   </td>
@@ -209092,7 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.14" title="local-type: typedef-22.14">local-type: typedef-22.14</a>
                       </em>
                     </p>
                   </td>
@@ -209116,7 +209116,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-22.15" title="local-type: typedef-22.15">local-type: typedef-22.15</a>
                       </em>
                     </p>
                   </td>
@@ -210336,8 +210336,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210357,7 +210357,7 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210399,8 +210399,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210420,7 +210420,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210462,8 +210462,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)</code>
+        <div class="sect2" id="local-type.typedef-22.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-22.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210483,7 +210483,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-                      <code>  (typedef-29.16)</code>
+                      <code>  (typedef-22.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210521,8 +210521,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210542,7 +210542,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-                      <code>  (typedef-29.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210584,8 +210584,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)</code>
+        <div class="sect2" id="local-type.typedef-22.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-22.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210605,7 +210605,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-29.5)</code>
+                      <code>  (typedef-22.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210647,8 +210647,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)</code>
+        <div class="sect2" id="local-type.typedef-22.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-22.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210668,7 +210668,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-29.6)</code>
+                      <code>  (typedef-22.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210710,8 +210710,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)</code>
+        <div class="sect2" id="local-type.typedef-22.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-22.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210731,7 +210731,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-29.7)</code>
+                      <code>  (typedef-22.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210773,8 +210773,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210794,7 +210794,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-                      <code>  (typedef-29.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211123,8 +211123,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)</code>
+        <div class="sect2" id="local-type.typedef-22.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-22.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211144,7 +211144,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-29.9)</code>
+                      <code>  (typedef-22.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211186,8 +211186,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)</code>
+        <div class="sect2" id="local-type.typedef-22.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-22.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211207,7 +211207,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-29.10)</code>
+                      <code>  (typedef-22.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211296,8 +211296,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)</code>
+        <div class="sect2" id="local-type.typedef-22.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-22.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211317,7 +211317,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.11)</code>
+                      <code>  (typedef-22.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211359,8 +211359,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)</code>
+        <div class="sect2" id="local-type.typedef-22.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-22.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211380,7 +211380,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-                      <code>  (typedef-29.8)</code>
+                      <code>  (typedef-22.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211706,8 +211706,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)</code>
+        <div class="sect2" id="local-type.typedef-22.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-22.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211727,7 +211727,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.21)</code>
+                      <code>  (typedef-22.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211769,8 +211769,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
+        <div class="sect2" id="local-type.typedef-22.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-22.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211790,7 +211790,7 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.18)</code>
+                      <code>  (typedef-22.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211832,8 +211832,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
+        <div class="sect2" id="local-type.typedef-22.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-22.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211853,7 +211853,7 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-29.19)</code>
+                      <code>  (typedef-22.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211891,8 +211891,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
+        <div class="sect2" id="local-type.typedef-22.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-22.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211912,7 +211912,7 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-29.20)</code>
+                      <code>  (typedef-22.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211954,8 +211954,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)</code>
+        <div class="sect2" id="local-type.typedef-22.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-22.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211975,7 +211975,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.17)</code>
+                      <code>  (typedef-22.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212017,8 +212017,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
+        <div class="sect2" id="local-type.typedef-22.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-22.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212038,7 +212038,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.18)</code>
+                      <code>  (typedef-22.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212080,8 +212080,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
+        <div class="sect2" id="local-type.typedef-22.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-22.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212101,7 +212101,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-29.19)</code>
+                      <code>  (typedef-22.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212139,8 +212139,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
+        <div class="sect2" id="local-type.typedef-22.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-22.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212160,7 +212160,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-29.20)</code>
+                      <code>  (typedef-22.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212202,8 +212202,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212223,7 +212223,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212265,8 +212265,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212286,7 +212286,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-29.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212328,8 +212328,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212349,7 +212349,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-29.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212391,8 +212391,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)</code>
+        <div class="sect2" id="local-type.typedef-22.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-22.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212412,7 +212412,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-29.12)</code>
+                      <code>  (typedef-22.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212454,8 +212454,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)</code>
+        <div class="sect2" id="local-type.typedef-22.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-22.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212475,7 +212475,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-29.13)</code>
+                      <code>  (typedef-22.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212517,8 +212517,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)</code>
+        <div class="sect2" id="local-type.typedef-22.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-22.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212538,7 +212538,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-                      <code>  (typedef-29.14)</code>
+                      <code>  (typedef-22.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212580,8 +212580,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-29.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)</code>
+        <div class="sect2" id="local-type.typedef-22.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-22.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212601,7 +212601,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-29.15)</code>
+                      <code>  (typedef-22.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213266,12 +213266,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-39.2" class="tableblock">
+                    <p id="local-type.typedef-4.2" class="tableblock">
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-39.2)</code>
+                      <code>  (typedef-4.2)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -213316,12 +213316,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-39.1" class="tableblock">
+                    <p id="local-type.typedef-4.1" class="tableblock">
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-39.1)</code>
+                      <code>  (typedef-4.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223116,7 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-58.1" title="local-type: typedef-58.1">local-type: typedef-58.1</a>
                       </em>
                     </p>
                   </td>
@@ -223140,7 +223140,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
+                      <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>
@@ -223284,7 +223284,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.3" title="local-type: typedef-69.3">local-type: typedef-69.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-58.3" title="local-type: typedef-58.3">local-type: typedef-58.3</a>
                       </em>
                     </p>
                   </td>
@@ -223494,7 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -223518,7 +223518,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
                       </em>
                     </p>
                   </td>
@@ -223682,8 +223682,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)</code>
+        <div class="sect2" id="local-type.typedef-58.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-58.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223703,7 +223703,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-                      <code>  (typedef-69.1)</code>
+                      <code>  (typedef-58.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223746,8 +223746,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)</code>
+        <div class="sect2" id="local-type.typedef-58.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-58.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223767,7 +223767,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-                      <code>  (typedef-69.2)</code>
+                      <code>  (typedef-58.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223809,8 +223809,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)</code>
+        <div class="sect2" id="local-type.typedef-58.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-58.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223830,7 +223830,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-                      <code>  (typedef-69.3)</code>
+                      <code>  (typedef-58.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223860,7 +223860,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.4" title="local-type: typedef-69.4">local-type: typedef-69.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-58.4" title="local-type: typedef-58.4">local-type: typedef-58.4</a>
                       </em>
                     </p>
                   </td>
@@ -223872,8 +223872,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)</code>
+        <div class="sect2" id="local-type.typedef-58.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-58.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223893,7 +223893,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-69.4)</code>
+                      <code>  (typedef-58.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223968,7 +223968,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-69.5" title="local-type: typedef-69.5">local-type: typedef-69.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-58.5" title="local-type: typedef-58.5">local-type: typedef-58.5</a>
                       </em>
                     </p>
                   </td>
@@ -223980,8 +223980,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-69.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)</code>
+        <div class="sect2" id="local-type.typedef-58.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-58.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224001,7 +224001,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-69.5)</code>
+                      <code>  (typedef-58.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224043,8 +224043,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224064,7 +224064,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-67.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224150,8 +224150,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
+        <div class="sect2" id="local-type.typedef-55.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-55.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224171,7 +224171,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-67.2)</code>
+                      <code>  (typedef-55.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224459,7 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -224483,7 +224483,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
                       </em>
                     </p>
                   </td>
@@ -224542,8 +224542,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224563,7 +224563,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-67.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224649,8 +224649,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
+        <div class="sect2" id="local-type.typedef-55.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-55.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224670,7 +224670,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-67.2)</code>
+                      <code>  (typedef-55.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -225794,7 +225794,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -225816,7 +225816,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -225944,7 +225944,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -225996,7 +225996,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -227056,7 +227056,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.7" title="local-type: typedef-74.7">local-type: typedef-74.7</a>
                       </em>
                     </p>
                   </td>
@@ -227966,7 +227966,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -227988,7 +227988,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="#type.siri:VehicleModesEnumeration" title="siri:VehicleModesEnumeration">siri:VehicleModesEnumeration</a>
+                        <a shape="rect" href="#type.siri:VehicleModesOfTransportEnumeration" title="siri:VehicleModesOfTransportEnumeration">siri:VehicleModesOfTransportEnumeration</a>
                       </em>
                     </p>
                   </td>
@@ -228297,7 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
                       </em>
                     </p>
                   </td>
@@ -228321,7 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
                       </em>
                     </p>
                   </td>
@@ -228345,7 +228345,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
                       </em>
                     </p>
                   </td>
@@ -228717,8 +228717,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228738,7 +228738,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228888,8 +228888,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
+        <div class="sect2" id="local-type.typedef-74.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228909,7 +228909,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.7)</code>
+                      <code>  (typedef-74.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228984,8 +228984,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229005,7 +229005,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229202,8 +229202,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229223,7 +229223,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229265,8 +229265,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229286,7 +229286,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229483,8 +229483,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229504,7 +229504,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229654,8 +229654,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
+        <div class="sect2" id="local-type.typedef-74.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229675,7 +229675,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.7)</code>
+                      <code>  (typedef-74.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229750,8 +229750,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229771,7 +229771,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229813,8 +229813,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-74.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229834,7 +229834,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-74.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230031,8 +230031,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
+        <div class="sect2" id="local-type.typedef-74.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230052,7 +230052,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-82.5)</code>
+                      <code>  (typedef-74.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230196,8 +230196,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)</code>
+        <div class="sect2" id="local-type.typedef-74.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-74.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230217,7 +230217,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-82.6)</code>
+                      <code>  (typedef-74.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -235786,7 +235786,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -235820,7 +235820,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -235849,7 +235849,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -237498,8 +237498,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237519,7 +237519,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237587,8 +237587,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237608,7 +237608,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237693,8 +237693,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237714,7 +237714,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -239249,7 +239249,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -241802,7 +241802,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.5" title="local-type: typedef-75.5">local-type: typedef-75.5</a>
                       </em>
                     </p>
                   </td>
@@ -243134,7 +243134,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -243813,7 +243813,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -243953,7 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -243977,7 +243977,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -244049,7 +244049,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
                       </em>
                     </p>
                   </td>
@@ -244183,7 +244183,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -244217,7 +244217,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -244246,7 +244246,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -244274,7 +244274,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.6" title="local-type: typedef-75.6">local-type: typedef-75.6</a>
                       </em>
                     </p>
                   </td>
@@ -244977,8 +244977,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-75.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-75.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -244998,7 +244998,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-75.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245072,8 +245072,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245093,7 +245093,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245153,8 +245153,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-75.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-75.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245174,7 +245174,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-75.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245248,8 +245248,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245269,7 +245269,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245329,8 +245329,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245350,7 +245350,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245410,8 +245410,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245431,7 +245431,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-80.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245624,8 +245624,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245645,7 +245645,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-80.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245985,8 +245985,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
+        <div class="sect2" id="local-type.typedef-75.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246006,7 +246006,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-80.4)</code>
+                      <code>  (typedef-75.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246066,8 +246066,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246087,7 +246087,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246155,8 +246155,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246176,7 +246176,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246261,8 +246261,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246282,7 +246282,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246367,8 +246367,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
+        <div class="sect2" id="local-type.typedef-75.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246388,7 +246388,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-80.6)</code>
+                      <code>  (typedef-75.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -247532,7 +247532,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
                       </em>
                     </p>
                   </td>
@@ -248676,7 +248676,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <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>
@@ -248724,7 +248724,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
                       </em>
                     </p>
                   </td>
@@ -248883,7 +248883,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -248917,7 +248917,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -248946,7 +248946,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -248974,7 +248974,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
                       </em>
                     </p>
                   </td>
@@ -249930,8 +249930,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249951,7 +249951,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250025,8 +250025,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-85.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-85.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250046,7 +250046,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-85.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250120,8 +250120,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-85.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250141,7 +250141,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-85.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250235,8 +250235,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-85.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-85.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250256,7 +250256,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-85.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250381,8 +250381,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250402,7 +250402,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250470,8 +250470,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250491,7 +250491,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250576,8 +250576,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250597,7 +250597,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250682,8 +250682,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)</code>
+        <div class="sect2" id="local-type.typedef-85.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-85.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250703,7 +250703,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-75.4)</code>
+                      <code>  (typedef-85.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252104,7 +252104,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -252232,8 +252232,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -252253,7 +252253,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252516,12 +252516,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-71.1" class="tableblock">
+                    <p id="local-type.typedef-36.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-71.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254795,7 +254795,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <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>
@@ -255918,7 +255918,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <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>
@@ -256232,7 +256232,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.7" title="local-type: typedef-80.7">local-type: typedef-80.7</a>
                       </em>
                     </p>
                   </td>
@@ -257372,7 +257372,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <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>
@@ -257532,7 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
                       </em>
                     </p>
                   </td>
@@ -257556,7 +257556,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
                       </em>
                     </p>
                   </td>
@@ -257604,7 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
                       </em>
                     </p>
                   </td>
@@ -257628,7 +257628,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
                       </em>
                     </p>
                   </td>
@@ -257787,7 +257787,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
+                      <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>
@@ -257821,7 +257821,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -257850,7 +257850,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -257878,7 +257878,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.8" title="local-type: typedef-80.8">local-type: typedef-80.8</a>
                       </em>
                     </p>
                   </td>
@@ -258291,8 +258291,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-80.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258312,7 +258312,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-80.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258386,8 +258386,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258407,7 +258407,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258467,8 +258467,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-80.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258488,7 +258488,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-80.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259955,7 +259955,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
                       </em>
                     </p>
                   </td>
@@ -259976,7 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
                       </em>
                     </p>
                   </td>
@@ -260000,7 +260000,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
                       </em>
                     </p>
                   </td>
@@ -260021,7 +260021,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
                       </em>
                     </p>
                   </td>
@@ -260042,7 +260042,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
                       </em>
                     </p>
                   </td>
@@ -260140,8 +260140,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
+        <div class="sect2" id="local-type.typedef-8.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260161,7 +260161,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-28.4)</code>
+                      <code>  (typedef-8.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260203,8 +260203,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-28.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
+        <div class="sect2" id="local-type.typedef-8.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260224,7 +260224,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-28.5)</code>
+                      <code>  (typedef-8.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260266,8 +260266,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
+        <div class="sect2" id="local-type.typedef-24.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260287,7 +260287,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-18.2)</code>
+                      <code>  (typedef-24.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260374,8 +260374,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
+        <div class="sect2" id="local-type.typedef-24.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260395,7 +260395,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.3)</code>
+                      <code>  (typedef-24.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260482,8 +260482,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-18.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
+        <div class="sect2" id="local-type.typedef-24.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260503,7 +260503,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-18.4)</code>
+                      <code>  (typedef-24.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260590,8 +260590,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-80.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260611,7 +260611,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-80.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260685,8 +260685,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260706,7 +260706,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260766,8 +260766,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-80.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260787,7 +260787,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-80.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260929,8 +260929,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-80.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260950,7 +260950,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-80.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261224,8 +261224,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261245,7 +261245,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261369,8 +261369,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)</code>
+        <div class="sect2" id="local-type.typedef-80.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261390,7 +261390,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-79.6)</code>
+                      <code>  (typedef-80.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261450,8 +261450,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-10.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
+        <div class="sect2" id="local-type.typedef-61.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261471,7 +261471,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-10.1)</code>
+                      <code>  (typedef-61.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261539,8 +261539,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261560,7 +261560,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261645,8 +261645,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-27.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261666,7 +261666,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-27.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261751,8 +261751,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)</code>
+        <div class="sect2" id="local-type.typedef-80.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261772,7 +261772,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.8)</code>
+                      <code>  (typedef-80.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261955,7 +261955,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -261986,7 +261986,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -262372,7 +262372,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -262554,8 +262554,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
+        <div class="sect2" id="local-type.typedef-83.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262575,7 +262575,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.1)</code>
+                      <code>  (typedef-83.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262653,7 +262653,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -262684,7 +262684,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -263070,7 +263070,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -263252,8 +263252,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263273,7 +263273,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263507,8 +263507,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263528,7 +263528,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263836,8 +263836,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-78.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263857,7 +263857,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-78.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264101,7 +264101,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
                       </em>
                     </p>
                   </td>
@@ -264162,8 +264162,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-5.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
+        <div class="sect2" id="local-type.typedef-68.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264183,7 +264183,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-5.1)</code>
+                      <code>  (typedef-68.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">

From 8ad92563977305080ba376cca01bd9a3df87f4d3 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2026 06:40:09 +0000
Subject: [PATCH 6/8] Lint and update documentation tables

---
 docs/generated/contab/acsb.html   |   40 +-
 docs/generated/contab/datex2.html |   32 +-
 docs/generated/contab/ifopt.html  |   94 +-
 docs/generated/contab/siri.html   | 2752 ++++++++++++++---------------
 4 files changed, 1459 insertions(+), 1459 deletions(-)

diff --git a/docs/generated/contab/acsb.html b/docs/generated/contab/acsb.html
index 9ca12ee4..d1e20447 100644
--- a/docs/generated/contab/acsb.html
+++ b/docs/generated/contab/acsb.html
@@ -248,7 +248,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
                       </em>
                     </p>
                   </td>
@@ -272,7 +272,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
                       </em>
                     </p>
                   </td>
@@ -297,7 +297,7 @@ <h3>1.3. The complex type <code>acsb:AccessibilityAssessmentStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -544,7 +544,7 @@ <h3>1.4. The complex type <code>acsb:AccessibilityLimitationStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -589,8 +589,8 @@ <h3>1.5. The complex type <code>acsb:LimitationRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-33.1">
-          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-33.1)</code>
+        <div class="sect2" id="local-type.typedef-15.1">
+          <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Limitations#complexType (typedef-15.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -610,7 +610,7 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-33.1)</code>
+                      <code>  (typedef-15.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -652,8 +652,8 @@ <h3>1.6. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-33.2">
-          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-33.2)</code>
+        <div class="sect2" id="local-type.typedef-15.2">
+          <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructure]/Suitabilities#complexType (typedef-15.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -673,7 +673,7 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-33.2)</code>
+                      <code>  (typedef-15.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -715,8 +715,8 @@ <h3>1.7. The complex type <code>complexType[acsb:AccessibilityAssessmentStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-43.1">
-          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -736,7 +736,7 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-4
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-43.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -752,8 +752,8 @@ <h3>1.8. The complex type <code>element[ifopt:Extensions]#complexType (typedef-4
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-43.1">
-          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -773,7 +773,7 @@ <h3>1.9. The complex type <code>element[ifopt:Extensions]#complexType (typedef-4
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-43.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -1672,12 +1672,12 @@ <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-34.1" class="tableblock">
+                    <p id="local-type.typedef-14.1" class="tableblock">
                       <code>group[acsb:UserNeedGroup]</code>
                       <br/>
                       <code>  /MedicalNeed #simpleType</code>
                       <br/>
-                      <code>  (typedef-34.1)</code>
+                      <code>  (typedef-14.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -1844,7 +1844,7 @@ <h3>3.7. The group <code>acsb:UserNeedGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
@@ -2173,7 +2173,7 @@ <h3>3.10. The complex type <code>acsb:UserNeedStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/acsb.enum-dict.html#local-enum.typedef-14.1" title="local-type: typedef-14.1">local-type: typedef-14.1</a>
                       </em>
                     </p>
                   </td>
diff --git a/docs/generated/contab/datex2.html b/docs/generated/contab/datex2.html
index e5f4c146..63eef8fc 100644
--- a/docs/generated/contab/datex2.html
+++ b/docs/generated/contab/datex2.html
@@ -107112,7 +107112,7 @@ <h3>2.204. The complex type <code>orc:Itinerary</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.1" title="local-type: typedef-70.1">local-type: typedef-70.1</a>
                       </em>
                     </p>
                   </td>
@@ -111020,7 +111020,7 @@ <h3>2.219. The complex type <code>orc:MeasurementSiteRecord</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.2" title="local-type: typedef-59.2">local-type: typedef-59.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
                       </em>
                     </p>
                   </td>
@@ -111865,7 +111865,7 @@ <h3>2.224. The complex type <code>orc:MultilingualString</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.3" title="local-type: typedef-59.3">local-type: typedef-59.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.3" title="local-type: typedef-70.3">local-type: typedef-70.3</a>
                       </em>
                     </p>
                   </td>
@@ -127573,7 +127573,7 @@ <h3>2.266. The complex type <code>orc:SiteMeasurements</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-59.4" title="local-type: typedef-59.4">local-type: typedef-59.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-70.4" title="local-type: typedef-70.4">local-type: typedef-70.4</a>
                       </em>
                     </p>
                   </td>
@@ -145442,8 +145442,8 @@ <h3>2.326. The complex type <code>orc:WinterDrivingManagement</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.1">
-          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-59.1)</code>
+        <div class="sect2" id="local-type.typedef-70.1">
+          <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItinerary#complexType (typedef-70.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145463,7 +145463,7 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
                       <br/>
                       <code>  /locationContainedInItinerary #complexType</code>
                       <br/>
-                      <code>  (typedef-59.1)</code>
+                      <code>  (typedef-70.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145588,8 +145588,8 @@ <h3>2.327. The complex type <code>complexType[Itinerary]/locationContainedInItin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.2">
-          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-59.2)</code>
+        <div class="sect2" id="local-type.typedef-70.2">
+          <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurementSpecificCharacteristics#complexType (typedef-70.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145609,7 +145609,7 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
                       <br/>
                       <code>  /measurementSpecificCharacteristics #complexType</code>
                       <br/>
-                      <code>  (typedef-59.2)</code>
+                      <code>  (typedef-70.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145839,8 +145839,8 @@ <h3>2.328. The complex type <code>complexType[MeasurementSiteRecord]/measurement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.3">
-          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-59.3)</code>
+        <div class="sect2" id="local-type.typedef-70.3">
+          <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complexType (typedef-70.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145860,7 +145860,7 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
                       <br/>
                       <code>  /values #complexType</code>
                       <br/>
-                      <code>  (typedef-59.3)</code>
+                      <code>  (typedef-70.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -145902,8 +145902,8 @@ <h3>2.329. The complex type <code>complexType[MultilingualString]/values#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-59.4">
-          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-59.4)</code>
+        <div class="sect2" id="local-type.typedef-70.4">
+          <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#complexType (typedef-70.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -145923,7 +145923,7 @@ <h3>2.330. The complex type <code>complexType[SiteMeasurements]/measuredValue#co
                       <br/>
                       <code>  /measuredValue #complexType</code>
                       <br/>
-                      <code>  (typedef-59.4)</code>
+                      <code>  (typedef-70.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/ifopt.html b/docs/generated/contab/ifopt.html
index cf572751..597e1770 100644
--- a/docs/generated/contab/ifopt.html
+++ b/docs/generated/contab/ifopt.html
@@ -7206,7 +7206,7 @@ <h3>4.8. The group <code>ifopt:LocalServiceGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8212,7 +8212,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-53.1" title="local-type: typedef-53.1">local-type: typedef-53.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-54.1" title="local-type: typedef-54.1">local-type: typedef-54.1</a>
                       </em>
                     </p>
                   </td>
@@ -8237,7 +8237,7 @@ <h3>4.13. The complex type <code>ifopt:LocalServiceStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8562,7 +8562,7 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-59.1" title="local-type: typedef-59.1">local-type: typedef-59.1</a>
                       </em>
                     </p>
                   </td>
@@ -8574,8 +8574,8 @@ <h3>4.14. The complex type <code>ifopt:PlaceEquipmentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.1">
-          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-53.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8595,7 +8595,7 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-53.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8633,8 +8633,8 @@ <h3>4.15. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-53.1">
-          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-53.1)</code>
+        <div class="sect2" id="local-type.typedef-54.1">
+          <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#complexType (typedef-54.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8654,7 +8654,7 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
                       <br/>
                       <code>  /FeatureRefs #complexType</code>
                       <br/>
-                      <code>  (typedef-53.1)</code>
+                      <code>  (typedef-54.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8692,8 +8692,8 @@ <h3>4.16. The complex type <code>group[ifopt:LocalServiceGroup]/FeatureRefs#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-43.1">
-          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8713,7 +8713,7 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-43.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -8729,8 +8729,8 @@ <h3>4.17. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-43.1">
-          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -8750,7 +8750,7 @@ <h3>4.18. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-43.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -9391,7 +9391,7 @@ <h3>5.11. The complex type <code>ifopt:AbstractProjection</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9568,7 +9568,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9597,7 +9597,7 @@ <h3>5.14. The complex type <code>ifopt:LinkProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.2" title="local-type: typedef-46.2">local-type: typedef-46.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
                       </em>
                     </p>
                   </td>
@@ -9659,7 +9659,7 @@ <h3>5.15. The complex type <code>ifopt:PointProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9908,7 +9908,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.1" title="local-type: typedef-46.1">local-type: typedef-46.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
                       </em>
                     </p>
                   </td>
@@ -9941,7 +9941,7 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-46.3" title="local-type: typedef-46.3">local-type: typedef-46.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-55.3" title="local-type: typedef-55.3">local-type: typedef-55.3</a>
                       </em>
                     </p>
                   </td>
@@ -9953,8 +9953,8 @@ <h3>5.16. The complex type <code>ifopt:ZoneProjectionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.1">
-          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -9974,7 +9974,7 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-46.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10016,8 +10016,8 @@ <h3>5.17. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.1">
-          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10037,7 +10037,7 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-46.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10079,8 +10079,8 @@ <h3>5.18. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.2">
-          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-46.2)</code>
+        <div class="sect2" id="local-type.typedef-55.2">
+          <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line#complexType (typedef-55.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10100,7 +10100,7 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
                       <br/>
                       <code>  /Line #complexType</code>
                       <br/>
-                      <code>  (typedef-46.2)</code>
+                      <code>  (typedef-55.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10143,8 +10143,8 @@ <h3>5.19. The complex type <code>complexType[ifopt:LinkProjectionStructure]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.1">
-          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10164,7 +10164,7 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-46.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10206,8 +10206,8 @@ <h3>5.20. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.1">
-          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-46.1)</code>
+        <div class="sect2" id="local-type.typedef-55.1">
+          <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#complexType (typedef-55.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10227,7 +10227,7 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-46.1)</code>
+                      <code>  (typedef-55.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -10269,8 +10269,8 @@ <h3>5.21. The complex type <code>complexType[ifopt:AbstractProjection]/Features#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-46.3">
-          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-46.3)</code>
+        <div class="sect2" id="local-type.typedef-55.3">
+          <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boundary#complexType (typedef-55.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -10290,7 +10290,7 @@ <h3>5.22. The complex type <code>complexType[ifopt:ZoneProjectionStructure]/Boun
                       <br/>
                       <code>  /Boundary #complexType</code>
                       <br/>
-                      <code>  (typedef-46.3)</code>
+                      <code>  (typedef-55.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13149,7 +13149,7 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-52.1" title="local-type: typedef-52.1">local-type: typedef-52.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-57.1" title="local-type: typedef-57.1">local-type: typedef-57.1</a>
                       </em>
                     </p>
                   </td>
@@ -13161,8 +13161,8 @@ <h3>10.4. The complex type <code>ifopt:ValidityConditionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-52.1">
-          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-52.1)</code>
+        <div class="sect2" id="local-type.typedef-57.1">
+          <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/Timebands#complexType (typedef-57.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13182,7 +13182,7 @@ <h3>10.5. The complex type <code>complexType[ifopt:ValidityConditionStructure]/T
                       <br/>
                       <code>  /Timebands #complexType</code>
                       <br/>
-                      <code>  (typedef-52.1)</code>
+                      <code>  (typedef-57.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -13416,8 +13416,8 @@ <h3>11.6. The complex type <code>ifopt:InfoLinkStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-43.1">
-          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-43.1)</code>
+        <div class="sect2" id="local-type.typedef-59.1">
+          <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-59.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -13437,7 +13437,7 @@ <h3>11.7. The complex type <code>element[ifopt:Extensions]#complexType (typedef-
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-43.1)</code>
+                      <code>  (typedef-59.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index 19da9133..2448444e 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -5535,7 +5535,7 @@ <h3>1.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -5944,7 +5944,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -5975,7 +5975,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -6361,7 +6361,7 @@ <h3>1.5. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -6957,7 +6957,7 @@ <h3>1.7. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -7063,7 +7063,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -7094,7 +7094,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -7343,7 +7343,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -7405,7 +7405,7 @@ <h3>1.8. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -7736,7 +7736,7 @@ <h3>1.9. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -8176,7 +8176,7 @@ <h3>1.10. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -8670,7 +8670,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -8701,7 +8701,7 @@ <h3>1.11. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -8973,7 +8973,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -9035,7 +9035,7 @@ <h3>1.13. The group <code>siri:SiriDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -9572,7 +9572,7 @@ <h3>1.15. The group <code>siri:SiriServiceCapabilitiesRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -10886,7 +10886,7 @@ <h3>1.19. The group <code>siri:SiriSubscriptionRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -11433,7 +11433,7 @@ <h3>1.20. The complex type <code>siri:CapabilitiesRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -12192,7 +12192,7 @@ <h3>1.22. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -12894,7 +12894,7 @@ <h3>1.23. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -14410,7 +14410,7 @@ <h3>1.26. The complex type <code>siri:SiriSubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15029,7 +15029,7 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -15320,8 +15320,8 @@ <h3>1.27. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15341,7 +15341,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15585,7 +15585,7 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -15646,8 +15646,8 @@ <h3>1.28. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15667,7 +15667,7 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -15778,8 +15778,8 @@ <h3>1.29. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -15799,7 +15799,7 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16033,8 +16033,8 @@ <h3>1.30. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.1">
-          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</code>
+        <div class="sect2" id="local-type.typedef-78.1">
+          <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-78.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16054,7 +16054,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.1)</code>
+                      <code>  (typedef-78.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16134,7 +16134,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -16165,7 +16165,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -16551,7 +16551,7 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -16733,8 +16733,8 @@ <h3>1.31. The complex type <code>element[siri:Siri]#complexType (typedef-82.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -16754,7 +16754,7 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -16988,8 +16988,8 @@ <h3>1.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.2">
-          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17009,7 +17009,7 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-70.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17317,8 +17317,8 @@ <h3>1.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17338,7 +17338,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17582,7 +17582,7 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -17643,8 +17643,8 @@ <h3>1.34. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17664,7 +17664,7 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -17775,8 +17775,8 @@ <h3>1.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -17796,7 +17796,7 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18104,8 +18104,8 @@ <h3>1.36. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18125,7 +18125,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18369,7 +18369,7 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -18430,8 +18430,8 @@ <h3>1.37. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18451,7 +18451,7 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18562,8 +18562,8 @@ <h3>1.38. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18583,7 +18583,7 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -18817,8 +18817,8 @@ <h3>1.39. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -18838,7 +18838,7 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19146,8 +19146,8 @@ <h3>1.40. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19167,7 +19167,7 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19557,8 +19557,8 @@ <h3>1.41. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19578,7 +19578,7 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -19796,8 +19796,8 @@ <h3>1.42. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -19817,7 +19817,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20061,7 +20061,7 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -20122,8 +20122,8 @@ <h3>1.43. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20143,7 +20143,7 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20254,8 +20254,8 @@ <h3>1.44. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20275,7 +20275,7 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20386,8 +20386,8 @@ <h3>1.45. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20407,7 +20407,7 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20641,8 +20641,8 @@ <h3>1.46. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20662,7 +20662,7 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -20970,8 +20970,8 @@ <h3>1.47. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -20991,7 +20991,7 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21381,8 +21381,8 @@ <h3>1.48. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21402,7 +21402,7 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21620,8 +21620,8 @@ <h3>1.49. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21641,7 +21641,7 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -21791,8 +21791,8 @@ <h3>1.50. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -21812,7 +21812,7 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22009,8 +22009,8 @@ <h3>1.51. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22030,7 +22030,7 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22180,8 +22180,8 @@ <h3>1.52. The complex type <code>element[siri:ProductionTimetableCapabilitiesReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22201,7 +22201,7 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22312,8 +22312,8 @@ <h3>1.53. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22333,7 +22333,7 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22444,8 +22444,8 @@ <h3>1.54. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22465,7 +22465,7 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -22662,8 +22662,8 @@ <h3>1.55. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -22683,7 +22683,7 @@ <h3>1.56. The complex type <code>element[siri:ProductionTimetableSubscriptionReq
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -23212,7 +23212,7 @@ <h3>2.3. The toplevel element <code>siri:ServiceDelivery</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -23972,7 +23972,7 @@ <h3>2.6. The group <code>siri:DeliveryResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24280,7 +24280,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -24311,7 +24311,7 @@ <h3>2.9. The group <code>siri:RequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -24728,7 +24728,7 @@ <h3>2.10. The group <code>siri:ResponseGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -24943,7 +24943,7 @@ <h3>2.11. The group <code>siri:ServiceDeliveryBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -25062,7 +25062,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -25093,7 +25093,7 @@ <h3>2.12. The group <code>siri:ServiceRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -25853,7 +25853,7 @@ <h3>2.16. The complex type <code>siri:ServiceDeliveryBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -26555,7 +26555,7 @@ <h3>2.17. The complex type <code>siri:ServiceDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -27337,7 +27337,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -27368,7 +27368,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.3" title="local-type: typedef-78.3">local-type: typedef-78.3</a>
                       </em>
                     </p>
                   </td>
@@ -27617,7 +27617,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -27679,7 +27679,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -27979,7 +27979,7 @@ <h3>2.19. The complex type <code>siri:SiriSchema</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -28716,8 +28716,8 @@ <h3>2.20. The complex type <code>siri:SubscriptionRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.3">
-          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-70.3)</code>
+        <div class="sect2" id="local-type.typedef-3.3">
+          <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-3.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -28737,7 +28737,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-70.3)</code>
+                      <code>  (typedef-3.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -28981,7 +28981,7 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -29042,8 +29042,8 @@ <h3>2.21. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29063,7 +29063,7 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29174,8 +29174,8 @@ <h3>2.22. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.1">
-          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-70.1)</code>
+        <div class="sect2" id="local-type.typedef-3.1">
+          <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-3.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29195,7 +29195,7 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-70.1)</code>
+                      <code>  (typedef-3.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29463,8 +29463,8 @@ <h3>2.23. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.2">
-          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29484,7 +29484,7 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-70.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -29792,8 +29792,8 @@ <h3>2.24. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -29813,7 +29813,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30057,7 +30057,7 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -30118,8 +30118,8 @@ <h3>2.25. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30139,7 +30139,7 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30250,8 +30250,8 @@ <h3>2.26. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30271,7 +30271,7 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30505,8 +30505,8 @@ <h3>2.27. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30526,7 +30526,7 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -30834,8 +30834,8 @@ <h3>2.28. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -30855,7 +30855,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31099,7 +31099,7 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -31160,8 +31160,8 @@ <h3>2.29. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31181,7 +31181,7 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31292,8 +31292,8 @@ <h3>2.30. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31313,7 +31313,7 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31424,8 +31424,8 @@ <h3>2.31. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31445,7 +31445,7 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -31679,8 +31679,8 @@ <h3>2.32. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -31700,7 +31700,7 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32008,8 +32008,8 @@ <h3>2.33. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32029,7 +32029,7 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32140,8 +32140,8 @@ <h3>2.34. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32161,7 +32161,7 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32272,8 +32272,8 @@ <h3>2.35. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32293,7 +32293,7 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32527,8 +32527,8 @@ <h3>2.36. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.3">
-          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-82.3)</code>
+        <div class="sect2" id="local-type.typedef-78.3">
+          <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-78.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32548,7 +32548,7 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.3)</code>
+                      <code>  (typedef-78.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -32856,8 +32856,8 @@ <h3>2.37. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -32877,7 +32877,7 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33267,8 +33267,8 @@ <h3>2.38. The complex type <code>element[siri:StopPointsRequest]#complexType (ty
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33288,7 +33288,7 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33506,8 +33506,8 @@ <h3>2.39. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33527,7 +33527,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -33771,7 +33771,7 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -33832,8 +33832,8 @@ <h3>2.40. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -33853,7 +33853,7 @@ <h3>2.41. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -34542,7 +34542,7 @@ <h3>3.16. The group <code>siri:CheckStatusPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -34808,7 +34808,7 @@ <h3>3.18. The group <code>siri:DataReceivedPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.3" title="local-type: typedef-67.3">local-type: typedef-67.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -37048,7 +37048,7 @@ <h3>3.37. The complex type <code>siri:CheckStatusResponseBodyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -37386,7 +37386,7 @@ <h3>3.38. The complex type <code>siri:CheckStatusResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -38301,7 +38301,7 @@ <h3>3.42. The complex type <code>siri:DataReadyResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
                       </em>
                     </p>
                   </td>
@@ -38508,7 +38508,7 @@ <h3>3.43. The complex type <code>siri:DataReceivedResponseStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.3" title="local-type: typedef-67.3">local-type: typedef-67.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
                       </em>
                     </p>
                   </td>
@@ -39146,7 +39146,7 @@ <h3>3.46. The complex type <code>siri:HeartbeatNotificationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.4" title="local-type: typedef-67.4">local-type: typedef-67.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.4" title="local-type: typedef-2.4">local-type: typedef-2.4</a>
                       </em>
                     </p>
                   </td>
@@ -41623,7 +41623,7 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
                       </em>
                     </p>
                   </td>
@@ -41635,8 +41635,8 @@ <h3>3.55. The complex type <code>siri:TerminationResponseStatusStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.4">
-          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41656,7 +41656,7 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41767,8 +41767,8 @@ <h3>3.56. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.3">
-          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-67.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41788,7 +41788,7 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -41899,8 +41899,8 @@ <h3>3.57. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.4">
-          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -41920,7 +41920,7 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42031,8 +42031,8 @@ <h3>3.58. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.4">
-          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42052,7 +42052,7 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42163,8 +42163,8 @@ <h3>3.59. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.2">
-          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-67.2)</code>
+        <div class="sect2" id="local-type.typedef-2.2">
+          <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/ErrorCondition#complexType (typedef-2.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42184,7 +42184,7 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.2)</code>
+                      <code>  (typedef-2.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42295,8 +42295,8 @@ <h3>3.60. The complex type <code>complexType[siri:DataReadyResponseStructure]/Er
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.3">
-          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-67.3)</code>
+        <div class="sect2" id="local-type.typedef-2.3">
+          <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondition#complexType (typedef-2.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42316,7 +42316,7 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.3)</code>
+                      <code>  (typedef-2.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42427,8 +42427,8 @@ <h3>3.61. The complex type <code>group[siri:DataReceivedPayloadGroup]/ErrorCondi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.4">
-          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-67.4)</code>
+        <div class="sect2" id="local-type.typedef-2.4">
+          <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondition#complexType (typedef-2.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42448,7 +42448,7 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.4)</code>
+                      <code>  (typedef-2.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -42559,8 +42559,8 @@ <h3>3.62. The complex type <code>group[siri:CheckStatusPayloadGroup]/ErrorCondit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-67.1">
-          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-67.1)</code>
+        <div class="sect2" id="local-type.typedef-2.1">
+          <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStructure]/ErrorCondition#complexType (typedef-2.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -42580,7 +42580,7 @@ <h3>3.63. The complex type <code>complexType[siri:TerminationResponseStatusStruc
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-67.1)</code>
+                      <code>  (typedef-2.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -50447,7 +50447,7 @@ <h3>6.29. The group <code>siri:ServiceDeliveryRequestStatusGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -53179,7 +53179,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.2" title="local-type: typedef-68.2">local-type: typedef-68.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.2" title="local-type: typedef-5.2">local-type: typedef-5.2</a>
                       </em>
                     </p>
                   </td>
@@ -53207,7 +53207,7 @@ <h3>6.50. The complex type <code>siri:CapabilityGeneralInteractionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.3" title="local-type: typedef-68.3">local-type: typedef-68.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.3" title="local-type: typedef-5.3">local-type: typedef-5.3</a>
                       </em>
                     </p>
                   </td>
@@ -55353,8 +55353,8 @@ <h3>6.63. The complex type <code>siri:TransportDescriptionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55374,7 +55374,7 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55485,8 +55485,8 @@ <h3>6.64. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.2">
-          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-68.2)</code>
+        <div class="sect2" id="local-type.typedef-5.2">
+          <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Interaction#complexType (typedef-5.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55506,7 +55506,7 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Interaction #complexType</code>
                       <br/>
-                      <code>  (typedef-68.2)</code>
+                      <code>  (typedef-5.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -55574,8 +55574,8 @@ <h3>6.65. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.3">
-          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-68.3)</code>
+        <div class="sect2" id="local-type.typedef-5.3">
+          <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionStructure]/Delivery#complexType (typedef-5.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -55595,7 +55595,7 @@ <h3>6.66. The complex type <code>complexType[siri:CapabilityGeneralInteractionSt
                       <br/>
                       <code>  /Delivery #complexType</code>
                       <br/>
-                      <code>  (typedef-68.3)</code>
+                      <code>  (typedef-5.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -57952,7 +57952,7 @@ <h3>7.24. The complex type <code>siri:ConnectionMonitoringCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.3" title="local-type: typedef-83.3">local-type: typedef-83.3</a>
                       </em>
                     </p>
                   </td>
@@ -59634,7 +59634,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.1" title="local-type: typedef-83.1">local-type: typedef-83.1</a>
                       </em>
                     </p>
                   </td>
@@ -59658,7 +59658,7 @@ <h3>7.30. The complex type <code>siri:ConnectionMonitoringServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-83.2" title="local-type: typedef-83.2">local-type: typedef-83.2</a>
                       </em>
                     </p>
                   </td>
@@ -61934,8 +61934,8 @@ <h3>7.36. The complex type <code>siri:WaitProlongedDepartureStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -61955,7 +61955,7 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -61993,8 +61993,8 @@ <h3>7.37. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.3">
-          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-72.3)</code>
+        <div class="sect2" id="local-type.typedef-83.3">
+          <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#complexType (typedef-83.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62014,7 +62014,7 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-72.3)</code>
+                      <code>  (typedef-83.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62052,8 +62052,8 @@ <h3>7.38. The complex type <code>element[siri:ConnectionMonitoringPermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.1">
-          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.1)</code>
+        <div class="sect2" id="local-type.typedef-83.1">
+          <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-83.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62073,7 +62073,7 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-72.1)</code>
+                      <code>  (typedef-83.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -62182,8 +62182,8 @@ <h3>7.39. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-72.2">
-          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.2)</code>
+        <div class="sect2" id="local-type.typedef-83.2">
+          <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-83.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -62203,7 +62203,7 @@ <h3>7.40. The complex type <code>complexType[siri:ConnectionMonitoringServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-72.2)</code>
+                      <code>  (typedef-83.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -63829,7 +63829,7 @@ <h3>8.17. The complex type <code>siri:ConnectionTimetableCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
                       </em>
                     </p>
                   </td>
@@ -64952,7 +64952,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
                       </em>
                     </p>
                   </td>
@@ -64976,7 +64976,7 @@ <h3>8.22. The complex type <code>siri:ConnectionTimetableServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
                       </em>
                     </p>
                   </td>
@@ -66192,8 +66192,8 @@ <h3>8.25. The complex type <code>siri:TimetabledFeederArrivalStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.1">
-          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-84.1)</code>
+        <div class="sect2" id="local-type.typedef-74.1">
+          <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitiesResponseStructure]/ConnectionTimetablePermissions#complexType (typedef-74.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66213,7 +66213,7 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
                       <br/>
                       <code>  /ConnectionTimetablePermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-84.1)</code>
+                      <code>  (typedef-74.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66287,8 +66287,8 @@ <h3>8.26. The complex type <code>complexType[siri:ConnectionTimetableCapabilitie
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.2">
-          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.2)</code>
+        <div class="sect2" id="local-type.typedef-74.2">
+          <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66308,7 +66308,7 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-84.2)</code>
+                      <code>  (typedef-74.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -66378,8 +66378,8 @@ <h3>8.27. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-84.3">
-          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-84.3)</code>
+        <div class="sect2" id="local-type.typedef-74.3">
+          <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -66399,7 +66399,7 @@ <h3>8.28. The complex type <code>complexType[siri:ConnectionTimetableServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-84.3)</code>
+                      <code>  (typedef-74.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -67846,7 +67846,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -67867,7 +67867,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -67888,7 +67888,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -67909,7 +67909,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.9" title="local-type: typedef-79.9">local-type: typedef-79.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -67930,7 +67930,7 @@ <h3>9.22. The group <code>siri:ControlActionPayloadGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.10" title="local-type: typedef-79.10">local-type: typedef-79.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -68296,7 +68296,7 @@ <h3>9.25. The group <code>siri:ControlActionTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -69772,7 +69772,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69802,7 +69802,7 @@ <h3>9.35. The group <code>siri:PartialJourneyScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -69931,7 +69931,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -69961,7 +69961,7 @@ <h3>9.36. The group <code>siri:PartOfJourneyPatternScope</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -71792,7 +71792,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.18" title="local-type: typedef-79.18">local-type: typedef-79.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.18" title="local-type: typedef-72.18">local-type: typedef-72.18</a>
                       </em>
                     </p>
                   </td>
@@ -71822,7 +71822,7 @@ <h3>9.44. The complex type <code>siri:CallCancellationActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.19" title="local-type: typedef-79.19">local-type: typedef-79.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.19" title="local-type: typedef-72.19">local-type: typedef-72.19</a>
                       </em>
                     </p>
                   </td>
@@ -72554,7 +72554,7 @@ <h3>9.49. The complex type <code>siri:ControlActionCapabilitiesResponseStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.14" title="local-type: typedef-79.14">local-type: typedef-79.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.14" title="local-type: typedef-72.14">local-type: typedef-72.14</a>
                       </em>
                     </p>
                   </td>
@@ -73253,7 +73253,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.2" title="local-type: typedef-72.2">local-type: typedef-72.2</a>
                       </em>
                     </p>
                   </td>
@@ -73274,7 +73274,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.3" title="local-type: typedef-72.3">local-type: typedef-72.3</a>
                       </em>
                     </p>
                   </td>
@@ -73295,7 +73295,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.7" title="local-type: typedef-72.7">local-type: typedef-72.7</a>
                       </em>
                     </p>
                   </td>
@@ -73316,7 +73316,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.9" title="local-type: typedef-79.9">local-type: typedef-79.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.9" title="local-type: typedef-72.9">local-type: typedef-72.9</a>
                       </em>
                     </p>
                   </td>
@@ -73337,7 +73337,7 @@ <h3>9.52. The complex type <code>siri:ControlActionDeliveryStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.10" title="local-type: typedef-79.10">local-type: typedef-79.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.10" title="local-type: typedef-72.10">local-type: typedef-72.10</a>
                       </em>
                     </p>
                   </td>
@@ -73583,7 +73583,7 @@ <h3>9.53. The complex type <code>siri:ControlActionFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74258,7 +74258,7 @@ <h3>9.56. The complex type <code>siri:ControlActionRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.1" title="local-type: typedef-72.1">local-type: typedef-72.1</a>
                       </em>
                     </p>
                   </td>
@@ -74522,7 +74522,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.11" title="local-type: typedef-79.11">local-type: typedef-79.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.11" title="local-type: typedef-72.11">local-type: typedef-72.11</a>
                       </em>
                     </p>
                   </td>
@@ -74546,7 +74546,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.12" title="local-type: typedef-79.12">local-type: typedef-79.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.12" title="local-type: typedef-72.12">local-type: typedef-72.12</a>
                       </em>
                     </p>
                   </td>
@@ -74618,7 +74618,7 @@ <h3>9.57. The complex type <code>siri:ControlActionServiceCapabilitiesStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.13" title="local-type: typedef-79.13">local-type: typedef-79.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.13" title="local-type: typedef-72.13">local-type: typedef-72.13</a>
                       </em>
                     </p>
                   </td>
@@ -74752,7 +74752,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -74786,7 +74786,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -74815,7 +74815,7 @@ <h3>9.58. The complex type <code>siri:ControlActionServicePermissionStructure</c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -75563,7 +75563,7 @@ <h3>9.59. The complex type <code>siri:ControlActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.15" title="local-type: typedef-79.15">local-type: typedef-79.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.15" title="local-type: typedef-72.15">local-type: typedef-72.15</a>
                       </em>
                     </p>
                   </td>
@@ -76406,7 +76406,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.16" title="local-type: typedef-79.16">local-type: typedef-79.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.16" title="local-type: typedef-72.16">local-type: typedef-72.16</a>
                       </em>
                     </p>
                   </td>
@@ -76535,7 +76535,7 @@ <h3>9.63. The complex type <code>siri:DriverMessageStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.17" title="local-type: typedef-79.17">local-type: typedef-79.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.17" title="local-type: typedef-72.17">local-type: typedef-72.17</a>
                       </em>
                     </p>
                   </td>
@@ -79917,8 +79917,8 @@ <h3>9.82. The complex type <code>siri:VehicleWorkAssignment</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.14">
-          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-79.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -79938,7 +79938,7 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80012,8 +80012,8 @@ <h3>9.83. The complex type <code>element[siri:ControlActionPermissions]#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80033,7 +80033,7 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80075,8 +80075,8 @@ <h3>9.84. The complex type <code>group[siri:ControlActionPayloadGroup]/controlAc
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80096,7 +80096,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80126,7 +80126,7 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -80138,8 +80138,8 @@ <h3>9.85. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80159,7 +80159,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80329,7 +80329,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -80353,7 +80353,7 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -80365,8 +80365,8 @@ <h3>9.86. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80386,7 +80386,7 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80428,8 +80428,8 @@ <h3>9.87. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.6">
-          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-79.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80449,7 +80449,7 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80491,8 +80491,8 @@ <h3>9.88. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80512,7 +80512,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80542,7 +80542,7 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -80554,8 +80554,8 @@ <h3>9.89. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.8">
-          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-79.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80575,7 +80575,7 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-79.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80708,8 +80708,8 @@ <h3>9.90. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedCo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.9">
-          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-79.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80729,7 +80729,7 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-79.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80771,8 +80771,8 @@ <h3>9.91. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.10">
-          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-79.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80792,7 +80792,7 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-79.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80834,8 +80834,8 @@ <h3>9.92. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80855,7 +80855,7 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80897,8 +80897,8 @@ <h3>9.93. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.18">
-          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80918,7 +80918,7 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -80960,8 +80960,8 @@ <h3>9.94. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.19">
-          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -80981,7 +80981,7 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-79.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81051,8 +81051,8 @@ <h3>9.95. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.18">
-          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81072,7 +81072,7 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81114,8 +81114,8 @@ <h3>9.96. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.19">
-          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81135,7 +81135,7 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-79.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81205,8 +81205,8 @@ <h3>9.97. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.18">
-          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-79.18)</code>
+        <div class="sect2" id="local-type.typedef-72.18">
+          <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedCalls#complexType (typedef-72.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81226,7 +81226,7 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
                       <br/>
                       <code>  /SelectedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-79.18)</code>
+                      <code>  (typedef-72.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81268,8 +81268,8 @@ <h3>9.98. The complex type <code>group[siri:PartOfJourneyPatternScope]/SelectedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.19">
-          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-79.19)</code>
+        <div class="sect2" id="local-type.typedef-72.19">
+          <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetweenPoints#complexType (typedef-72.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81289,7 +81289,7 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
                       <br/>
                       <code>  /CallsBetweenPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-79.19)</code>
+                      <code>  (typedef-72.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81359,8 +81359,8 @@ <h3>9.99. The complex type <code>group[siri:PartOfJourneyPatternScope]/CallsBetw
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.14">
-          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-79.14)</code>
+        <div class="sect2" id="local-type.typedef-72.14">
+          <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complexType (typedef-72.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81380,7 +81380,7 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-79.14)</code>
+                      <code>  (typedef-72.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81454,8 +81454,8 @@ <h3>9.100. The complex type <code>element[siri:ControlActionPermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.2">
-          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-79.2)</code>
+        <div class="sect2" id="local-type.typedef-72.2">
+          <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlActions#complexType (typedef-72.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81475,7 +81475,7 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
                       <br/>
                       <code>  /controlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.2)</code>
+                      <code>  (typedef-72.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81517,8 +81517,8 @@ <h3>9.101. The complex type <code>group[siri:ControlActionPayloadGroup]/controlA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.3">
-          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-79.3)</code>
+        <div class="sect2" id="local-type.typedef-72.3">
+          <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions#complexType (typedef-72.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81538,7 +81538,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.3)</code>
+                      <code>  (typedef-72.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81568,7 +81568,7 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.4" title="local-type: typedef-72.4">local-type: typedef-72.4</a>
                       </em>
                     </p>
                   </td>
@@ -81580,8 +81580,8 @@ <h3>9.102. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.4">
-          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-79.4)</code>
+        <div class="sect2" id="local-type.typedef-72.4">
+          <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions#complexType (typedef-72.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81601,7 +81601,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.4)</code>
+                      <code>  (typedef-72.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81771,7 +81771,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.5" title="local-type: typedef-72.5">local-type: typedef-72.5</a>
                       </em>
                     </p>
                   </td>
@@ -81795,7 +81795,7 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.6" title="local-type: typedef-72.6">local-type: typedef-72.6</a>
                       </em>
                     </p>
                   </td>
@@ -81807,8 +81807,8 @@ <h3>9.103. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.5">
-          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-79.5)</code>
+        <div class="sect2" id="local-type.typedef-72.5">
+          <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/AddedControlActions#complexType (typedef-72.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81828,7 +81828,7 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/AddedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.5)</code>
+                      <code>  (typedef-72.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81870,8 +81870,8 @@ <h3>9.104. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.6">
-          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-79.6)</code>
+        <div class="sect2" id="local-type.typedef-72.6">
+          <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOfControlActions/GroupOfControlActions/RemovedControlActions#complexType (typedef-72.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81891,7 +81891,7 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
                       <br/>
                       <code>  /groupsOfControlActions/GroupOfControlActions/RemovedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.6)</code>
+                      <code>  (typedef-72.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81933,8 +81933,8 @@ <h3>9.105. The complex type <code>group[siri:ControlActionPayloadGroup]/groupsOf
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.7">
-          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-79.7)</code>
+        <div class="sect2" id="local-type.typedef-72.7">
+          <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions#complexType (typedef-72.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -81954,7 +81954,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions #complexType</code>
                       <br/>
-                      <code>  (typedef-79.7)</code>
+                      <code>  (typedef-72.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -81984,7 +81984,7 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-72.8" title="local-type: typedef-72.8">local-type: typedef-72.8</a>
                       </em>
                     </p>
                   </td>
@@ -81996,8 +81996,8 @@ <h3>9.106. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.8">
-          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-79.8)</code>
+        <div class="sect2" id="local-type.typedef-72.8">
+          <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedControlActions/RevokedControlAction#complexType (typedef-72.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82017,7 +82017,7 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
                       <br/>
                       <code>  /revokedControlActions/RevokedControlAction #complexType</code>
                       <br/>
-                      <code>  (typedef-79.8)</code>
+                      <code>  (typedef-72.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82150,8 +82150,8 @@ <h3>9.107. The complex type <code>group[siri:ControlActionPayloadGroup]/revokedC
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.9">
-          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-79.9)</code>
+        <div class="sect2" id="local-type.typedef-72.9">
+          <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMessages#complexType (typedef-72.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82171,7 +82171,7 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
                       <br/>
                       <code>  /driverMessages #complexType</code>
                       <br/>
-                      <code>  (typedef-79.9)</code>
+                      <code>  (typedef-72.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82213,8 +82213,8 @@ <h3>9.108. The complex type <code>group[siri:ControlActionPayloadGroup]/driverMe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.10">
-          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-79.10)</code>
+        <div class="sect2" id="local-type.typedef-72.10">
+          <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleDetectings#complexType (typedef-72.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82234,7 +82234,7 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
                       <br/>
                       <code>  /vehicleDetectings #complexType</code>
                       <br/>
-                      <code>  (typedef-79.10)</code>
+                      <code>  (typedef-72.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82276,8 +82276,8 @@ <h3>9.109. The complex type <code>group[siri:ControlActionPayloadGroup]/vehicleD
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82297,7 +82297,7 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82339,8 +82339,8 @@ <h3>9.110. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.1">
-          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-79.1)</code>
+        <div class="sect2" id="local-type.typedef-72.1">
+          <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#complexType (typedef-72.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82360,7 +82360,7 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-79.1)</code>
+                      <code>  (typedef-72.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82402,8 +82402,8 @@ <h3>9.111. The complex type <code>group[siri:ControlActionTopicGroup]/Lines#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.11">
-          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.11)</code>
+        <div class="sect2" id="local-type.typedef-72.11">
+          <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-72.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82423,7 +82423,7 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-79.11)</code>
+                      <code>  (typedef-72.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82555,8 +82555,8 @@ <h3>9.112. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.12">
-          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.12)</code>
+        <div class="sect2" id="local-type.typedef-72.12">
+          <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-72.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82576,7 +82576,7 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-79.12)</code>
+                      <code>  (typedef-72.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82794,8 +82794,8 @@ <h3>9.113. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.13">
-          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.13)</code>
+        <div class="sect2" id="local-type.typedef-72.13">
+          <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-72.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82815,7 +82815,7 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-79.13)</code>
+                      <code>  (typedef-72.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82852,8 +82852,8 @@ <h3>9.114. The complex type <code>complexType[siri:ControlActionServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82873,7 +82873,7 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -82941,8 +82941,8 @@ <h3>9.115. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -82962,7 +82962,7 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83047,8 +83047,8 @@ <h3>9.116. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83068,7 +83068,7 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83153,8 +83153,8 @@ <h3>9.117. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.15">
-          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-79.15)</code>
+        <div class="sect2" id="local-type.typedef-72.15">
+          <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/SituationDescription#complexType (typedef-72.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83174,7 +83174,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                       <br/>
                       <code>  /SituationDescription #complexType</code>
                       <br/>
-                      <code>  (typedef-79.15)</code>
+                      <code>  (typedef-72.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83325,7 +83325,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -83346,7 +83346,7 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -83358,8 +83358,8 @@ <h3>9.118. The complex type <code>complexType[siri:ControlActionStructure]/Situa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83379,7 +83379,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83409,7 +83409,7 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -83421,8 +83421,8 @@ <h3>9.119. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83442,7 +83442,7 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83557,8 +83557,8 @@ <h3>9.120. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83578,7 +83578,7 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83620,8 +83620,8 @@ <h3>9.121. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.16">
-          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-79.16)</code>
+        <div class="sect2" id="local-type.typedef-72.16">
+          <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/MessageContents#complexType (typedef-72.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83641,7 +83641,7 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
                       <br/>
                       <code>  /MessageContents #complexType</code>
                       <br/>
-                      <code>  (typedef-79.16)</code>
+                      <code>  (typedef-72.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -83683,8 +83683,8 @@ <h3>9.122. The complex type <code>complexType[siri:DriverMessageStructure]/Messa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-79.17">
-          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-79.17)</code>
+        <div class="sect2" id="local-type.typedef-72.17">
+          <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/DriverScope#complexType (typedef-72.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -83704,7 +83704,7 @@ <h3>9.123. The complex type <code>complexType[siri:DriverMessageStructure]/Drive
                       <br/>
                       <code>  /DriverScope #complexType</code>
                       <br/>
-                      <code>  (typedef-79.17)</code>
+                      <code>  (typedef-72.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -86197,7 +86197,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -86259,7 +86259,7 @@ <h3>10.29. The group <code>siri:SiriDiscoveryIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -87027,7 +87027,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
                       </em>
                     </p>
                   </td>
@@ -87089,7 +87089,7 @@ <h3>10.31. The group <code>siri:SiriReferenceDiscoveryRequestGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-86.2" title="local-type: typedef-86.2">local-type: typedef-86.2</a>
                       </em>
                     </p>
                   </td>
@@ -92109,8 +92109,8 @@ <h3>10.50. The complex type <code>siri:VehicleFeaturesRequestStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92130,7 +92130,7 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92348,8 +92348,8 @@ <h3>10.51. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92369,7 +92369,7 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -92759,8 +92759,8 @@ <h3>10.52. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -92780,7 +92780,7 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93170,8 +93170,8 @@ <h3>10.53. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93191,7 +93191,7 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93409,8 +93409,8 @@ <h3>10.54. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.1">
-          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-73.1)</code>
+        <div class="sect2" id="local-type.typedef-86.1">
+          <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (typedef-86.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93430,7 +93430,7 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.1)</code>
+                      <code>  (typedef-86.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -93820,8 +93820,8 @@ <h3>10.55. The complex type <code>element[siri:StopPointsRequest]#complexType (t
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-73.2">
-          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-73.2)</code>
+        <div class="sect2" id="local-type.typedef-86.2">
+          <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexType (typedef-86.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -93841,7 +93841,7 @@ <h3>10.56. The complex type <code>element[siri:ServiceFeaturesRequest]#complexTy
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-73.2)</code>
+                      <code>  (typedef-86.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -99633,7 +99633,7 @@ <h3>12.17. The complex type <code>siri:FacilityMonitoringCapabilitiesResponseStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.5" title="local-type: typedef-86.5">local-type: typedef-86.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.5" title="local-type: typedef-73.5">local-type: typedef-73.5</a>
                       </em>
                     </p>
                   </td>
@@ -100830,7 +100830,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.1" title="local-type: typedef-86.1">local-type: typedef-86.1</a>
+                      <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>
@@ -100854,7 +100854,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </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>+<a shape="rect" href="#local-type.typedef-73.2" title="local-type: typedef-73.2">local-type: typedef-73.2</a>
                       </em>
                     </p>
                   </td>
@@ -100902,7 +100902,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.3" title="local-type: typedef-86.3">local-type: typedef-86.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.3" title="local-type: typedef-73.3">local-type: typedef-73.3</a>
                       </em>
                     </p>
                   </td>
@@ -100926,7 +100926,7 @@ <h3>12.21. The complex type <code>siri:FacilityMonitoringServiceCapabilitiesStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-86.4" title="local-type: typedef-86.4">local-type: typedef-86.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-73.4" title="local-type: typedef-73.4">local-type: typedef-73.4</a>
                       </em>
                     </p>
                   </td>
@@ -101085,7 +101085,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -101119,7 +101119,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -101148,7 +101148,7 @@ <h3>12.22. The complex type <code>siri:FacilityMonitoringServicePermissionStruct
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -101404,8 +101404,8 @@ <h3>12.23. The complex type <code>siri:FacilityMonitoringSubscriptionStructure</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.5">
-          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-86.5)</code>
+        <div class="sect2" id="local-type.typedef-73.5">
+          <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101425,7 +101425,7 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.5)</code>
+                      <code>  (typedef-73.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101499,8 +101499,8 @@ <h3>12.24. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.5">
-          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-86.5)</code>
+        <div class="sect2" id="local-type.typedef-73.5">
+          <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#complexType (typedef-73.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101520,7 +101520,7 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-86.5)</code>
+                      <code>  (typedef-73.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101594,8 +101594,8 @@ <h3>12.25. The complex type <code>element[siri:FacilityMonitoringPermissions]#co
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.1">
-          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-86.1)</code>
+        <div class="sect2" id="local-type.typedef-73.1">
+          <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-73.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101615,7 +101615,7 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-86.1)</code>
+                      <code>  (typedef-73.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -101880,8 +101880,8 @@ <h3>12.26. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.2">
-          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-86.2)</code>
+        <div class="sect2" id="local-type.typedef-73.2">
+          <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-73.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -101901,7 +101901,7 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-86.2)</code>
+                      <code>  (typedef-73.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102073,8 +102073,8 @@ <h3>12.27. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.3">
-          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-86.3)</code>
+        <div class="sect2" id="local-type.typedef-73.3">
+          <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-73.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102094,7 +102094,7 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-86.3)</code>
+                      <code>  (typedef-73.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102195,8 +102195,8 @@ <h3>12.28. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-86.4">
-          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-86.4)</code>
+        <div class="sect2" id="local-type.typedef-73.4">
+          <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-73.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102216,7 +102216,7 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-86.4)</code>
+                      <code>  (typedef-73.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102276,8 +102276,8 @@ <h3>12.29. The complex type <code>complexType[siri:FacilityMonitoringServiceCapa
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102297,7 +102297,7 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102365,8 +102365,8 @@ <h3>12.30. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102386,7 +102386,7 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -102471,8 +102471,8 @@ <h3>12.31. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -102492,7 +102492,7 @@ <h3>12.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -103671,7 +103671,7 @@ <h3>13.17. The complex type <code>siri:GeneralMessageCapabilitiesResponseStructu
                   </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>+<a shape="rect" href="#local-type.typedef-84.2" title="local-type: typedef-84.2">local-type: typedef-84.2</a>
                       </em>
                     </p>
                   </td>
@@ -104614,7 +104614,7 @@ <h3>13.22. The complex type <code>siri:GeneralMessageServiceCapabilitiesStructur
                   </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>+<a shape="rect" href="#local-type.typedef-84.1" title="local-type: typedef-84.1">local-type: typedef-84.1</a>
                       </em>
                     </p>
                   </td>
@@ -104796,7 +104796,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -104829,7 +104829,7 @@ <h3>13.23. The complex type <code>siri:GeneralMessageServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-81.3" title="local-type: typedef-81.3">local-type: typedef-81.3</a>
+                      <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>
@@ -105655,8 +105655,8 @@ <h3>13.28. The complex type <code>siri:InfoMessageStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.2">
-          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-81.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105676,7 +105676,7 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105750,8 +105750,8 @@ <h3>13.29. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.2">
-          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-81.2)</code>
+        <div class="sect2" id="local-type.typedef-84.2">
+          <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#complexType (typedef-84.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105771,7 +105771,7 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-81.2)</code>
+                      <code>  (typedef-84.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105845,8 +105845,8 @@ <h3>13.30. The complex type <code>element[siri:GeneralMessagePermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.1">
-          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-81.1)</code>
+        <div class="sect2" id="local-type.typedef-84.1">
+          <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-84.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105866,7 +105866,7 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-81.1)</code>
+                      <code>  (typedef-84.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -105932,8 +105932,8 @@ <h3>13.31. The complex type <code>complexType[siri:GeneralMessageServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -105953,7 +105953,7 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -106021,8 +106021,8 @@ <h3>13.32. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-81.3">
-          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-81.3)</code>
+        <div class="sect2" id="local-type.typedef-84.3">
+          <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissionStructure]/InfoChannelPermissions#complexType (typedef-84.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -106042,7 +106042,7 @@ <h3>13.33. The complex type <code>complexType[siri:GeneralMessageServicePermissi
                       <br/>
                       <code>  /InfoChannelPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-81.3)</code>
+                      <code>  (typedef-84.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -110248,7 +110248,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.6" title="local-type: typedef-8.6">local-type: typedef-8.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -110269,7 +110269,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.7" title="local-type: typedef-8.7">local-type: typedef-8.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -110293,7 +110293,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -110314,7 +110314,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -110335,7 +110335,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -110363,7 +110363,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.1" title="local-type: typedef-3.1">local-type: typedef-3.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.1" title="local-type: typedef-21.1">local-type: typedef-21.1</a>
                       </em>
                     </p>
                   </td>
@@ -111078,7 +111078,7 @@ <h3>14.32. The complex type <code>siri:RemovedDatedVehicleJourneyStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-21.2" title="local-type: typedef-21.2">local-type: typedef-21.2</a>
                       </em>
                     </p>
                   </td>
@@ -113113,8 +113113,8 @@ <h3>14.36. The complex type <code>siri:ToServiceJourneyInterchangeStructure</cod
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.6">
-          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113134,7 +113134,7 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113176,8 +113176,8 @@ <h3>14.37. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.7">
-          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113197,7 +113197,7 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113239,8 +113239,8 @@ <h3>14.38. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113260,7 +113260,7 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113347,8 +113347,8 @@ <h3>14.39. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113368,7 +113368,7 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113455,8 +113455,8 @@ <h3>14.40. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113476,7 +113476,7 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113563,8 +113563,8 @@ <h3>14.41. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.1">
-          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-3.1)</code>
+        <div class="sect2" id="local-type.typedef-21.1">
+          <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]/DatedCalls#complexType (typedef-21.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113584,7 +113584,7 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
                       <br/>
                       <code>  /DatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-3.1)</code>
+                      <code>  (typedef-21.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -113627,8 +113627,8 @@ <h3>14.42. The complex type <code>complexType[siri:DatedVehicleJourneyStructure]
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-3.2">
-          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-3.2)</code>
+        <div class="sect2" id="local-type.typedef-21.2">
+          <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-21.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -113648,7 +113648,7 @@ <h3>14.43. The complex type <code>complexType[siri:RemovedDatedVehicleJourneyStr
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-3.2)</code>
+                      <code>  (typedef-21.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -119107,7 +119107,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -119128,7 +119128,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -119152,7 +119152,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -119173,7 +119173,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -119194,7 +119194,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -119218,7 +119218,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.1" title="local-type: typedef-16.1">local-type: typedef-16.1</a>
+                      <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>
@@ -119242,7 +119242,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-16.2" title="local-type: typedef-16.2">local-type: typedef-16.2</a>
+                      <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>
@@ -120624,8 +120624,8 @@ <h3>15.15. The complex type <code>siri:WillWaitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.4">
-          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120645,7 +120645,7 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120687,8 +120687,8 @@ <h3>15.16. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.5">
-          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120708,7 +120708,7 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120750,8 +120750,8 @@ <h3>15.17. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120771,7 +120771,7 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120858,8 +120858,8 @@ <h3>15.18. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120879,7 +120879,7 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -120966,8 +120966,8 @@ <h3>15.19. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -120987,7 +120987,7 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121074,8 +121074,8 @@ <h3>15.20. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.1">
-          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-16.1)</code>
+        <div class="sect2" id="local-type.typedef-36.1">
+          <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/RecordedCalls#complexType (typedef-36.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121095,7 +121095,7 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /RecordedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-16.1)</code>
+                      <code>  (typedef-36.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -121138,8 +121138,8 @@ <h3>15.21. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-16.2">
-          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-16.2)</code>
+        <div class="sect2" id="local-type.typedef-36.2">
+          <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStructure]/EstimatedCalls#complexType (typedef-36.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -121159,7 +121159,7 @@ <h3>15.22. The complex type <code>complexType[siri:EstimatedVehicleJourneyStruct
                       <br/>
                       <code>  /EstimatedCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-16.2)</code>
+                      <code>  (typedef-36.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -126321,7 +126321,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.2" title="local-type: typedef-26.2">local-type: typedef-26.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -126342,7 +126342,7 @@ <h3>17.15. The group <code>siri:FacilityAccessibilityGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.3" title="local-type: typedef-26.3">local-type: typedef-26.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -127039,7 +127039,7 @@ <h3>17.19. The complex type <code>siri:EquipmentAvailabilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.6" title="local-type: typedef-26.6">local-type: typedef-26.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
                       </em>
                     </p>
                   </td>
@@ -127323,7 +127323,7 @@ <h3>17.21. The complex type <code>siri:FacilityConditionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.5" title="local-type: typedef-26.5">local-type: typedef-26.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
                       </em>
                     </p>
                   </td>
@@ -128258,7 +128258,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.1" title="local-type: typedef-26.1">local-type: typedef-26.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
                       </em>
                     </p>
                   </td>
@@ -128378,7 +128378,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.2" title="local-type: typedef-26.2">local-type: typedef-26.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
                       </em>
                     </p>
                   </td>
@@ -128399,7 +128399,7 @@ <h3>17.25. The complex type <code>siri:FacilityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.3" title="local-type: typedef-26.3">local-type: typedef-26.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
                       </em>
                     </p>
                   </td>
@@ -128810,7 +128810,7 @@ <h3>17.27. The complex type <code>siri:MonitoredCountingStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.4" title="local-type: typedef-26.4">local-type: typedef-26.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129317,8 +129317,8 @@ <h3>17.31. The complex type <code>siri:TypeOfVehicleFuelStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.2">
-          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-26.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129338,7 +129338,7 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-26.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129494,8 +129494,8 @@ <h3>17.32. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.3">
-          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-26.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129515,7 +129515,7 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-26.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129557,8 +129557,8 @@ <h3>17.33. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.6">
-          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-26.6)</code>
+        <div class="sect2" id="local-type.typedef-22.6">
+          <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructure]/EquipmentFeatures#complexType (typedef-22.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129578,7 +129578,7 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
                       <br/>
                       <code>  /EquipmentFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-26.6)</code>
+                      <code>  (typedef-22.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129620,8 +129620,8 @@ <h3>17.34. The complex type <code>complexType[siri:EquipmentAvailabilityStructur
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.5">
-          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-26.5)</code>
+        <div class="sect2" id="local-type.typedef-22.5">
+          <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/MonitoredCounting#complexType (typedef-22.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129641,7 +129641,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                       <br/>
                       <code>  /MonitoredCounting #complexType</code>
                       <br/>
-                      <code>  (typedef-26.5)</code>
+                      <code>  (typedef-22.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129897,7 +129897,7 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-26.4" title="local-type: typedef-26.4">local-type: typedef-26.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
                       </em>
                     </p>
                   </td>
@@ -129934,8 +129934,8 @@ <h3>17.35. The complex type <code>complexType[siri:FacilityConditionStructure]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.4">
-          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-26.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -129955,7 +129955,7 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-26.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -129998,8 +129998,8 @@ <h3>17.36. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.1">
-          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-26.1)</code>
+        <div class="sect2" id="local-type.typedef-22.1">
+          <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#complexType (typedef-22.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130019,7 +130019,7 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-26.1)</code>
+                      <code>  (typedef-22.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130061,8 +130061,8 @@ <h3>17.37. The complex type <code>complexType[siri:FacilityStructure]/Features#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.2">
-          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-26.2)</code>
+        <div class="sect2" id="local-type.typedef-22.2">
+          <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitations#complexType (typedef-22.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130082,7 +130082,7 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
                       <br/>
                       <code>  /Limitations #complexType</code>
                       <br/>
-                      <code>  (typedef-26.2)</code>
+                      <code>  (typedef-22.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130238,8 +130238,8 @@ <h3>17.38. The complex type <code>group[siri:FacilityAccessibilityGroup]/Limitat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.3">
-          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-26.3)</code>
+        <div class="sect2" id="local-type.typedef-22.3">
+          <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabilities#complexType (typedef-22.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130259,7 +130259,7 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-26.3)</code>
+                      <code>  (typedef-22.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -130301,8 +130301,8 @@ <h3>17.39. The complex type <code>group[siri:FacilityAccessibilityGroup]/Suitabi
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-26.4">
-          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-26.4)</code>
+        <div class="sect2" id="local-type.typedef-22.4">
+          <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/CountedItemsIdList#complexType (typedef-22.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -130322,7 +130322,7 @@ <h3>17.40. The complex type <code>complexType[siri:MonitoredCountingStructure]/C
                       <br/>
                       <code>  /CountedItemsIdList #complexType</code>
                       <br/>
-                      <code>  (typedef-26.4)</code>
+                      <code>  (typedef-22.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -131790,12 +131790,12 @@ <h3>20.1. Simple type definitions</h3>
               <tbody>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-36.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-36.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -135452,7 +135452,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -135473,7 +135473,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -135494,7 +135494,7 @@ <h3>20.65. The group <code>siri:JourneyFormationGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -135712,7 +135712,7 @@ <h3>20.67. The group <code>siri:JourneyRelationInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -139290,7 +139290,7 @@ <h3>20.83. The group <code>siri:TrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.5" title="local-type: typedef-24.5">local-type: typedef-24.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -139671,7 +139671,7 @@ <h3>20.84. The group <code>siri:TrainInCompoundTrainGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.7" title="local-type: typedef-24.7">local-type: typedef-24.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -140824,7 +140824,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141002,7 +141002,7 @@ <h3>20.90. The group <code>siri:VehicleTypeGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141139,7 +141139,7 @@ <h3>20.91. The group <code>siri:VehicleTypePropertiesGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141789,7 +141789,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -141967,7 +141967,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -141991,7 +141991,7 @@ <h3>20.94. The complex type <code>siri:CompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.6" title="local-type: typedef-24.6">local-type: typedef-24.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.6" title="local-type: typedef-18.6">local-type: typedef-18.6</a>
                       </em>
                     </p>
                   </td>
@@ -143152,7 +143152,7 @@ <h3>20.102. The complex type <code>siri:JourneyRelationStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -146171,7 +146171,7 @@ <h3>20.113. The complex type <code>siri:RelatedJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.1" title="local-type: typedef-24.1">local-type: typedef-24.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.1" title="local-type: typedef-18.1">local-type: typedef-18.1</a>
                       </em>
                     </p>
                   </td>
@@ -147562,7 +147562,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -147740,7 +147740,7 @@ <h3>20.119. The complex type <code>siri:TrainElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148173,7 +148173,7 @@ <h3>20.120. The complex type <code>siri:TrainInCompoundTrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.7" title="local-type: typedef-24.7">local-type: typedef-24.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.7" title="local-type: typedef-18.7">local-type: typedef-18.7</a>
                       </em>
                     </p>
                   </td>
@@ -148421,7 +148421,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.9" title="local-type: typedef-24.9">local-type: typedef-24.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.9" title="local-type: typedef-18.9">local-type: typedef-18.9</a>
                       </em>
                     </p>
                   </td>
@@ -148599,7 +148599,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.8" title="local-type: typedef-24.8">local-type: typedef-24.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.8" title="local-type: typedef-18.8">local-type: typedef-18.8</a>
                       </em>
                     </p>
                   </td>
@@ -148665,7 +148665,7 @@ <h3>20.121. The complex type <code>siri:TrainStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.5" title="local-type: typedef-24.5">local-type: typedef-24.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.5" title="local-type: typedef-18.5">local-type: typedef-18.5</a>
                       </em>
                     </p>
                   </td>
@@ -149519,8 +149519,8 @@ <h3>20.125. The complex type <code>siri:ViaNameStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149540,7 +149540,7 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149627,8 +149627,8 @@ <h3>20.126. The complex type <code>group[siri:JourneyFormationGroup]/TrainElemen
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149648,7 +149648,7 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149735,8 +149735,8 @@ <h3>20.127. The complex type <code>group[siri:JourneyFormationGroup]/Trains#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149756,7 +149756,7 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149843,8 +149843,8 @@ <h3>20.128. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.1">
-          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149864,7 +149864,7 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-24.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -149906,8 +149906,8 @@ <h3>20.129. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.5">
-          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-24.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -149927,7 +149927,7 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-24.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150014,8 +150014,8 @@ <h3>20.130. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.7">
-          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-24.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150035,7 +150035,7 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-24.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150077,8 +150077,8 @@ <h3>20.131. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.9">
-          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150098,7 +150098,7 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150140,8 +150140,8 @@ <h3>20.132. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.8">
-          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150161,7 +150161,7 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150281,8 +150281,8 @@ <h3>20.133. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.9">
-          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150302,7 +150302,7 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150344,8 +150344,8 @@ <h3>20.134. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.9">
-          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150365,7 +150365,7 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150407,8 +150407,8 @@ <h3>20.135. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.8">
-          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150428,7 +150428,7 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150548,8 +150548,8 @@ <h3>20.136. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.6">
-          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-24.6)</code>
+        <div class="sect2" id="local-type.typedef-18.6">
+          <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/TrainsInCompoundTrain#complexType (typedef-18.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150569,7 +150569,7 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
                       <br/>
                       <code>  /TrainsInCompoundTrain #complexType</code>
                       <br/>
-                      <code>  (typedef-24.6)</code>
+                      <code>  (typedef-18.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150656,8 +150656,8 @@ <h3>20.137. The complex type <code>complexType[siri:CompoundTrainStructure]/Trai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.1">
-          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150677,7 +150677,7 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-24.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150719,8 +150719,8 @@ <h3>20.138. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.1">
-          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-24.1)</code>
+        <div class="sect2" id="local-type.typedef-18.1">
+          <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyParts#complexType (typedef-18.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150740,7 +150740,7 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-24.1)</code>
+                      <code>  (typedef-18.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150782,8 +150782,8 @@ <h3>20.139. The complex type <code>group[siri:JourneyRelationInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.9">
-          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150803,7 +150803,7 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150845,8 +150845,8 @@ <h3>20.140. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.8">
-          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -150866,7 +150866,7 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -150986,8 +150986,8 @@ <h3>20.141. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.7">
-          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-24.7)</code>
+        <div class="sect2" id="local-type.typedef-18.7">
+          <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passages#complexType (typedef-18.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151007,7 +151007,7 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
                       <br/>
                       <code>  /Passages #complexType</code>
                       <br/>
-                      <code>  (typedef-24.7)</code>
+                      <code>  (typedef-18.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151049,8 +151049,8 @@ <h3>20.142. The complex type <code>group[siri:TrainInCompoundTrainGroup]/Passage
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.9">
-          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-24.9)</code>
+        <div class="sect2" id="local-type.typedef-18.9">
+          <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/MaximumPassengerCapacities#complexType (typedef-18.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151070,7 +151070,7 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
                       <br/>
                       <code>  /MaximumPassengerCapacities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.9)</code>
+                      <code>  (typedef-18.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151112,8 +151112,8 @@ <h3>20.143. The complex type <code>group[siri:VehicleTypePropertiesGroup]/Maximu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.8">
-          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-24.8)</code>
+        <div class="sect2" id="local-type.typedef-18.8">
+          <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#complexType (typedef-18.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151133,7 +151133,7 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-24.8)</code>
+                      <code>  (typedef-18.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -151253,8 +151253,8 @@ <h3>20.144. The complex type <code>group[siri:VehicleTypeGroup]/Facilities#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.5">
-          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-24.5)</code>
+        <div class="sect2" id="local-type.typedef-18.5">
+          <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#complexType (typedef-18.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -151274,7 +151274,7 @@ <h3>20.145. The complex type <code>group[siri:TrainGroup]/TrainComponents#comple
                       <br/>
                       <code>  /TrainComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-24.5)</code>
+                      <code>  (typedef-18.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -156431,7 +156431,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -156465,7 +156465,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -156494,7 +156494,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -156523,7 +156523,7 @@ <h3>22.25. The complex type <code>siri:ConnectionServicePermissionStructure</cod
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.3" title="local-type: typedef-2.3">local-type: typedef-2.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.3" title="local-type: typedef-27.3">local-type: typedef-27.3</a>
                       </em>
                     </p>
                   </td>
@@ -157075,8 +157075,8 @@ <h3>22.30. The complex type <code>siri:StopMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157096,7 +157096,7 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157181,8 +157181,8 @@ <h3>22.31. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157202,7 +157202,7 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157287,8 +157287,8 @@ <h3>22.32. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157308,7 +157308,7 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157393,8 +157393,8 @@ <h3>22.33. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157414,7 +157414,7 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157482,8 +157482,8 @@ <h3>22.34. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157503,7 +157503,7 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157588,8 +157588,8 @@ <h3>22.35. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157609,7 +157609,7 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -157694,8 +157694,8 @@ <h3>22.36. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.3">
-          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-2.3)</code>
+        <div class="sect2" id="local-type.typedef-27.3">
+          <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#complexType (typedef-27.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -157715,7 +157715,7 @@ <h3>22.37. The complex type <code>element[siri:ConnectionLinkPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.3)</code>
+                      <code>  (typedef-27.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -163928,7 +163928,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.6" title="local-type: typedef-8.6">local-type: typedef-8.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.6" title="local-type: typedef-28.6">local-type: typedef-28.6</a>
                       </em>
                     </p>
                   </td>
@@ -163949,7 +163949,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.7" title="local-type: typedef-8.7">local-type: typedef-8.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.7" title="local-type: typedef-28.7">local-type: typedef-28.7</a>
                       </em>
                     </p>
                   </td>
@@ -163973,7 +163973,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -163994,7 +163994,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -164015,7 +164015,7 @@ <h3>24.3. The group <code>siri:DatedTrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -166738,7 +166738,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.1" title="local-type: typedef-8.1">local-type: typedef-8.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.1" title="local-type: typedef-28.1">local-type: typedef-28.1</a>
                       </em>
                     </p>
                   </td>
@@ -166759,7 +166759,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.2" title="local-type: typedef-8.2">local-type: typedef-8.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.2" title="local-type: typedef-28.2">local-type: typedef-28.2</a>
                       </em>
                     </p>
                   </td>
@@ -166780,7 +166780,7 @@ <h3>24.12. The group <code>siri:ServicePointsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.3" title="local-type: typedef-8.3">local-type: typedef-8.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.3" title="local-type: typedef-28.3">local-type: typedef-28.3</a>
                       </em>
                     </p>
                   </td>
@@ -167885,7 +167885,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -167906,7 +167906,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -167930,7 +167930,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -167951,7 +167951,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -167972,7 +167972,7 @@ <h3>24.15. The group <code>siri:TrainOperationalInfoGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -171315,7 +171315,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -171336,7 +171336,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -171360,7 +171360,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -171381,7 +171381,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -171402,7 +171402,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -172064,8 +172064,8 @@ <h3>24.22. The complex type <code>siri:TrainBlockPartStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.6">
-          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.6)</code>
+        <div class="sect2" id="local-type.typedef-28.6">
+          <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172085,7 +172085,7 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.6)</code>
+                      <code>  (typedef-28.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172127,8 +172127,8 @@ <h3>24.23. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Tra
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.7">
-          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.7)</code>
+        <div class="sect2" id="local-type.typedef-28.7">
+          <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172148,7 +172148,7 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.7)</code>
+                      <code>  (typedef-28.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172190,8 +172190,8 @@ <h3>24.24. The complex type <code>group[siri:DatedTrainOperationalInfoGroup]/Jou
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172211,7 +172211,7 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172298,8 +172298,8 @@ <h3>24.25. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172319,7 +172319,7 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172406,8 +172406,8 @@ <h3>24.26. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172427,7 +172427,7 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172514,8 +172514,8 @@ <h3>24.27. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.1">
-          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-8.1)</code>
+        <div class="sect2" id="local-type.typedef-28.1">
+          <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexType (typedef-28.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172535,7 +172535,7 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
                       <br/>
                       <code>  /Origin #complexType</code>
                       <br/>
-                      <code>  (typedef-8.1)</code>
+                      <code>  (typedef-28.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172599,8 +172599,8 @@ <h3>24.28. The complex type <code>group[siri:ServicePointsGroup]/Origin#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.2">
-          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-8.2)</code>
+        <div class="sect2" id="local-type.typedef-28.2">
+          <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType (typedef-28.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172620,7 +172620,7 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
                       <br/>
                       <code>  /Via #complexType</code>
                       <br/>
-                      <code>  (typedef-8.2)</code>
+                      <code>  (typedef-28.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172707,8 +172707,8 @@ <h3>24.29. The complex type <code>group[siri:ServicePointsGroup]/Via#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.3">
-          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-8.3)</code>
+        <div class="sect2" id="local-type.typedef-28.3">
+          <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#complexType (typedef-28.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172728,7 +172728,7 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
                       <br/>
                       <code>  /Destination #complexType</code>
                       <br/>
-                      <code>  (typedef-8.3)</code>
+                      <code>  (typedef-28.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172792,8 +172792,8 @@ <h3>24.30. The complex type <code>group[siri:ServicePointsGroup]/Destination#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.4">
-          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172813,7 +172813,7 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172855,8 +172855,8 @@ <h3>24.31. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.5">
-          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172876,7 +172876,7 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -172918,8 +172918,8 @@ <h3>24.32. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -172939,7 +172939,7 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173026,8 +173026,8 @@ <h3>24.33. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173047,7 +173047,7 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173134,8 +173134,8 @@ <h3>24.34. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173155,7 +173155,7 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173242,8 +173242,8 @@ <h3>24.35. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.4">
-          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173263,7 +173263,7 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173305,8 +173305,8 @@ <h3>24.36. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.5">
-          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173326,7 +173326,7 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173368,8 +173368,8 @@ <h3>24.37. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173389,7 +173389,7 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173476,8 +173476,8 @@ <h3>24.38. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173497,7 +173497,7 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -173584,8 +173584,8 @@ <h3>24.39. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -173605,7 +173605,7 @@ <h3>24.40. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -178315,12 +178315,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-11.3" class="tableblock">
+                    <p id="local-type.typedef-34.3" class="tableblock">
                       <code>group[siri:ClassifierGroup]</code>
                       <br/>
                       <code>  /ScopeType #simpleType</code>
                       <br/>
-                      <code>  (typedef-11.3)</code>
+                      <code>  (typedef-34.3)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178501,12 +178501,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-11.1" class="tableblock">
+                    <p id="local-type.typedef-34.1" class="tableblock">
                       <code>group[siri:StatusGroup]</code>
                       <br/>
                       <code>  /Verification #simpleType</code>
                       <br/>
-                      <code>  (typedef-11.1)</code>
+                      <code>  (typedef-34.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -178567,12 +178567,12 @@ <h3>27.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-36.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-36.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -179200,7 +179200,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -179284,7 +179284,7 @@ <h3>27.16. The group <code>siri:ClassifierGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -180050,7 +180050,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -180071,7 +180071,7 @@ <h3>27.22. The group <code>siri:DescriptionGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -180224,7 +180224,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -180383,7 +180383,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -180931,7 +180931,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -181015,7 +181015,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -181164,7 +181164,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -181185,7 +181185,7 @@ <h3>27.24. The group <code>siri:PtSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -181871,7 +181871,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -182030,7 +182030,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -182578,7 +182578,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -182662,7 +182662,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -182811,7 +182811,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -182832,7 +182832,7 @@ <h3>27.27. The group <code>siri:RoadSituationBodyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -183195,7 +183195,7 @@ <h3>27.30. The group <code>siri:StatusGroup</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -183385,7 +183385,7 @@ <h3>27.31. The group <code>siri:TemporalGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -183885,7 +183885,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.6" title="local-type: typedef-11.6">local-type: typedef-11.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.6" title="local-type: typedef-34.6">local-type: typedef-34.6</a>
                       </em>
                     </p>
                   </td>
@@ -183909,7 +183909,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.7" title="local-type: typedef-11.7">local-type: typedef-11.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.7" title="local-type: typedef-34.7">local-type: typedef-34.7</a>
                       </em>
                     </p>
                   </td>
@@ -183933,7 +183933,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.9" title="local-type: typedef-11.9">local-type: typedef-11.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.9" title="local-type: typedef-34.9">local-type: typedef-34.9</a>
                       </em>
                     </p>
                   </td>
@@ -183957,7 +183957,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.10" title="local-type: typedef-11.10">local-type: typedef-11.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.10" title="local-type: typedef-34.10">local-type: typedef-34.10</a>
                       </em>
                     </p>
                   </td>
@@ -183981,7 +183981,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.11" title="local-type: typedef-11.11">local-type: typedef-11.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.11" title="local-type: typedef-34.11">local-type: typedef-34.11</a>
                       </em>
                     </p>
                   </td>
@@ -184005,7 +184005,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.12" title="local-type: typedef-11.12">local-type: typedef-11.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.12" title="local-type: typedef-34.12">local-type: typedef-34.12</a>
                       </em>
                     </p>
                   </td>
@@ -184029,7 +184029,7 @@ <h3>27.35. The complex type <code>siri:AffectsScopeStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.13" title="local-type: typedef-11.13">local-type: typedef-11.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.13" title="local-type: typedef-34.13">local-type: typedef-34.13</a>
                       </em>
                     </p>
                   </td>
@@ -185577,7 +185577,7 @@ <h3>27.46. The complex type <code>siri:PtConsequenceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.17" title="local-type: typedef-11.17">local-type: typedef-11.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.17" title="local-type: typedef-34.17">local-type: typedef-34.17</a>
                       </em>
                     </p>
                   </td>
@@ -186074,7 +186074,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -186233,7 +186233,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -186781,7 +186781,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -186865,7 +186865,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -187014,7 +187014,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -187035,7 +187035,7 @@ <h3>27.47. The complex type <code>siri:PtSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -187757,7 +187757,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.1" title="local-type: typedef-11.1">local-type: typedef-11.1</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.1" title="local-type: typedef-34.1">local-type: typedef-34.1</a>
                       </em>
                     </p>
                   </td>
@@ -187916,7 +187916,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.2" title="local-type: typedef-11.2">local-type: typedef-11.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.2" title="local-type: typedef-34.2">local-type: typedef-34.2</a>
                       </em>
                     </p>
                   </td>
@@ -188464,7 +188464,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
                       <em>
-                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-11.3" title="local-type: typedef-11.3">local-type: typedef-11.3</a>
+                        <a shape="rect" href="/home/runner/work/SIRI/SIRI/docs/generated/contab/siri.enum-dict.html#local-enum.typedef-34.3" title="local-type: typedef-34.3">local-type: typedef-34.3</a>
                       </em>
                     </p>
                   </td>
@@ -188548,7 +188548,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.4" title="local-type: typedef-11.4">local-type: typedef-11.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.4" title="local-type: typedef-34.4">local-type: typedef-34.4</a>
                       </em>
                     </p>
                   </td>
@@ -188697,7 +188697,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.14" title="local-type: typedef-11.14">local-type: typedef-11.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.14" title="local-type: typedef-34.14">local-type: typedef-34.14</a>
                       </em>
                     </p>
                   </td>
@@ -188718,7 +188718,7 @@ <h3>27.50. The complex type <code>siri:RoadSituationElementStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.16" title="local-type: typedef-11.16">local-type: typedef-11.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.16" title="local-type: typedef-34.16">local-type: typedef-34.16</a>
                       </em>
                     </p>
                   </td>
@@ -189503,8 +189503,8 @@ <h3>27.52. The complex type <code>siri:SituationSourceStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.4">
-          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189524,7 +189524,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-11.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -189554,7 +189554,7 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -189566,8 +189566,8 @@ <h3>27.53. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.5">
-          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -189587,7 +189587,7 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-11.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190016,8 +190016,8 @@ <h3>27.54. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190037,7 +190037,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190067,7 +190067,7 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190079,8 +190079,8 @@ <h3>27.55. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190100,7 +190100,7 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190215,8 +190215,8 @@ <h3>27.56. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190236,7 +190236,7 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190278,8 +190278,8 @@ <h3>27.57. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.2">
-          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190299,7 +190299,7 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-11.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190343,8 +190343,8 @@ <h3>27.58. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.4">
-          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190364,7 +190364,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-11.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190394,7 +190394,7 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -190406,8 +190406,8 @@ <h3>27.59. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.5">
-          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190427,7 +190427,7 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-11.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190856,8 +190856,8 @@ <h3>27.60. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190877,7 +190877,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -190907,7 +190907,7 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -190919,8 +190919,8 @@ <h3>27.61. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -190940,7 +190940,7 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191055,8 +191055,8 @@ <h3>27.62. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191076,7 +191076,7 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191118,8 +191118,8 @@ <h3>27.63. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.2">
-          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191139,7 +191139,7 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-11.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191183,8 +191183,8 @@ <h3>27.64. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.4">
-          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191204,7 +191204,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-11.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191234,7 +191234,7 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -191246,8 +191246,8 @@ <h3>27.65. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.5">
-          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191267,7 +191267,7 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-11.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191696,8 +191696,8 @@ <h3>27.66. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191717,7 +191717,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191747,7 +191747,7 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -191759,8 +191759,8 @@ <h3>27.67. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191780,7 +191780,7 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191895,8 +191895,8 @@ <h3>27.68. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191916,7 +191916,7 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -191958,8 +191958,8 @@ <h3>27.69. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.2">
-          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -191979,7 +191979,7 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-11.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192023,8 +192023,8 @@ <h3>27.70. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.6">
-          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-11.6)</code>
+        <div class="sect2" id="local-type.typedef-34.6">
+          <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operators#complexType (typedef-34.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192044,7 +192044,7 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
                       <br/>
                       <code>  /Operators #complexType</code>
                       <br/>
-                      <code>  (typedef-11.6)</code>
+                      <code>  (typedef-34.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192130,8 +192130,8 @@ <h3>27.71. The complex type <code>complexType[siri:AffectsScopeStructure]/Operat
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.7">
-          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-11.7)</code>
+        <div class="sect2" id="local-type.typedef-34.7">
+          <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks#complexType (typedef-34.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192151,7 +192151,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.7)</code>
+                      <code>  (typedef-34.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192181,7 +192181,7 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.8" title="local-type: typedef-11.8">local-type: typedef-11.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.8" title="local-type: typedef-34.8">local-type: typedef-34.8</a>
                       </em>
                     </p>
                   </td>
@@ -192193,8 +192193,8 @@ <h3>27.72. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.8">
-          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-11.8)</code>
+        <div class="sect2" id="local-type.typedef-34.8">
+          <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networks/AffectedNetwork#complexType (typedef-34.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192214,7 +192214,7 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
                       <br/>
                       <code>  /Networks/AffectedNetwork #complexType</code>
                       <br/>
-                      <code>  (typedef-11.8)</code>
+                      <code>  (typedef-34.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192809,8 +192809,8 @@ <h3>27.73. The complex type <code>complexType[siri:AffectsScopeStructure]/Networ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.9">
-          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-11.9)</code>
+        <div class="sect2" id="local-type.typedef-34.9">
+          <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPoints#complexType (typedef-34.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192830,7 +192830,7 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-11.9)</code>
+                      <code>  (typedef-34.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192872,8 +192872,8 @@ <h3>27.74. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.10">
-          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-11.10)</code>
+        <div class="sect2" id="local-type.typedef-34.10">
+          <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPlaces#complexType (typedef-34.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192893,7 +192893,7 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-11.10)</code>
+                      <code>  (typedef-34.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192935,8 +192935,8 @@ <h3>27.75. The complex type <code>complexType[siri:AffectsScopeStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.11">
-          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-11.11)</code>
+        <div class="sect2" id="local-type.typedef-34.11">
+          <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places#complexType (typedef-34.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -192956,7 +192956,7 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
                       <br/>
                       <code>  /Places #complexType</code>
                       <br/>
-                      <code>  (typedef-11.11)</code>
+                      <code>  (typedef-34.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -192998,8 +192998,8 @@ <h3>27.76. The complex type <code>complexType[siri:AffectsScopeStructure]/Places
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.12">
-          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-11.12)</code>
+        <div class="sect2" id="local-type.typedef-34.12">
+          <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/VehicleJourneys#complexType (typedef-34.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193019,7 +193019,7 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /VehicleJourneys #complexType</code>
                       <br/>
-                      <code>  (typedef-11.12)</code>
+                      <code>  (typedef-34.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193061,8 +193061,8 @@ <h3>27.77. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.13">
-          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-11.13)</code>
+        <div class="sect2" id="local-type.typedef-34.13">
+          <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicles#complexType (typedef-34.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193082,7 +193082,7 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
                       <br/>
                       <code>  /Vehicles #complexType</code>
                       <br/>
-                      <code>  (typedef-11.13)</code>
+                      <code>  (typedef-34.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193124,8 +193124,8 @@ <h3>27.78. The complex type <code>complexType[siri:AffectsScopeStructure]/Vehicl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.17">
-          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-11.17)</code>
+        <div class="sect2" id="local-type.typedef-34.17">
+          <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suitabilities#complexType (typedef-34.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193145,7 +193145,7 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
                       <br/>
                       <code>  /Suitabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-11.17)</code>
+                      <code>  (typedef-34.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193187,8 +193187,8 @@ <h3>27.79. The complex type <code>complexType[siri:PtConsequenceStructure]/Suita
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.2">
-          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193208,7 +193208,7 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-11.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193252,8 +193252,8 @@ <h3>27.80. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.4">
-          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193273,7 +193273,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-11.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193303,7 +193303,7 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -193315,8 +193315,8 @@ <h3>27.81. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.5">
-          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193336,7 +193336,7 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-11.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193765,8 +193765,8 @@ <h3>27.82. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193786,7 +193786,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193816,7 +193816,7 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -193828,8 +193828,8 @@ <h3>27.83. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193849,7 +193849,7 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -193964,8 +193964,8 @@ <h3>27.84. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -193985,7 +193985,7 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194027,8 +194027,8 @@ <h3>27.85. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.2">
-          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-11.2)</code>
+        <div class="sect2" id="local-type.typedef-34.2">
+          <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexType (typedef-34.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194048,7 +194048,7 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
                       <br/>
                       <code>  /Repetitions #complexType</code>
                       <br/>
-                      <code>  (typedef-11.2)</code>
+                      <code>  (typedef-34.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194092,8 +194092,8 @@ <h3>27.86. The complex type <code>group[siri:TemporalGroup]/Repetitions#complexT
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.4">
-          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-11.4)</code>
+        <div class="sect2" id="local-type.typedef-34.4">
+          <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#complexType (typedef-34.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194113,7 +194113,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                       <br/>
                       <code>  /SecondaryReasons #complexType</code>
                       <br/>
-                      <code>  (typedef-11.4)</code>
+                      <code>  (typedef-34.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194143,7 +194143,7 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.5" title="local-type: typedef-11.5">local-type: typedef-11.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.5" title="local-type: typedef-34.5">local-type: typedef-34.5</a>
                       </em>
                     </p>
                   </td>
@@ -194155,8 +194155,8 @@ <h3>27.87. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.5">
-          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-11.5)</code>
+        <div class="sect2" id="local-type.typedef-34.5">
+          <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/Reason#complexType (typedef-34.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194176,7 +194176,7 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
                       <br/>
                       <code>  /SecondaryReasons/Reason #complexType</code>
                       <br/>
-                      <code>  (typedef-11.5)</code>
+                      <code>  (typedef-34.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194605,8 +194605,8 @@ <h3>27.88. The complex type <code>group[siri:ClassifierGroup]/SecondaryReasons/R
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.14">
-          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-11.14)</code>
+        <div class="sect2" id="local-type.typedef-34.14">
+          <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexType (typedef-34.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194626,7 +194626,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                       <br/>
                       <code>  /Images #complexType</code>
                       <br/>
-                      <code>  (typedef-11.14)</code>
+                      <code>  (typedef-34.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194656,7 +194656,7 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-11.15" title="local-type: typedef-11.15">local-type: typedef-11.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-34.15" title="local-type: typedef-34.15">local-type: typedef-34.15</a>
                       </em>
                     </p>
                   </td>
@@ -194668,8 +194668,8 @@ <h3>27.89. The complex type <code>group[siri:DescriptionGroup]/Images#complexTyp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.15">
-          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-11.15)</code>
+        <div class="sect2" id="local-type.typedef-34.15">
+          <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#complexType (typedef-34.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194689,7 +194689,7 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
                       <br/>
                       <code>  /Images/Image #complexType</code>
                       <br/>
-                      <code>  (typedef-11.15)</code>
+                      <code>  (typedef-34.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -194804,8 +194804,8 @@ <h3>27.90. The complex type <code>group[siri:DescriptionGroup]/Images/Image#comp
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-11.16">
-          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-11.16)</code>
+        <div class="sect2" id="local-type.typedef-34.16">
+          <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complexType (typedef-34.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -194825,7 +194825,7 @@ <h3>27.91. The complex type <code>group[siri:DescriptionGroup]/InfoLinks#complex
                       <br/>
                       <code>  /InfoLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-11.16)</code>
+                      <code>  (typedef-34.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -195664,7 +195664,7 @@ <h3>28.15. The group <code>siri:ActionsGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -195904,7 +195904,7 @@ <h3>28.16. The complex type <code>siri:ActionDataStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.2" title="local-type: typedef-15.2">local-type: typedef-15.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.2" title="local-type: typedef-23.2">local-type: typedef-23.2</a>
                       </em>
                     </p>
                   </td>
@@ -196070,7 +196070,7 @@ <h3>28.17. The complex type <code>siri:ActionsStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -196768,7 +196768,7 @@ <h3>28.22. The complex type <code>siri:NotifyByEmailActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197003,7 +197003,7 @@ <h3>28.23. The complex type <code>siri:NotifyByPagerActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197259,7 +197259,7 @@ <h3>28.24. The complex type <code>siri:NotifyBySmsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -197517,7 +197517,7 @@ <h3>28.25. The complex type <code>siri:NotifyUserActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -198253,7 +198253,7 @@ <h3>28.28. The complex type <code>siri:PublishingActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.4" title="local-type: typedef-15.4">local-type: typedef-15.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.4" title="local-type: typedef-23.4">local-type: typedef-23.4</a>
                       </em>
                     </p>
                   </td>
@@ -198464,7 +198464,7 @@ <h3>28.29. The complex type <code>siri:PublishToAlertsActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -199607,7 +199607,7 @@ <h3>28.34. The complex type <code>siri:PushedActionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.1" title="local-type: typedef-15.1">local-type: typedef-15.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.1" title="local-type: typedef-23.1">local-type: typedef-23.1</a>
                       </em>
                     </p>
                   </td>
@@ -200157,7 +200157,7 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-15.3" title="local-type: typedef-15.3">local-type: typedef-15.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-23.3" title="local-type: typedef-23.3">local-type: typedef-23.3</a>
                       </em>
                     </p>
                   </td>
@@ -200501,8 +200501,8 @@ <h3>28.40. The complex type <code>siri:TextualContentStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.3">
-          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200522,7 +200522,7 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-15.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200663,8 +200663,8 @@ <h3>28.41. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.3">
-          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200684,7 +200684,7 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-15.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200825,8 +200825,8 @@ <h3>28.42. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.2">
-          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-15.2)</code>
+        <div class="sect2" id="local-type.typedef-23.2">
+          <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishAtScope#complexType (typedef-23.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200846,7 +200846,7 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-15.2)</code>
+                      <code>  (typedef-23.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -200913,8 +200913,8 @@ <h3>28.43. The complex type <code>complexType[siri:ActionDataStructure]/PublishA
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.3">
-          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -200934,7 +200934,7 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-15.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201075,8 +201075,8 @@ <h3>28.44. The complex type <code>element[siri:ManualAction]#complexType (typede
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201096,7 +201096,7 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201135,8 +201135,8 @@ <h3>28.45. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201156,7 +201156,7 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201195,8 +201195,8 @@ <h3>28.46. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201216,7 +201216,7 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201255,8 +201255,8 @@ <h3>28.47. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201276,7 +201276,7 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201315,8 +201315,8 @@ <h3>28.48. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.4">
-          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-15.4)</code>
+        <div class="sect2" id="local-type.typedef-23.4">
+          <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/PublishAtScope#complexType (typedef-23.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201336,7 +201336,7 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
                       <br/>
                       <code>  /PublishAtScope #complexType</code>
                       <br/>
-                      <code>  (typedef-15.4)</code>
+                      <code>  (typedef-23.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201403,8 +201403,8 @@ <h3>28.49. The complex type <code>complexType[siri:PublishingActionStructure]/Pu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201424,7 +201424,7 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201463,8 +201463,8 @@ <h3>28.50. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.1">
-          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-15.1)</code>
+        <div class="sect2" id="local-type.typedef-23.1">
+          <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/BeforeNotices#complexType (typedef-23.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201484,7 +201484,7 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
                       <br/>
                       <code>  /BeforeNotices #complexType</code>
                       <br/>
-                      <code>  (typedef-15.1)</code>
+                      <code>  (typedef-23.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -201523,8 +201523,8 @@ <h3>28.51. The complex type <code>complexType[siri:PushedActionStructure]/Before
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-15.3">
-          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-15.3)</code>
+        <div class="sect2" id="local-type.typedef-23.3">
+          <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typedef-23.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -201544,7 +201544,7 @@ <h3>28.52. The complex type <code>element[siri:ManualAction]#complexType (typede
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-15.3)</code>
+                      <code>  (typedef-23.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -203436,7 +203436,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -203460,7 +203460,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -204066,7 +204066,7 @@ <h3>29.16. The complex type <code>siri:AffectedCallStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.16" title="local-type: typedef-22.16">local-type: typedef-22.16</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.16" title="local-type: typedef-29.16">local-type: typedef-29.16</a>
                       </em>
                     </p>
                   </td>
@@ -205024,7 +205024,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.4" title="local-type: typedef-22.4">local-type: typedef-22.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.4" title="local-type: typedef-29.4">local-type: typedef-29.4</a>
                       </em>
                     </p>
                   </td>
@@ -205048,7 +205048,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.5" title="local-type: typedef-22.5">local-type: typedef-22.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.5" title="local-type: typedef-29.5">local-type: typedef-29.5</a>
                       </em>
                     </p>
                   </td>
@@ -205072,7 +205072,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.6" title="local-type: typedef-22.6">local-type: typedef-22.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.6" title="local-type: typedef-29.6">local-type: typedef-29.6</a>
                       </em>
                     </p>
                   </td>
@@ -205096,7 +205096,7 @@ <h3>29.20. The complex type <code>siri:AffectedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.7" title="local-type: typedef-22.7">local-type: typedef-22.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.7" title="local-type: typedef-29.7">local-type: typedef-29.7</a>
                       </em>
                     </p>
                   </td>
@@ -205322,7 +205322,7 @@ <h3>29.22. The complex type <code>siri:AffectedModesStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.3" title="local-type: typedef-22.3">local-type: typedef-22.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.3" title="local-type: typedef-29.3">local-type: typedef-29.3</a>
                       </em>
                     </p>
                   </td>
@@ -206598,7 +206598,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.9" title="local-type: typedef-22.9">local-type: typedef-22.9</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.9" title="local-type: typedef-29.9">local-type: typedef-29.9</a>
                       </em>
                     </p>
                   </td>
@@ -206622,7 +206622,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.10" title="local-type: typedef-22.10">local-type: typedef-22.10</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.10" title="local-type: typedef-29.10">local-type: typedef-29.10</a>
                       </em>
                     </p>
                   </td>
@@ -206646,7 +206646,7 @@ <h3>29.27. The complex type <code>siri:AffectedRouteStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.11" title="local-type: typedef-22.11">local-type: typedef-22.11</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.11" title="local-type: typedef-29.11">local-type: typedef-29.11</a>
                       </em>
                     </p>
                   </td>
@@ -206769,7 +206769,7 @@ <h3>29.28. The complex type <code>siri:AffectedSectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.8" title="local-type: typedef-22.8">local-type: typedef-22.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.8" title="local-type: typedef-29.8">local-type: typedef-29.8</a>
                       </em>
                     </p>
                   </td>
@@ -207125,7 +207125,7 @@ <h3>29.29. The complex type <code>siri:AffectedStopPlaceComponentStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.21" title="local-type: typedef-22.21">local-type: typedef-22.21</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.21" title="local-type: typedef-29.21">local-type: typedef-29.21</a>
                       </em>
                     </p>
                   </td>
@@ -207392,7 +207392,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.18" title="local-type: typedef-22.18">local-type: typedef-22.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207416,7 +207416,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.19" title="local-type: typedef-22.19">local-type: typedef-22.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207440,7 +207440,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.20" title="local-type: typedef-22.20">local-type: typedef-22.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -207469,7 +207469,7 @@ <h3>29.31. The complex type <code>siri:AffectedStopPlaceStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.17" title="local-type: typedef-22.17">local-type: typedef-22.17</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.17" title="local-type: typedef-29.17">local-type: typedef-29.17</a>
                       </em>
                     </p>
                   </td>
@@ -207686,7 +207686,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.18" title="local-type: typedef-22.18">local-type: typedef-22.18</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.18" title="local-type: typedef-29.18">local-type: typedef-29.18</a>
                       </em>
                     </p>
                   </td>
@@ -207710,7 +207710,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.19" title="local-type: typedef-22.19">local-type: typedef-22.19</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.19" title="local-type: typedef-29.19">local-type: typedef-29.19</a>
                       </em>
                     </p>
                   </td>
@@ -207734,7 +207734,7 @@ <h3>29.32. The complex type <code>siri:AffectedStopPlaceWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.20" title="local-type: typedef-22.20">local-type: typedef-22.20</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.20" title="local-type: typedef-29.20">local-type: typedef-29.20</a>
                       </em>
                     </p>
                   </td>
@@ -208086,7 +208086,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208115,7 +208115,7 @@ <h3>29.33. The complex type <code>siri:AffectedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.2" title="local-type: typedef-22.2">local-type: typedef-22.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.2" title="local-type: typedef-29.2">local-type: typedef-29.2</a>
                       </em>
                     </p>
                   </td>
@@ -208485,7 +208485,7 @@ <h3>29.34. The complex type <code>siri:AffectedStopPointWithoutLineStructure</co
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.1" title="local-type: typedef-22.1">local-type: typedef-22.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.1" title="local-type: typedef-29.1">local-type: typedef-29.1</a>
                       </em>
                     </p>
                   </td>
@@ -208829,7 +208829,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.12" title="local-type: typedef-22.12">local-type: typedef-22.12</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.12" title="local-type: typedef-29.12">local-type: typedef-29.12</a>
                       </em>
                     </p>
                   </td>
@@ -208853,7 +208853,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.13" title="local-type: typedef-22.13">local-type: typedef-22.13</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.13" title="local-type: typedef-29.13">local-type: typedef-29.13</a>
                       </em>
                     </p>
                   </td>
@@ -209092,7 +209092,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.14" title="local-type: typedef-22.14">local-type: typedef-22.14</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.14" title="local-type: typedef-29.14">local-type: typedef-29.14</a>
                       </em>
                     </p>
                   </td>
@@ -209116,7 +209116,7 @@ <h3>29.35. The complex type <code>siri:AffectedVehicleJourneyStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-22.15" title="local-type: typedef-22.15">local-type: typedef-22.15</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-29.15" title="local-type: typedef-29.15">local-type: typedef-29.15</a>
                       </em>
                     </p>
                   </td>
@@ -210336,8 +210336,8 @@ <h3>29.43. The complex type <code>siri:ZoneRefStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.1">
-          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210357,7 +210357,7 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-22.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210399,8 +210399,8 @@ <h3>29.44. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210420,7 +210420,7 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210462,8 +210462,8 @@ <h3>29.45. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.16">
-          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-22.16)</code>
+        <div class="sect2" id="local-type.typedef-29.16">
+          <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/AffectedInterchanges#complexType (typedef-29.16)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210483,7 +210483,7 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
                       <br/>
                       <code>  /AffectedInterchanges #complexType</code>
                       <br/>
-                      <code>  (typedef-22.16)</code>
+                      <code>  (typedef-29.16)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210521,8 +210521,8 @@ <h3>29.46. The complex type <code>complexType[siri:AffectedCallStructure]/Affect
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.4">
-          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-22.4)</code>
+        <div class="sect2" id="local-type.typedef-29.4">
+          <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes#complexType (typedef-29.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210542,7 +210542,7 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
                       <br/>
                       <code>  /Routes #complexType</code>
                       <br/>
-                      <code>  (typedef-22.4)</code>
+                      <code>  (typedef-29.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210584,8 +210584,8 @@ <h3>29.47. The complex type <code>complexType[siri:AffectedLineStructure]/Routes
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.5">
-          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-22.5)</code>
+        <div class="sect2" id="local-type.typedef-29.5">
+          <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sections#complexType (typedef-29.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210605,7 +210605,7 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-22.5)</code>
+                      <code>  (typedef-29.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210647,8 +210647,8 @@ <h3>29.48. The complex type <code>complexType[siri:AffectedLineStructure]/Sectio
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.6">
-          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-22.6)</code>
+        <div class="sect2" id="local-type.typedef-29.6">
+          <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPoints#complexType (typedef-29.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210668,7 +210668,7 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-22.6)</code>
+                      <code>  (typedef-29.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210710,8 +210710,8 @@ <h3>29.49. The complex type <code>complexType[siri:AffectedLineStructure]/StopPo
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.7">
-          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-22.7)</code>
+        <div class="sect2" id="local-type.typedef-29.7">
+          <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPlaces#complexType (typedef-29.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210731,7 +210731,7 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
                       <br/>
                       <code>  /StopPlaces #complexType</code>
                       <br/>
-                      <code>  (typedef-22.7)</code>
+                      <code>  (typedef-29.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -210773,8 +210773,8 @@ <h3>29.50. The complex type <code>complexType[siri:AffectedLineStructure]/StopPl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.3">
-          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-22.3)</code>
+        <div class="sect2" id="local-type.typedef-29.3">
+          <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#complexType (typedef-29.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -210794,7 +210794,7 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
                       <br/>
                       <code>  /Mode #complexType</code>
                       <br/>
-                      <code>  (typedef-22.3)</code>
+                      <code>  (typedef-29.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211123,8 +211123,8 @@ <h3>29.51. The complex type <code>complexType[siri:AffectedModesStructure]/Mode#
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.9">
-          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-22.9)</code>
+        <div class="sect2" id="local-type.typedef-29.9">
+          <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Sections#complexType (typedef-29.9)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211144,7 +211144,7 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
                       <br/>
                       <code>  /Sections #complexType</code>
                       <br/>
-                      <code>  (typedef-22.9)</code>
+                      <code>  (typedef-29.9)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211186,8 +211186,8 @@ <h3>29.52. The complex type <code>complexType[siri:AffectedRouteStructure]/Secti
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.10">
-          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-22.10)</code>
+        <div class="sect2" id="local-type.typedef-29.10">
+          <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopPoints#complexType (typedef-29.10)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211207,7 +211207,7 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
                       <br/>
                       <code>  /StopPoints #complexType</code>
                       <br/>
-                      <code>  (typedef-22.10)</code>
+                      <code>  (typedef-29.10)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211296,8 +211296,8 @@ <h3>29.53. The complex type <code>complexType[siri:AffectedRouteStructure]/StopP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.11">
-          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-22.11)</code>
+        <div class="sect2" id="local-type.typedef-29.11">
+          <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/RouteLinks#complexType (typedef-29.11)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211317,7 +211317,7 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
                       <br/>
                       <code>  /RouteLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-22.11)</code>
+                      <code>  (typedef-29.11)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211359,8 +211359,8 @@ <h3>29.54. The complex type <code>complexType[siri:AffectedRouteStructure]/Route
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.8">
-          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-22.8)</code>
+        <div class="sect2" id="local-type.typedef-29.8">
+          <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/IndirectSectionRef#complexType (typedef-29.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211380,7 +211380,7 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
                       <br/>
                       <code>  /IndirectSectionRef #complexType</code>
                       <br/>
-                      <code>  (typedef-22.8)</code>
+                      <code>  (typedef-29.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211706,8 +211706,8 @@ <h3>29.55. The complex type <code>complexType[siri:AffectedSectionStructure]/Ind
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.21">
-          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-22.21)</code>
+        <div class="sect2" id="local-type.typedef-29.21">
+          <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStructure]/AffectedFacilities#complexType (typedef-29.21)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211727,7 +211727,7 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.21)</code>
+                      <code>  (typedef-29.21)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211769,8 +211769,8 @@ <h3>29.56. The complex type <code>complexType[siri:AffectedStopPlaceComponentStr
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.18">
-          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-22.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211790,7 +211790,7 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211832,8 +211832,8 @@ <h3>29.57. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.19">
-          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-22.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211853,7 +211853,7 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-22.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211891,8 +211891,8 @@ <h3>29.58. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.20">
-          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-22.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211912,7 +211912,7 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-22.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -211954,8 +211954,8 @@ <h3>29.59. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.17">
-          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-22.17)</code>
+        <div class="sect2" id="local-type.typedef-29.17">
+          <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/Lines#complexType (typedef-29.17)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -211975,7 +211975,7 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-22.17)</code>
+                      <code>  (typedef-29.17)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212017,8 +212017,8 @@ <h3>29.60. The complex type <code>complexType[siri:AffectedStopPlaceStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.18">
-          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-22.18)</code>
+        <div class="sect2" id="local-type.typedef-29.18">
+          <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedFacilities#complexType (typedef-29.18)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212038,7 +212038,7 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedFacilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.18)</code>
+                      <code>  (typedef-29.18)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212080,8 +212080,8 @@ <h3>29.61. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.19">
-          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-22.19)</code>
+        <div class="sect2" id="local-type.typedef-29.19">
+          <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedComponents#complexType (typedef-29.19)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212101,7 +212101,7 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedComponents #complexType</code>
                       <br/>
-                      <code>  (typedef-22.19)</code>
+                      <code>  (typedef-29.19)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212139,8 +212139,8 @@ <h3>29.62. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.20">
-          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-22.20)</code>
+        <div class="sect2" id="local-type.typedef-29.20">
+          <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineStructure]/AffectedNavigationPaths#complexType (typedef-29.20)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212160,7 +212160,7 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
                       <br/>
                       <code>  /AffectedNavigationPaths #complexType</code>
                       <br/>
-                      <code>  (typedef-22.20)</code>
+                      <code>  (typedef-29.20)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212202,8 +212202,8 @@ <h3>29.63. The complex type <code>complexType[siri:AffectedStopPlaceWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.1">
-          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212223,7 +212223,7 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-22.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212265,8 +212265,8 @@ <h3>29.64. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.2">
-          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-22.2)</code>
+        <div class="sect2" id="local-type.typedef-29.2">
+          <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/Lines#complexType (typedef-29.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212286,7 +212286,7 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-22.2)</code>
+                      <code>  (typedef-29.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212328,8 +212328,8 @@ <h3>29.65. The complex type <code>complexType[siri:AffectedStopPointStructure]/L
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.1">
-          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-22.1)</code>
+        <div class="sect2" id="local-type.typedef-29.1">
+          <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineStructure]/ConnectionLinks#complexType (typedef-29.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212349,7 +212349,7 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
                       <br/>
                       <code>  /ConnectionLinks #complexType</code>
                       <br/>
-                      <code>  (typedef-22.1)</code>
+                      <code>  (typedef-29.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212391,8 +212391,8 @@ <h3>29.66. The complex type <code>complexType[siri:AffectedStopPointWithoutLineS
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.12">
-          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-22.12)</code>
+        <div class="sect2" id="local-type.typedef-29.12">
+          <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/TrainNumbers#complexType (typedef-29.12)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212412,7 +212412,7 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-22.12)</code>
+                      <code>  (typedef-29.12)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212454,8 +212454,8 @@ <h3>29.67. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.13">
-          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-22.13)</code>
+        <div class="sect2" id="local-type.typedef-29.13">
+          <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/JourneyParts#complexType (typedef-29.13)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212475,7 +212475,7 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-22.13)</code>
+                      <code>  (typedef-29.13)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212517,8 +212517,8 @@ <h3>29.68. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.14">
-          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-22.14)</code>
+        <div class="sect2" id="local-type.typedef-29.14">
+          <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Calls#complexType (typedef-29.14)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212538,7 +212538,7 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Calls #complexType</code>
                       <br/>
-                      <code>  (typedef-22.14)</code>
+                      <code>  (typedef-29.14)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -212580,8 +212580,8 @@ <h3>29.69. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-22.15">
-          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-22.15)</code>
+        <div class="sect2" id="local-type.typedef-29.15">
+          <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructure]/Facilities#complexType (typedef-29.15)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -212601,7 +212601,7 @@ <h3>29.70. The complex type <code>complexType[siri:AffectedVehicleJourneyStructu
                       <br/>
                       <code>  /Facilities #complexType</code>
                       <br/>
-                      <code>  (typedef-22.15)</code>
+                      <code>  (typedef-29.15)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -213266,12 +213266,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-4.2" class="tableblock">
+                    <p id="local-type.typedef-39.2" class="tableblock">
                       <code>element[siri:Predictability]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-4.2)</code>
+                      <code>  (typedef-39.2)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -213316,12 +213316,12 @@ <h3>30.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="2" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-4.1" class="tableblock">
+                    <p id="local-type.typedef-39.1" class="tableblock">
                       <code>element[siri:VerificationStatus]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-4.1)</code>
+                      <code>  (typedef-39.1)</code>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
@@ -223116,7 +223116,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-58.1" title="local-type: typedef-58.1">local-type: typedef-58.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.1" title="local-type: typedef-69.1">local-type: typedef-69.1</a>
                       </em>
                     </p>
                   </td>
@@ -223140,7 +223140,7 @@ <h3>39.4. The complex type <code>siri:AnnotatedLineStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-69.2" title="local-type: typedef-69.2">local-type: typedef-69.2</a>
                       </em>
                     </p>
                   </td>
@@ -223284,7 +223284,7 @@ <h3>39.5. The complex type <code>siri:RouteDirectionStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-58.3" title="local-type: typedef-58.3">local-type: typedef-58.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.3" title="local-type: typedef-69.3">local-type: typedef-69.3</a>
                       </em>
                     </p>
                   </td>
@@ -223494,7 +223494,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -223518,7 +223518,7 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -223682,8 +223682,8 @@ <h3>39.6. The complex type <code>siri:StopPointInPatternStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-58.1">
-          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-58.1)</code>
+        <div class="sect2" id="local-type.typedef-69.1">
+          <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destinations#complexType (typedef-69.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223703,7 +223703,7 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
                       <br/>
                       <code>  /Destinations #complexType</code>
                       <br/>
-                      <code>  (typedef-58.1)</code>
+                      <code>  (typedef-69.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223746,8 +223746,8 @@ <h3>39.7. The complex type <code>complexType[siri:AnnotatedLineStructure]/Destin
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-58.2">
-          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-58.2)</code>
+        <div class="sect2" id="local-type.typedef-69.2">
+          <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Directions#complexType (typedef-69.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223767,7 +223767,7 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
                       <br/>
                       <code>  /Directions #complexType</code>
                       <br/>
-                      <code>  (typedef-58.2)</code>
+                      <code>  (typedef-69.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223809,8 +223809,8 @@ <h3>39.8. The complex type <code>complexType[siri:AnnotatedLineStructure]/Direct
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-58.3">
-          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-58.3)</code>
+        <div class="sect2" id="local-type.typedef-69.3">
+          <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns#complexType (typedef-69.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223830,7 +223830,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                       <br/>
                       <code>  /JourneyPatterns #complexType</code>
                       <br/>
-                      <code>  (typedef-58.3)</code>
+                      <code>  (typedef-69.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223860,7 +223860,7 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-58.4" title="local-type: typedef-58.4">local-type: typedef-58.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.4" title="local-type: typedef-69.4">local-type: typedef-69.4</a>
                       </em>
                     </p>
                   </td>
@@ -223872,8 +223872,8 @@ <h3>39.9. The complex type <code>complexType[siri:RouteDirectionStructure]/Journ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-58.4">
-          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-58.4)</code>
+        <div class="sect2" id="local-type.typedef-69.4">
+          <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern#complexType (typedef-69.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -223893,7 +223893,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-58.4)</code>
+                      <code>  (typedef-69.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -223968,7 +223968,7 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-58.5" title="local-type: typedef-58.5">local-type: typedef-58.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-69.5" title="local-type: typedef-69.5">local-type: typedef-69.5</a>
                       </em>
                     </p>
                   </td>
@@ -223980,8 +223980,8 @@ <h3>39.10. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-58.5">
-          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-58.5)</code>
+        <div class="sect2" id="local-type.typedef-69.5">
+          <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/JourneyPatterns/JourneyPattern/StopsInPattern#complexType (typedef-69.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224001,7 +224001,7 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
                       <br/>
                       <code>  /JourneyPatterns/JourneyPattern/StopsInPattern #complexType</code>
                       <br/>
-                      <code>  (typedef-58.5)</code>
+                      <code>  (typedef-69.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224043,8 +224043,8 @@ <h3>39.11. The complex type <code>complexType[siri:RouteDirectionStructure]/Jour
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224064,7 +224064,7 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224150,8 +224150,8 @@ <h3>39.12. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.2">
-          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-55.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224171,7 +224171,7 @@ <h3>39.13. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-55.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224459,7 +224459,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.1" title="local-type: typedef-55.1">local-type: typedef-55.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.1" title="local-type: typedef-67.1">local-type: typedef-67.1</a>
                       </em>
                     </p>
                   </td>
@@ -224483,7 +224483,7 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-55.2" title="local-type: typedef-55.2">local-type: typedef-55.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-67.2" title="local-type: typedef-67.2">local-type: typedef-67.2</a>
                       </em>
                     </p>
                   </td>
@@ -224542,8 +224542,8 @@ <h3>40.2. The complex type <code>siri:AnnotatedStopPointStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.1">
-          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-55.1)</code>
+        <div class="sect2" id="local-type.typedef-67.1">
+          <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Features#complexType (typedef-67.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224563,7 +224563,7 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
                       <br/>
                       <code>  /Features #complexType</code>
                       <br/>
-                      <code>  (typedef-55.1)</code>
+                      <code>  (typedef-67.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -224649,8 +224649,8 @@ <h3>40.3. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/F
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-55.2">
-          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-55.2)</code>
+        <div class="sect2" id="local-type.typedef-67.2">
+          <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/Lines#complexType (typedef-67.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -224670,7 +224670,7 @@ <h3>40.4. The complex type <code>complexType[siri:AnnotatedStopPointStructure]/L
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-55.2)</code>
+                      <code>  (typedef-67.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -225794,7 +225794,7 @@ <h3>41.12. The group <code>siri:ProductionTimetableTopicGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -225944,7 +225944,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.2" title="local-type: typedef-74.2">local-type: typedef-74.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
                       </em>
                     </p>
                   </td>
@@ -225996,7 +225996,7 @@ <h3>41.13. The group <code>siri:SiriProductionTimetableIndexGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.3" title="local-type: typedef-74.3">local-type: typedef-74.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.3" title="local-type: typedef-82.3">local-type: typedef-82.3</a>
                       </em>
                     </p>
                   </td>
@@ -227056,7 +227056,7 @@ <h3>41.15. The complex type <code>siri:ProductionTimetableCapabilitiesResponseSt
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.7" title="local-type: typedef-74.7">local-type: typedef-74.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.7" title="local-type: typedef-82.7">local-type: typedef-82.7</a>
                       </em>
                     </p>
                   </td>
@@ -227966,7 +227966,7 @@ <h3>41.19. The complex type <code>siri:ProductionTimetableRequestStructure</code
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.1" title="local-type: typedef-74.1">local-type: typedef-74.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.1" title="local-type: typedef-82.1">local-type: typedef-82.1</a>
                       </em>
                     </p>
                   </td>
@@ -228297,7 +228297,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.4" title="local-type: typedef-74.4">local-type: typedef-74.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
                       </em>
                     </p>
                   </td>
@@ -228321,7 +228321,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.5" title="local-type: typedef-74.5">local-type: typedef-74.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.5" title="local-type: typedef-82.5">local-type: typedef-82.5</a>
                       </em>
                     </p>
                   </td>
@@ -228345,7 +228345,7 @@ <h3>41.20. The complex type <code>siri:ProductionTimetableServiceCapabilitiesStr
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-74.6" title="local-type: typedef-74.6">local-type: typedef-74.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-82.6" title="local-type: typedef-82.6">local-type: typedef-82.6</a>
                       </em>
                     </p>
                   </td>
@@ -228717,8 +228717,8 @@ <h3>41.22. The complex type <code>siri:TimetableValidityPeriod</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228738,7 +228738,7 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228888,8 +228888,8 @@ <h3>41.23. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.7">
-          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -228909,7 +228909,7 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -228984,8 +228984,8 @@ <h3>41.24. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229005,7 +229005,7 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229202,8 +229202,8 @@ <h3>41.25. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229223,7 +229223,7 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229265,8 +229265,8 @@ <h3>41.26. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.2">
-          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-74.2)</code>
+        <div class="sect2" id="local-type.typedef-82.2">
+          <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRequest]#complexType (typedef-82.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229286,7 +229286,7 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.2)</code>
+                      <code>  (typedef-82.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229483,8 +229483,8 @@ <h3>41.27. The complex type <code>element[siri:ProductionTimetableSubscriptionRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.3">
-          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-74.3)</code>
+        <div class="sect2" id="local-type.typedef-82.3">
+          <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRequest]#complexType (typedef-82.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229504,7 +229504,7 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.3)</code>
+                      <code>  (typedef-82.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229654,8 +229654,8 @@ <h3>41.28. The complex type <code>element[siri:ProductionTimetableCapabilitiesRe
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.7">
-          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-74.7)</code>
+        <div class="sect2" id="local-type.typedef-82.7">
+          <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#complexType (typedef-82.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229675,7 +229675,7 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-74.7)</code>
+                      <code>  (typedef-82.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229750,8 +229750,8 @@ <h3>41.29. The complex type <code>element[siri:ProductionTimetablePermissions]#c
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.1">
-          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-74.1)</code>
+        <div class="sect2" id="local-type.typedef-82.1">
+          <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Lines#complexType (typedef-82.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229771,7 +229771,7 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
                       <br/>
                       <code>  /Lines #complexType</code>
                       <br/>
-                      <code>  (typedef-74.1)</code>
+                      <code>  (typedef-82.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -229813,8 +229813,8 @@ <h3>41.30. The complex type <code>group[siri:ProductionTimetableTopicGroup]/Line
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.4">
-          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-74.4)</code>
+        <div class="sect2" id="local-type.typedef-82.4">
+          <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-82.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -229834,7 +229834,7 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-74.4)</code>
+                      <code>  (typedef-82.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230031,8 +230031,8 @@ <h3>41.31. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.5">
-          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-74.5)</code>
+        <div class="sect2" id="local-type.typedef-82.5">
+          <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-82.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230052,7 +230052,7 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.5)</code>
+                      <code>  (typedef-82.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -230196,8 +230196,8 @@ <h3>41.32. The complex type <code>complexType[siri:ProductionTimetableServiceCap
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-74.6">
-          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-74.6)</code>
+        <div class="sect2" id="local-type.typedef-82.6">
+          <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCapabilitiesStructure]/SubscriptionPolicy#complexType (typedef-82.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -230217,7 +230217,7 @@ <h3>41.33. The complex type <code>complexType[siri:ProductionTimetableServiceCap
                       <br/>
                       <code>  /SubscriptionPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-74.6)</code>
+                      <code>  (typedef-82.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -235786,7 +235786,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -235820,7 +235820,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -235849,7 +235849,7 @@ <h3>42.31. The complex type <code>siri:SituationExchangeServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -237498,8 +237498,8 @@ <h3>42.45. The complex type <code>complexType[siri:SituationExchangeServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237519,7 +237519,7 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237587,8 +237587,8 @@ <h3>42.46. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237608,7 +237608,7 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -237693,8 +237693,8 @@ <h3>42.47. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -237714,7 +237714,7 @@ <h3>42.48. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -239249,7 +239249,7 @@ <h3>43.23. The group <code>siri:StopMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <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>
@@ -241802,7 +241802,7 @@ <h3>43.35. The complex type <code>siri:StopMonitoringCapabilitiesResponseStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.5" title="local-type: typedef-75.5">local-type: typedef-75.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
                       </em>
                     </p>
                   </td>
@@ -243134,7 +243134,7 @@ <h3>43.39. The complex type <code>siri:StopMonitoringFilterStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <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>
@@ -243813,7 +243813,7 @@ <h3>43.41. The complex type <code>siri:StopMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
+                      <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>
@@ -243953,7 +243953,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
+                      <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>
@@ -243977,7 +243977,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
                       </em>
                     </p>
                   </td>
@@ -244049,7 +244049,7 @@ <h3>43.42. The complex type <code>siri:StopMonitoringServiceCapabilitiesStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
                       </em>
                     </p>
                   </td>
@@ -244183,7 +244183,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -244217,7 +244217,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -244246,7 +244246,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -244274,7 +244274,7 @@ <h3>43.43. The complex type <code>siri:StopMonitoringServicePermissionStructure<
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-75.6" title="local-type: typedef-75.6">local-type: typedef-75.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
                       </em>
                     </p>
                   </td>
@@ -244977,8 +244977,8 @@ <h3>43.46. The complex type <code>siri:StopNoticeStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.5">
-          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-75.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -244998,7 +244998,7 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245072,8 +245072,8 @@ <h3>43.47. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245093,7 +245093,7 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245153,8 +245153,8 @@ <h3>43.48. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.5">
-          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-75.5)</code>
+        <div class="sect2" id="local-type.typedef-80.5">
+          <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#complexType (typedef-80.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245174,7 +245174,7 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-75.5)</code>
+                      <code>  (typedef-80.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245248,8 +245248,8 @@ <h3>43.49. The complex type <code>element[siri:StopMonitoringPermissions]#comple
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245269,7 +245269,7 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245329,8 +245329,8 @@ <h3>43.50. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.1">
-          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-75.1)</code>
+        <div class="sect2" id="local-type.typedef-80.1">
+          <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245350,7 +245350,7 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-75.1)</code>
+                      <code>  (typedef-80.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245410,8 +245410,8 @@ <h3>43.51. The complex type <code>group[siri:StopMonitoringRequestPolicyGroup]/M
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.2">
-          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.2)</code>
+        <div class="sect2" id="local-type.typedef-80.2">
+          <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245431,7 +245431,7 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-75.2)</code>
+                      <code>  (typedef-80.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245624,8 +245624,8 @@ <h3>43.52. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.3">
-          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-75.3)</code>
+        <div class="sect2" id="local-type.typedef-80.3">
+          <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -245645,7 +245645,7 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-75.3)</code>
+                      <code>  (typedef-80.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -245985,8 +245985,8 @@ <h3>43.53. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.4">
-          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-75.4)</code>
+        <div class="sect2" id="local-type.typedef-80.4">
+          <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246006,7 +246006,7 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-75.4)</code>
+                      <code>  (typedef-80.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246066,8 +246066,8 @@ <h3>43.54. The complex type <code>complexType[siri:StopMonitoringServiceCapabili
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246087,7 +246087,7 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246155,8 +246155,8 @@ <h3>43.55. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246176,7 +246176,7 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246261,8 +246261,8 @@ <h3>43.56. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246282,7 +246282,7 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -246367,8 +246367,8 @@ <h3>43.57. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-75.6">
-          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.6)</code>
+        <div class="sect2" id="local-type.typedef-80.6">
+          <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-80.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -246388,7 +246388,7 @@ <h3>43.58. The complex type <code>complexType[siri:StopMonitoringServicePermissi
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-75.6)</code>
+                      <code>  (typedef-80.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -247532,7 +247532,7 @@ <h3>44.13. The complex type <code>siri:StopTimetableCapabilitiesResponseStructur
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.3" title="local-type: typedef-85.3">local-type: typedef-85.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.3" title="local-type: typedef-75.3">local-type: typedef-75.3</a>
                       </em>
                     </p>
                   </td>
@@ -248676,7 +248676,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-75.1" title="local-type: typedef-75.1">local-type: typedef-75.1</a>
                       </em>
                     </p>
                   </td>
@@ -248724,7 +248724,7 @@ <h3>44.18. The complex type <code>siri:StopTimetableServiceCapabilitiesStructure
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.2" title="local-type: typedef-85.2">local-type: typedef-85.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.2" title="local-type: typedef-75.2">local-type: typedef-75.2</a>
                       </em>
                     </p>
                   </td>
@@ -248883,7 +248883,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -248917,7 +248917,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -248946,7 +248946,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -248974,7 +248974,7 @@ <h3>44.19. The complex type <code>siri:StopTimetableServicePermissionStructure</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-85.4" title="local-type: typedef-85.4">local-type: typedef-85.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-75.4" title="local-type: typedef-75.4">local-type: typedef-75.4</a>
                       </em>
                     </p>
                   </td>
@@ -249930,8 +249930,8 @@ <h3>44.22. The complex type <code>siri:TimetabledStopVisitStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -249951,7 +249951,7 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250025,8 +250025,8 @@ <h3>44.23. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.3">
-          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-85.3)</code>
+        <div class="sect2" id="local-type.typedef-75.3">
+          <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complexType (typedef-75.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250046,7 +250046,7 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-85.3)</code>
+                      <code>  (typedef-75.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250120,8 +250120,8 @@ <h3>44.24. The complex type <code>element[siri:StopTimetablePermissions]#complex
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.1">
-          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-85.1)</code>
+        <div class="sect2" id="local-type.typedef-75.1">
+          <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-75.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250141,7 +250141,7 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-85.1)</code>
+                      <code>  (typedef-75.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250235,8 +250235,8 @@ <h3>44.25. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.2">
-          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-85.2)</code>
+        <div class="sect2" id="local-type.typedef-75.2">
+          <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilitiesStructure]/AccessControl#complexType (typedef-75.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250256,7 +250256,7 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-85.2)</code>
+                      <code>  (typedef-75.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250381,8 +250381,8 @@ <h3>44.26. The complex type <code>complexType[siri:StopTimetableServiceCapabilit
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250402,7 +250402,7 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250470,8 +250470,8 @@ <h3>44.27. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250491,7 +250491,7 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250576,8 +250576,8 @@ <h3>44.28. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250597,7 +250597,7 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -250682,8 +250682,8 @@ <h3>44.29. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-85.4">
-          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-85.4)</code>
+        <div class="sect2" id="local-type.typedef-75.4">
+          <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissionStructure]/StopMonitorPermissions#complexType (typedef-75.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -250703,7 +250703,7 @@ <h3>44.30. The complex type <code>complexType[siri:StopTimetableServicePermissio
                       <br/>
                       <code>  /StopMonitorPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-85.4)</code>
+                      <code>  (typedef-75.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252104,7 +252104,7 @@ <h3>47.2. The complex type <code>siri:AbstractPermissionStructure</code>
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -252232,8 +252232,8 @@ <h3>47.4. The complex type <code>siri:CapabilityAccessControlStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -252253,7 +252253,7 @@ <h3>47.5. The complex type <code>complexType[siri:AbstractPermissionStructure]/G
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -252516,12 +252516,12 @@ <h3>48.1. Simple type definitions</h3>
                 </tr>
                 <tr>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
-                    <p id="local-type.typedef-36.1" class="tableblock">
+                    <p id="local-type.typedef-71.1" class="tableblock">
                       <code>attribute[lang]</code>
                       <br/>
                       <code>  #simpleType</code>
                       <br/>
-                      <code>  (typedef-36.1)</code>
+                      <code>  (typedef-71.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -254795,7 +254795,7 @@ <h3>50.14. The group <code>siri:VehicleMonitoringRequestPolicyGroup</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -255918,7 +255918,7 @@ <h3>50.19. The complex type <code>siri:VehicleActivityStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.2" title="local-type: typedef-79.2">local-type: typedef-79.2</a>
                       </em>
                     </p>
                   </td>
@@ -256232,7 +256232,7 @@ <h3>50.20. The complex type <code>siri:VehicleMonitoringCapabilitiesResponseStru
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.7" title="local-type: typedef-80.7">local-type: typedef-80.7</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.7" title="local-type: typedef-79.7">local-type: typedef-79.7</a>
                       </em>
                     </p>
                   </td>
@@ -257372,7 +257372,7 @@ <h3>50.25. The complex type <code>siri:VehicleMonitoringRequestStructure</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <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>+<a shape="rect" href="#local-type.typedef-79.1" title="local-type: typedef-79.1">local-type: typedef-79.1</a>
                       </em>
                     </p>
                   </td>
@@ -257532,7 +257532,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.3" title="local-type: typedef-80.3">local-type: typedef-80.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.3" title="local-type: typedef-79.3">local-type: typedef-79.3</a>
                       </em>
                     </p>
                   </td>
@@ -257556,7 +257556,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.4" title="local-type: typedef-80.4">local-type: typedef-80.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.4" title="local-type: typedef-79.4">local-type: typedef-79.4</a>
                       </em>
                     </p>
                   </td>
@@ -257604,7 +257604,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.5" title="local-type: typedef-80.5">local-type: typedef-80.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.5" title="local-type: typedef-79.5">local-type: typedef-79.5</a>
                       </em>
                     </p>
                   </td>
@@ -257628,7 +257628,7 @@ <h3>50.26. The complex type <code>siri:VehicleMonitoringServiceCapabilitiesStruc
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.6" title="local-type: typedef-80.6">local-type: typedef-80.6</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.6" title="local-type: typedef-79.6">local-type: typedef-79.6</a>
                       </em>
                     </p>
                   </td>
@@ -257787,7 +257787,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </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>+<a shape="rect" href="#local-type.typedef-10.1" title="local-type: typedef-10.1">local-type: typedef-10.1</a>
                       </em>
                     </p>
                   </td>
@@ -257821,7 +257821,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.2" title="local-type: typedef-2.2">local-type: typedef-2.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.2" title="local-type: typedef-27.2">local-type: typedef-27.2</a>
                       </em>
                     </p>
                   </td>
@@ -257850,7 +257850,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-2.1" title="local-type: typedef-2.1">local-type: typedef-2.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-27.1" title="local-type: typedef-27.1">local-type: typedef-27.1</a>
                       </em>
                     </p>
                   </td>
@@ -257878,7 +257878,7 @@ <h3>50.27. The complex type <code>siri:VehicleMonitoringServicePermissionStructu
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-80.8" title="local-type: typedef-80.8">local-type: typedef-80.8</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-79.8" title="local-type: typedef-79.8">local-type: typedef-79.8</a>
                       </em>
                     </p>
                   </td>
@@ -258291,8 +258291,8 @@ <h3>50.29. The complex type <code>siri:VehicleMonitorPermissionStructure</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258312,7 +258312,7 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258386,8 +258386,8 @@ <h3>50.30. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258407,7 +258407,7 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -258467,8 +258467,8 @@ <h3>50.31. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.2">
-          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-80.2)</code>
+        <div class="sect2" id="local-type.typedef-79.2">
+          <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/MonitoredVehicleJourney#complexType (typedef-79.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -258488,7 +258488,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                       <br/>
                       <code>  /MonitoredVehicleJourney #complexType</code>
                       <br/>
-                      <code>  (typedef-80.2)</code>
+                      <code>  (typedef-79.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -259955,7 +259955,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.4" title="local-type: typedef-8.4">local-type: typedef-8.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.4" title="local-type: typedef-28.4">local-type: typedef-28.4</a>
                       </em>
                     </p>
                   </td>
@@ -259976,7 +259976,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-8.5" title="local-type: typedef-8.5">local-type: typedef-8.5</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-28.5" title="local-type: typedef-28.5">local-type: typedef-28.5</a>
                       </em>
                     </p>
                   </td>
@@ -260000,7 +260000,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.2" title="local-type: typedef-24.2">local-type: typedef-24.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.2" title="local-type: typedef-18.2">local-type: typedef-18.2</a>
                       </em>
                     </p>
                   </td>
@@ -260021,7 +260021,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.3" title="local-type: typedef-24.3">local-type: typedef-24.3</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.3" title="local-type: typedef-18.3">local-type: typedef-18.3</a>
                       </em>
                     </p>
                   </td>
@@ -260042,7 +260042,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-24.4" title="local-type: typedef-24.4">local-type: typedef-24.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-18.4" title="local-type: typedef-18.4">local-type: typedef-18.4</a>
                       </em>
                     </p>
                   </td>
@@ -260140,8 +260140,8 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.4">
-          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-8.4)</code>
+        <div class="sect2" id="local-type.typedef-28.4">
+          <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNumbers#complexType (typedef-28.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260161,7 +260161,7 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
                       <br/>
                       <code>  /TrainNumbers #complexType</code>
                       <br/>
-                      <code>  (typedef-8.4)</code>
+                      <code>  (typedef-28.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260203,8 +260203,8 @@ <h3>50.33. The complex type <code>group[siri:TrainOperationalInfoGroup]/TrainNum
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-8.5">
-          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-8.5)</code>
+        <div class="sect2" id="local-type.typedef-28.5">
+          <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyParts#complexType (typedef-28.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260224,7 +260224,7 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
                       <br/>
                       <code>  /JourneyParts #complexType</code>
                       <br/>
-                      <code>  (typedef-8.5)</code>
+                      <code>  (typedef-28.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260266,8 +260266,8 @@ <h3>50.34. The complex type <code>group[siri:TrainOperationalInfoGroup]/JourneyP
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.2">
-          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-24.2)</code>
+        <div class="sect2" id="local-type.typedef-18.2">
+          <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElements#complexType (typedef-18.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260287,7 +260287,7 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
                       <br/>
                       <code>  /TrainElements #complexType</code>
                       <br/>
-                      <code>  (typedef-24.2)</code>
+                      <code>  (typedef-18.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260374,8 +260374,8 @@ <h3>50.35. The complex type <code>group[siri:JourneyFormationGroup]/TrainElement
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.3">
-          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-24.3)</code>
+        <div class="sect2" id="local-type.typedef-18.3">
+          <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#complexType (typedef-18.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260395,7 +260395,7 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
                       <br/>
                       <code>  /Trains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.3)</code>
+                      <code>  (typedef-18.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260482,8 +260482,8 @@ <h3>50.36. The complex type <code>group[siri:JourneyFormationGroup]/Trains#compl
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-24.4">
-          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-24.4)</code>
+        <div class="sect2" id="local-type.typedef-18.4">
+          <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrains#complexType (typedef-18.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260503,7 +260503,7 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
                       <br/>
                       <code>  /CompoundTrains #complexType</code>
                       <br/>
-                      <code>  (typedef-24.4)</code>
+                      <code>  (typedef-18.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260590,8 +260590,8 @@ <h3>50.37. The complex type <code>group[siri:JourneyFormationGroup]/CompoundTrai
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.7">
-          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-80.7)</code>
+        <div class="sect2" id="local-type.typedef-79.7">
+          <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#complexType (typedef-79.7)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260611,7 +260611,7 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-80.7)</code>
+                      <code>  (typedef-79.7)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260685,8 +260685,8 @@ <h3>50.38. The complex type <code>element[siri:VehicleMonitoringPermissions]#com
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.1">
-          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-80.1)</code>
+        <div class="sect2" id="local-type.typedef-79.1">
+          <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup]/MaximumNumberOfCalls#complexType (typedef-79.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260706,7 +260706,7 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
                       <br/>
                       <code>  /MaximumNumberOfCalls #complexType</code>
                       <br/>
-                      <code>  (typedef-80.1)</code>
+                      <code>  (typedef-79.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260766,8 +260766,8 @@ <h3>50.39. The complex type <code>group[siri:VehicleMonitoringRequestPolicyGroup
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.3">
-          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-80.3)</code>
+        <div class="sect2" id="local-type.typedef-79.3">
+          <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/TopicFiltering#complexType (typedef-79.3)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260787,7 +260787,7 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /TopicFiltering #complexType</code>
                       <br/>
-                      <code>  (typedef-80.3)</code>
+                      <code>  (typedef-79.3)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -260929,8 +260929,8 @@ <h3>50.40. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.4">
-          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-80.4)</code>
+        <div class="sect2" id="local-type.typedef-79.4">
+          <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/RequestPolicy#complexType (typedef-79.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -260950,7 +260950,7 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /RequestPolicy #complexType</code>
                       <br/>
-                      <code>  (typedef-80.4)</code>
+                      <code>  (typedef-79.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261224,8 +261224,8 @@ <h3>50.41. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.5">
-          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-80.5)</code>
+        <div class="sect2" id="local-type.typedef-79.5">
+          <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/AccessControl#complexType (typedef-79.5)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261245,7 +261245,7 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /AccessControl #complexType</code>
                       <br/>
-                      <code>  (typedef-80.5)</code>
+                      <code>  (typedef-79.5)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261369,8 +261369,8 @@ <h3>50.42. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.6">
-          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-80.6)</code>
+        <div class="sect2" id="local-type.typedef-79.6">
+          <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapabilitiesStructure]/ResponseFeatures#complexType (typedef-79.6)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261390,7 +261390,7 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
                       <br/>
                       <code>  /ResponseFeatures #complexType</code>
                       <br/>
-                      <code>  (typedef-80.6)</code>
+                      <code>  (typedef-79.6)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261450,8 +261450,8 @@ <h3>50.43. The complex type <code>complexType[siri:VehicleMonitoringServiceCapab
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-61.1">
-          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-61.1)</code>
+        <div class="sect2" id="local-type.typedef-10.1">
+          <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/GeneralCapabilities#complexType (typedef-10.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261471,7 +261471,7 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
                       <br/>
                       <code>  /GeneralCapabilities #complexType</code>
                       <br/>
-                      <code>  (typedef-61.1)</code>
+                      <code>  (typedef-10.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261539,8 +261539,8 @@ <h3>50.44. The complex type <code>complexType[siri:AbstractPermissionStructure]/
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.2">
-          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-2.2)</code>
+        <div class="sect2" id="local-type.typedef-27.2">
+          <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType (typedef-27.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261560,7 +261560,7 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.2)</code>
+                      <code>  (typedef-27.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261645,8 +261645,8 @@ <h3>50.45. The complex type <code>element[siri:OperatorPermissions]#complexType
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-2.1">
-          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-2.1)</code>
+        <div class="sect2" id="local-type.typedef-27.1">
+          <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typedef-27.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261666,7 +261666,7 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-2.1)</code>
+                      <code>  (typedef-27.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261751,8 +261751,8 @@ <h3>50.46. The complex type <code>element[siri:LinePermissions]#complexType (typ
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-80.8">
-          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-80.8)</code>
+        <div class="sect2" id="local-type.typedef-79.8">
+          <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermissionStructure]/VehicleMonitoringPermissions#complexType (typedef-79.8)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -261772,7 +261772,7 @@ <h3>50.47. The complex type <code>complexType[siri:VehicleMonitoringServicePermi
                       <br/>
                       <code>  /VehicleMonitoringPermissions #complexType</code>
                       <br/>
-                      <code>  (typedef-80.8)</code>
+                      <code>  (typedef-79.8)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -261955,7 +261955,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -261986,7 +261986,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -262372,7 +262372,7 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -262554,8 +262554,8 @@ <h3>51.1. The toplevel element <code>siri:Siri</code>
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-83.1">
-          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</code>
+        <div class="sect2" id="local-type.typedef-81.1">
+          <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-81.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -262575,7 +262575,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-83.1)</code>
+                      <code>  (typedef-81.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -262653,7 +262653,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.2" title="local-type: typedef-82.2">local-type: typedef-82.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.2" title="local-type: typedef-78.2">local-type: typedef-78.2</a>
                       </em>
                     </p>
                   </td>
@@ -262684,7 +262684,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-70.2" title="local-type: typedef-70.2">local-type: typedef-70.2</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-3.2" title="local-type: typedef-3.2">local-type: typedef-3.2</a>
                       </em>
                     </p>
                   </td>
@@ -263070,7 +263070,7 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-82.4" title="local-type: typedef-82.4">local-type: typedef-82.4</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-78.4" title="local-type: typedef-78.4">local-type: typedef-78.4</a>
                       </em>
                     </p>
                   </td>
@@ -263252,8 +263252,8 @@ <h3>51.2. The complex type <code>element[siri:Siri]#complexType (typedef-83.1)</
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.2">
-          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-82.2)</code>
+        <div class="sect2" id="local-type.typedef-78.2">
+          <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typedef-78.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263273,7 +263273,7 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.2)</code>
+                      <code>  (typedef-78.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263507,8 +263507,8 @@ <h3>51.3. The complex type <code>element[siri:ServiceRequest]#complexType (typed
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-70.2">
-          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-70.2)</code>
+        <div class="sect2" id="local-type.typedef-3.2">
+          <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (typedef-3.2)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263528,7 +263528,7 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-70.2)</code>
+                      <code>  (typedef-3.2)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -263836,8 +263836,8 @@ <h3>51.4. The complex type <code>element[siri:SubscriptionRequest]#complexType (
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-82.4">
-          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-82.4)</code>
+        <div class="sect2" id="local-type.typedef-78.4">
+          <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (typedef-78.4)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -263857,7 +263857,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                       <br/>
                       <code>  #complexType</code>
                       <br/>
-                      <code>  (typedef-82.4)</code>
+                      <code>  (typedef-78.4)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
@@ -264101,7 +264101,7 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">
                     <p class="tableblock">
-                      <em>+<a shape="rect" href="#local-type.typedef-68.1" title="local-type: typedef-68.1">local-type: typedef-68.1</a>
+                      <em>+<a shape="rect" href="#local-type.typedef-5.1" title="local-type: typedef-5.1">local-type: typedef-5.1</a>
                       </em>
                     </p>
                   </td>
@@ -264162,8 +264162,8 @@ <h3>51.5. The complex type <code>element[siri:ServiceDelivery]#complexType (type
             </table>
           </div>
         </div>
-        <div class="sect2" id="local-type.typedef-68.1">
-          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-68.1)</code>
+        <div class="sect2" id="local-type.typedef-5.1">
+          <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/ErrorCondition#complexType (typedef-5.1)</code>
           </h3>
           <div class="sectionbody">
             <table class="tableblock frame-all grid-all spread">
@@ -264183,7 +264183,7 @@ <h3>51.6. The complex type <code>group[siri:ServiceDeliveryRequestStatusGroup]/E
                       <br/>
                       <code>  /ErrorCondition #complexType</code>
                       <br/>
-                      <code>  (typedef-68.1)</code>
+                      <code>  (typedef-5.1)</code>
                     </p>
                   </td>
                   <td colspan="1" rowspan="1" class="tableblock halign-left valign-top">

From 79ca8da1ca9a22bd1e347f5eaea6bf0e571d0e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Thu, 16 Jul 2026 09:41:21 +0200
Subject: [PATCH 7/8] Revert "Allow CI to commit back (docs/generate-tables.sh
 - #228)"

This reverts commit 0957f6999ec6cbd3e7767265f630bc0828b13ad7.
---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e5387a8..118e14ac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,10 +16,6 @@ jobs:
   run:
     runs-on: ubuntu-latest
 
-    # Needed by the "Commit changes" step to push regenerated tables back to the branch
-    permissions:
-      contents: write
-
     steps:
       - run: echo "Job was automatically triggered by a ${{ github.event_name }} event for branch ${{ github.ref }}"
 

From 3ce021c815128bd653f34942a4f0e29b26c9db59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20Barr=C3=A8re?= <thibaut.barrere@gmail.com>
Date: Thu, 16 Jul 2026 09:52:36 +0200
Subject: [PATCH 8/8] Trigger CI