diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index ad1eef080..7348115d5 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -7519,6 +7519,15 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====DynamicDistanceMatrixElement unique========================== -->
+		<xsd:unique name="DynamicDistanceMatrixElement_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [DynamicDistanceMatrixElement Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:DynamicDistanceMatrixElement"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====GroupOfDistanceMatrixElements============================== -->
 		<!-- =====GroupOfDistanceMatrixElements unique========================== -->
 		<xsd:unique name="GroupOfDistanceMatrixElements_UniqueBy_Id_Version">
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 962c688a4..96e933b0a 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -16,7 +16,7 @@
 	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
 	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
 	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
 	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
 	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
@@ -250,7 +250,10 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="TariffRef" minOccurs="0"/>
 			<xsd:element ref="FareStructureElementRef" minOccurs="0"/>
 			<xsd:element ref="FareElementInSequenceRef" minOccurs="0"/>
-			<xsd:element ref="DistanceMatrixElementRef" minOccurs="0"/>
+			<xsd:choice  minOccurs="0">
+				<xsd:element ref="DistanceMatrixElementRef"/>
+				<xsd:element ref="DynamicDistanceMatrixElement"/>
+			</xsd:choice>
 			<xsd:element ref="DistanceMatrixElementInverseRef" minOccurs="0"/>
 			<xsd:element ref="DistanceMatrixElementView" minOccurs="0"/>
 			<xsd:element ref="SalesOfferPackageRef" minOccurs="0"/>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
index e79b11c10..74376b9f5 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
@@ -121,6 +121,12 @@ Rail transport, Roads and Road transport
 		</xsd:annotation>
 		<xsd:restriction base="PriceableObjectIdType"/>
 	</xsd:simpleType>
+	<xsd:simpleType name="DynamicDistanceMatrixElementIdType">
+		<xsd:annotation>
+			<xsd:documentation>Type for identifier of a DYNAMIC DISTANCE MATRIX ELEMENT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="DistanceMatrixElementIdType"/>
+	</xsd:simpleType>
 	<xsd:element name="DistanceMatrixElementRef" substitutionGroup="PriceableObjectRef">
 		<xsd:annotation>
 			<xsd:documentation>Reference to a DISTANCE MATRIX ELEMENT, used in a forward direction.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
index 53de50624..3f88f7684 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_distanceMatrixElement_version">
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10"
+	id="netex_distanceMatrixElement_version">
 	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
 	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
 	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
@@ -31,7 +33,10 @@
 				</Date>
 				<Date>
 					<Modified>2019-03-25</Modified>Fix #40 by Skinkie from 2019.01.07 . Fix typo on DistanceMatrixElement.IsDirect.  
-					 NB this will break existing XML that uses IsDirect. 
+					NB this will break existing XML that uses IsDirect. 
+				</Date>
+				<Date>
+					<Modified>2021-02-05</Modified>Add DynamicDistanceMatrixElement for on-the-fly creation when pre-computing all possible combinations is not feasible
 				</Date>
 				<Description>
 					<p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p>
@@ -225,7 +230,14 @@ Rail transport, Roads and Road transport
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
-	<xsd:element name="DistanceMatrixElement" abstract="false" substitutionGroup="PriceableObject">
+	
+	
+	<xsd:element name="DistanceMatrixElement_" type="PriceableObject_VersionStructure" abstract="true" substitutionGroup="PriceableObject">
+		<xsd:annotation>
+			<xsd:documentation>Dummy SERVICE JOURNEY Supertype.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="DistanceMatrixElement" abstract="false" substitutionGroup="DistanceMatrixElement_">
 		<xsd:annotation>
 			<xsd:documentation>A cell of an origin-destination matrix for TARIFF ZONEs or STOP POINTs, expressing a fare distance for the corresponding trip: value in km, number of fare units etc.</xsd:documentation>
 		</xsd:annotation>
@@ -479,6 +491,43 @@ Rail transport, Roads and Road transport
 		</xsd:choice>
 	</xsd:group>
 	<!-- ======================================================================= -->
+	<!-- === DYNAMIC DISTANCE MATRIX ELEMENT  ================================================= -->
+	<xsd:element name="DynamicDistanceMatrixElement" abstract="false" substitutionGroup="DistanceMatrixElement_">
+		<xsd:annotation>
+			<xsd:documentation>A dynamic free-standing distance matrix element. Used when a pre-computed distance matrix element is not feasible.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:restriction base="DynamicDistanceMatrixElement_VersionStructure">
+					<xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="EntityInVersionGroup" minOccurs="0"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="DataManagedObjectGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="PriceableObjectGroup"/>
+						</xsd:sequence>
+						<xsd:sequence>
+							<xsd:group ref="DistanceMatrixElementGroup"/>
+						</xsd:sequence>
+					</xsd:sequence>
+					<xsd:attribute name="id" type="DynamicDistanceMatrixElementIdType"/>
+				</xsd:restriction>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="DynamicDistanceMatrixElement_VersionStructure">
+		<xsd:annotation>
+			<xsd:documentation>Type for DYNAMIC DISTANCE MATRIX ELEMENT.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="DistanceMatrixElement_VersionStructure">
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
 	<!-- == DISTANCE MATRIX ELEMENT View-->
 	<xsd:element name="DistanceMatrixElementView" type="DistanceMatrixElement_DerivedViewStructure" abstract="false" substitutionGroup="DerivedView">
 		<xsd:annotation>