diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html
index 371b707..4c71e98 100644
--- a/docs/generated/contab/siri.html
+++ b/docs/generated/contab/siri.html
@@ -60644,7 +60644,7 @@ <h3>7.33. The complex type <code>siri:MonitoredFeederArrivalCancellationStructur
                   <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>
@@ -65630,7 +65630,7 @@ <h3>8.24. The complex type <code>siri:TimetabledFeederArrivalCancellationStructu
                   <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>
@@ -109463,7 +109463,7 @@ <h3>14.30. The complex type <code>siri:DatedVehicleJourneyStructure</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>
@@ -117782,7 +117782,7 @@ <h3>15.13. The complex type <code>siri:EstimatedVehicleJourneyStructure</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>
@@ -130805,7 +130805,7 @@ <h3>19.1. The complex type <code>siri:InterchangeJourneyStructure</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>
@@ -169990,7 +169990,7 @@ <h3>24.19. The complex type <code>siri:MonitoredVehicleJourneyStructure</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>
@@ -174414,7 +174414,7 @@ <h3>26.1. Simple type definitions</h3>
                     </p>
                   </td>
                   <td colspan="2" rowspan="1" class="tableblock halign-left valign-top">
-                    <p class="tableblock anno-text">MODEs of transport applicable to timetabled public transport.</p>
+                    <p class="tableblock anno-text">DEPRECATED since SIRI 2.3 (replaced by VehicleModesOfTransportEnumeration in siri_modes.xsd) - MODEs of transport applicable to timetabled public transport.</p>
                   </td>
                 </tr>
                 <tr>
@@ -175250,7 +175250,7 @@ <h3>26.45. The group <code>siri:JourneyPatternInfoGroup</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>
@@ -219874,7 +219874,7 @@ <h3>34.5. The complex type <code>siri:TargetedVehicleJourneyStructure</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>
@@ -226285,7 +226285,7 @@ <h3>41.14. The complex type <code>siri:DatedTimetableVersionFrameStructure</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>
@@ -240342,7 +240342,7 @@ <h3>43.30. The complex type <code>siri:MonitoredStopVisitCancellationStructure</
                   <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>
@@ -249529,7 +249529,7 @@ <h3>44.21. The complex type <code>siri:TimetabledStopVisitCancellationStructure<
                   <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>
@@ -255484,7 +255484,7 @@ <h3>50.18. The complex type <code>siri:VehicleActivityCancellationStructure</cod
                   <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>
@@ -258630,7 +258630,7 @@ <h3>50.32. The complex type <code>complexType[siri:VehicleActivityStructure]/Mon
                   <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>
diff --git a/xsd/siri_model/siri_reference.xsd b/xsd/siri_model/siri_reference.xsd
index 68d0cc4..696fb89 100644
--- a/xsd/siri_model/siri_reference.xsd
+++ b/xsd/siri_model/siri_reference.xsd
@@ -107,6 +107,7 @@ Rail transport, Roads and road transport
 	<xsd:include schemaLocation="siri_operator_support.xsd"/>
 	<xsd:include schemaLocation="siri_time.xsd"/>
 	<xsd:include schemaLocation="siri_situationIdentity.xsd"/>
+	<xsd:include schemaLocation="siri_modes.xsd"/>
 	<!-- ========= VERSION =========================================== -->
 	<xsd:element name="VersionRef" type="VersionCodeType">
 		<xsd:annotation>
@@ -340,7 +341,7 @@ Rail transport, Roads and road transport
 	<!--==== Mode Enumerations =================================================================== -->
 	<xsd:simpleType name="VehicleModesEnumeration">
 		<xsd:annotation>
-			<xsd:documentation>MODEs of transport applicable to timetabled public transport.</xsd:documentation>
+			<xsd:documentation>DEPRECATED since SIRI 2.3 (replaced by VehicleModesOfTransportEnumeration in siri_modes.xsd) - MODEs of transport applicable to timetabled public transport.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:restriction base="xsd:NMTOKEN">
 			<xsd:enumeration value="air"/>
@@ -446,7 +447,7 @@ Values for these elements can be specified on an annual schedule and will be inh
 					<xsd:documentation>Name of Joruney Pattern</xsd:documentation>
 				</xsd:annotation>
 			</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>A means of transportation such as bus, rail, etc.</xsd:documentation>
 				</xsd:annotation>