diff --git a/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml b/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml
index 0f432f7a2..e29dc1198 100644
--- a/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml
+++ b/examples/functions/timetable/Netex_01.4_Bus_SimpleTimetable_WithConnection.xml
@@ -579,7 +579,7 @@ The Calendar is shown coded as
 					</connections>
 					<!--- =========STOP ASSIGNMENTs=========== -->
 					<stopAssignments>
-						<FlexibleStopAssignment version="any" id="hde:fsa_SSP_021+fsp_Quebec">
+						<FlexibleStopAssignment version="any" id="hde:fsa_SSP_021+fsp_Quebec" order="1">
 							<Description lang="en">Assigns   Quebec  to flexibleHail and ride section</Description>
 							<ScheduledStopPointRef version="any" ref="mybus:SSP_021"/>
 							<FlexibleStopPlaceRef version="any" ref="mybus:fsp_Quebec"/>
diff --git a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
index 228194b25..05dc2af67 100644
--- a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
+++ b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
@@ -397,7 +397,7 @@ The Calendar is shown coded as
 					</servicePatterns>
 					<!--- =========STOP ASSIGNMENTs=========== -->
 					<stopAssignments>
-						<FlexibleStopAssignment version="any" id="hde:fsa_SSP_077+fsp_Sigma">
+						<FlexibleStopAssignment version="any" id="hde:fsa_SSP_077+fsp_Sigma" order="1">
 							<Description lang="en">Assigns Charley to Tau Zone </Description>
 							<ScheduledStopPointRef version="any" ref="mybus:SSP_077"/>
 							<FlexibleStopPlaceRef version="any" ref="mybus:fsp_Tau"/>
diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml
index 902e7df1f..6b5872d29 100644
--- a/examples/functions/versioning/Netex_Uniqueness_01.xml
+++ b/examples/functions/versioning/Netex_Uniqueness_01.xml
@@ -59,7 +59,7 @@ This is part 1 of a multistep example on versioning
 									</operatingDays>
 								</AvailabilityCondition>
 								<ValidDuring version="001" id="bar:foo"/>
-								<ValidBetween version="001" id="bar:foo"/>
+								<ValidBetween version="001" id="bar:foo2"/>
 							</validityConditions>
 							<alternativeTexts>
 								<AlternativeText version="001" id="bar:foo" attributeName="Name" order="1">
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index e88c691ae..25c3dc561 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -187,13 +187,12 @@
           CR00310 add constraints on JOURNEY PART POSITION
         </Date>
 				<Date><Modified>2017-05-09</Modified>
-          Correct COnstraints for PointOnRoute
-          Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er
-          Add Missing Constraints For GroupOfServicesMember , JourneyAccounting
-          DelegatedResponsibilitySet
-          Reinstate Constraints for CAll
-          Fix constraints that were missing namespace on subpart
-        </Date>
+         Correct Constraints for PointOnRoute
+					              Add  Missing Constraints For CommonSectionMember / PointOnSection 	and LinkOnSection er
+					              Add  Missing Constraints For GroupOfServicesMember , JourneyAccounting  DelegatedResponsibilitySet
+								 Reinstate  Constraints for CAll
+								 Fix constraints that were missing namespace on subpart
+		    </Date>
 				<Date><Modified>2017-03-27</Modified>
           Various 1.1 changes see CRS.
           CR0038 revise constraints on ResponsibilityRole
@@ -3218,6 +3217,14 @@
 		</xsd:key>
 		<!-- =====ACCESSIBILITY Constraints========================= -->
 		<!-- =====AccessibilityAssessment============================ -->
+		<xsd:unique name="AccessibilityAssessment_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AccessibilityAssessment Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AccessibilityAssessment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:keyref name="AccessibilityAssessment_AnyKeyRef" refer="netex:AccessibilityAssessment_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:AccessibilityAssessmentRef"/>
 			<xsd:field xpath="@ref"/>
@@ -3228,6 +3235,15 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====AccessibilityLimitation============================ -->
+		<xsd:unique name="AccessibilityLimitation_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AccessibilityLimitation Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AccessibilityLimitation"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====SERVICE CALENDAR Constraints========================= -->
 		<!-- =====DayType============================== -->
 		<!-- =====DayType unique========================== -->
@@ -3326,14 +3342,14 @@
 		</xsd:key>
 		<!-- =====OperatingDay============================== -->
 		<!-- =====OperatingDay unique========================== -->
-		<!--		<xsd:unique name="OperatingDay_UniqueBy_Id_Version">
-				<xsd:annotation>
-					<xsd:documentation>Every [OperatingDay Id + Version] must be unique within document.</xsd:documentation>
-				</xsd:annotation>
-				<xsd:selector xpath=".//netex:OperatingDay"/>
-				<xsd:field xpath="@id"/>
-				<xsd:field xpath="@version"/>
-			</xsd:unique>-->
+		<xsd:unique name="OperatingDay_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [OperatingDay Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:OperatingDay"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====OperatingDay unique==In Calendar======================== -->
 		<xsd:unique name="OperatingDay_UniqueCalendarDateInCalendar">
 			<xsd:annotation>
@@ -3426,7 +3442,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [ValidityCondition Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ValidityCondition | .//netex:ValidityTrigger | .//netex:ValidityRuleParameter"/>
+			<xsd:selector xpath=".//netex:ValidityCondition | .//netex:ValidityTrigger | .//netex:ValidityRuleParameter | .//netex:ValidBetween"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -3442,6 +3458,15 @@
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====AvailabilityCondition============================== -->
+		<!-- =====AvailabilityCondition unique========================== -->
+		<xsd:unique name="AvailabilityCondition_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AvailabilityCondition Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AvailabilityCondition | .//netex:ValidDuring"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:keyref name="AvailabilityCondition_AnyKeyRef" refer="netex:AvailabilityCondition_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:AvailabilityConditionRef"/>
 			<xsd:field xpath="@ref"/>
@@ -4286,6 +4311,48 @@
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:key>
+		<!-- =====FlexibleRoute============================== -->
+		<!-- =====FlexibleRoute unique========================== -->
+		<xsd:unique name="FlexibleRoute_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleRoute Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleRoute"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====FlexibleRoute Key ========================== -->
+		<xsd:keyref name="FlexibleRoute_KeyRef" refer="netex:FlexibleRoute_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleRouteRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleRoute_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleRoute"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
+		<!-- =====FlexibleQuay============================== -->
+		<!-- =====FlexibleQuay unique========================== -->
+		<xsd:unique name="FlexibleQuay_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleQuay Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleQuay"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====FlexibleQuay Key ========================== -->
+		<xsd:keyref name="FlexibleQuay_KeyRef" refer="netex:FlexibleQuay_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleQuayRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleQuay_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleQuay"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====FlexibleStopPlace============================== -->
 		<!-- =====FlexibleStopPlace unique========================== -->
 		<xsd:unique name="FlexibleStopPlace_UniqueBy_Id_Version">
@@ -4929,7 +4996,7 @@
 			<xsd:field xpath="@version"/>
 			<xsd:field xpath="@order"/>
 		</xsd:key>
-		<!-- =====CHECK CONSTRAINT COnstraints============== -->
+		<!-- =====CHECK CONSTRAINT Constraints============== -->
 		<!-- =====CheckConstraint============================== -->
 		<!-- =====CheckConstraint unique========================== -->
 		<xsd:unique name="CheckConstraint_UniqueBy_Id_Version">
@@ -4993,14 +5060,14 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====PATH COnstraints============== -->
+		<!-- =====PATH Constraints============== -->
 		<!-- =====PathLink============================== -->
 		<!-- =====PathLink unique========================== -->
 		<xsd:unique name="PathLink_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [PathLink Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PathLink"/>
+			<xsd:selector xpath=".//netex:PathLink | .//netex:SitePathLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -5547,6 +5614,15 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
+		<!-- =====FlexibleLine unique========================== -->
+		<xsd:unique name="FlexibleLine_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleLine Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleLine"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====Line Key ========================== -->
 		<xsd:keyref name="Line_KeyRef" refer="netex:Line_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:LineRef | .//netex:FlexibleLineRef | .//netex:MainLineRef"/>
@@ -6399,6 +6475,30 @@
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====STOP ASSIGNMENT Constraints============================== -->
+		<!-- =====FlexibleStopAssignment============================== -->
+		<!-- =====FlexibleStopAssignment unique========================== -->
+		<xsd:unique name="FlexibleStopAssignment_UniqueBy_Id_Version_Order">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleStopAssignment Id + Version + order] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleStopAssignment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:unique>
+		<!-- =====FlexibleStopAssignment Key ========================== -->
+		<xsd:keyref name="FlexibleStopAssignment_KeyRef" refer="netex:FlexibleStopAssignment_AnyVersionedKey_ordered">
+			<xsd:selector xpath=".//netex:FlexibleStopAssignmentRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleStopAssignment_AnyVersionedKey_ordered">
+			<xsd:selector xpath=".//netex:FlexibleStopAssignment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:key>
 		<!-- =====PassengerStopAssignment============================== -->
 		<!-- =====PassengerStopAssignment unique========================== -->
 		<xsd:unique name="PassengerStopAssignment_UniqueBy_Id_Version_Order">
@@ -7028,6 +7128,22 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
+		<xsd:unique name="DatedVehicleJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [DatedVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:DatedVehicleJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<xsd:unique name="NormalDatedVehicleJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [NormalDatedVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:NormalDatedVehicleJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:unique name="ServiceJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [ServiceJourney Id + Version] must be unique within document.</xsd:documentation>
@@ -7036,7 +7152,15 @@
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<xsd:unique name="TemplateVehicleourney_UniqueBy_Id_Version">
+		<xsd:unique name="DatedServiceJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [DatedServiceJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:DatedServiceJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<xsd:unique name="TemplateVehicleJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [TemplateVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
@@ -7059,7 +7183,7 @@
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
+			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
@@ -9603,7 +9727,7 @@
 			<xsd:annotation>
 				<xsd:documentation>Every [UsageValidityPeriod Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:UsageValidityPeriod"/>
+			<xsd:selector xpath=".//netex:UsageValidityPeriod | .//netex:ValidityPeriod"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index ddc26337c..968feb7c5 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -2582,6 +2582,14 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:key>
 		<!-- =====ACCESSIBILITY Constraints========================= -->
 		<!-- =====AccessibilityAssessment============================ -->
+		<xsd:unique name="AccessibilityAssessment_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AccessibilityAssessment Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AccessibilityAssessment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:keyref name="AccessibilityAssessment_AnyKeyRef" refer="netex:AccessibilityAssessment_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:AccessibilityAssessmentRef"/>
 			<xsd:field xpath="@ref"/>
@@ -2592,6 +2600,15 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====AccessibilityLimitation============================ -->
+		<xsd:unique name="AccessibilityLimitation_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AccessibilityLimitation Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AccessibilityLimitation"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====SERVICE CALENDAR Constraints========================= -->
 		<!-- =====DayType============================== -->
 		<!-- =====DayType unique========================== -->
@@ -2690,14 +2707,14 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:key>
 		<!-- =====OperatingDay============================== -->
 		<!-- =====OperatingDay unique========================== -->
-		<!--		<xsd:unique name="OperatingDay_UniqueBy_Id_Version">
+		<xsd:unique name="OperatingDay_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [OperatingDay Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
 			<xsd:selector xpath=".//netex:OperatingDay"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
-		</xsd:unique>-->
+		</xsd:unique>
 		<!-- =====OperatingDay unique==In Calendar======================== -->
 		<xsd:unique name="OperatingDay_UniqueCalendarDateInCalendar">
 			<xsd:annotation>
@@ -2790,7 +2807,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:annotation>
 				<xsd:documentation>Every [ValidityCondition Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:ValidityCondition | .//netex:ValidityTrigger | .//netex:ValidityRuleParameter"/>
+			<xsd:selector xpath=".//netex:ValidityCondition | .//netex:ValidityTrigger | .//netex:ValidityRuleParameter | .//netex:ValidBetween"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -2806,6 +2823,15 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====AvailabilityCondition============================== -->
+		<!-- =====AvailabilityCondition unique========================== -->
+		<xsd:unique name="AvailabilityCondition_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [AvailabilityCondition Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:AvailabilityCondition | .//netex:ValidDuring"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:keyref name="AvailabilityCondition_AnyKeyRef" refer="netex:AvailabilityCondition_AnyVersionedKey">
 			<xsd:selector xpath=".//netex:AvailabilityConditionRef"/>
 			<xsd:field xpath="@ref"/>
@@ -3328,6 +3354,48 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+		<!-- =====FlexibleRoute============================== -->
+		<!-- =====FlexibleRoute unique========================== -->
+		<xsd:unique name="FlexibleRoute_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleRoute Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleRoute"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====FlexibleRoute Key ========================== -->
+		<xsd:keyref name="FlexibleRoute_KeyRef" refer="netex:FlexibleRoute_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleRouteRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleRoute_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleRoute"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
+		<!-- =====FlexibleQuay============================== -->
+		<!-- =====FlexibleQuay unique========================== -->
+		<xsd:unique name="FlexibleQuay_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleQuay Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleQuay"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<!-- =====FlexibleQuay Key ========================== -->
+		<xsd:keyref name="FlexibleQuay_KeyRef" refer="netex:FlexibleQuay_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleQuayRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleQuay_AnyVersionedKey">
+			<xsd:selector xpath=".//netex:FlexibleQuay"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:key>
 		<!-- =====FlexibleStopPlace============================== -->
 		<!-- =====FlexibleStopPlace unique========================== -->
 		<xsd:unique name="FlexibleStopPlace_UniqueBy_Id_Version">
@@ -3622,7 +3690,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====CHECK CONSTRAINT COnstraints============== -->
+		<!-- =====CHECK CONSTRAINT Constraints============== -->
 		<!-- =====CheckConstraint============================== -->
 		<!-- =====CheckConstraint unique========================== -->
 		<xsd:unique name="CheckConstraint_UniqueBy_Id_Version">
@@ -3686,14 +3754,14 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====PATH COnstraints============== -->
+		<!-- =====PATH Constraints============== -->
 		<!-- =====PathLink============================== -->
 		<!-- =====PathLink unique========================== -->
 		<xsd:unique name="PathLink_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [PathLink Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:PathLink"/>
+			<xsd:selector xpath=".//netex:PathLink | .//netex:SitePathLink"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
@@ -4240,9 +4308,18 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
+		<!-- =====FlexibleLine unique========================== -->
+		<xsd:unique name="FlexibleLine_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleLine Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleLine"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<!-- =====Line Key ========================== -->
 		<xsd:keyref name="Line_KeyRef" refer="netex:Line_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:LineRef| .//netex:FlexibleLineRef | .//netex:MainLineRef"/>
+			<xsd:selector xpath=".//netex:LineRef | .//netex:FlexibleLineRef | .//netex:MainLineRef"/>
 			<xsd:field xpath="@ref"/>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
@@ -4946,6 +5023,30 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====STOP ASSIGNMENT Constraints============================== -->
+		<!-- =====FlexibleStopAssignment============================== -->
+		<!-- =====FlexibleStopAssignment unique========================== -->
+		<xsd:unique name="FlexibleStopAssignment_UniqueBy_Id_Version_Order">
+			<xsd:annotation>
+				<xsd:documentation>Every [FlexibleStopAssignment Id + Version + order] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:FlexibleStopAssignment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:unique>
+		<!-- =====FlexibleStopAssignment Key ========================== -->
+		<xsd:keyref name="FlexibleStopAssignment_KeyRef" refer="netex:FlexibleStopAssignment_AnyVersionedKey_ordered">
+			<xsd:selector xpath=".//netex:FlexibleStopAssignmentRef"/>
+			<xsd:field xpath="@ref"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:keyref>
+		<xsd:key name="FlexibleStopAssignment_AnyVersionedKey_ordered">
+			<xsd:selector xpath=".//netex:FlexibleStopAssignment"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+			<xsd:field xpath="@order"/>
+		</xsd:key>
 		<!-- =====PassengerStopAssignment============================== -->
 		<!-- =====PassengerStopAssignment unique========================== -->
 		<xsd:unique name="PassengerStopAssignment_UniqueBy_Id_Version_Order">
@@ -5566,6 +5667,22 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
+		<xsd:unique name="DatedVehicleJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [DatedVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:DatedVehicleJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<xsd:unique name="NormalDatedVehicleJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [NormalDatedVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:NormalDatedVehicleJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
 		<xsd:unique name="ServiceJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [ServiceJourney Id + Version] must be unique within document.</xsd:documentation>
@@ -5574,7 +5691,15 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:unique>
-		<xsd:unique name="TemplateVehicleourney_UniqueBy_Id_Version">
+		<xsd:unique name="DatedServiceJourney_UniqueBy_Id_Version">
+			<xsd:annotation>
+				<xsd:documentation>Every [DatedServiceJourney Id + Version] must be unique within document.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:selector xpath=".//netex:DatedServiceJourney"/>
+			<xsd:field xpath="@id"/>
+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<xsd:unique name="TemplateVehicleJourney_UniqueBy_Id_Version">
 			<xsd:annotation>
 				<xsd:documentation>Every [TemplateVehicleJourney Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
@@ -5597,7 +5722,7 @@ Provides a general purose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@version"/>
 		</xsd:keyref>
 		<xsd:key name="Journey_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney| .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney"/>
+			<xsd:selector xpath=".//netex:ServiceJourney | .//netex:VehicleJourney | .//netex:DeadRun | .//netex:SpecialService | .//netex:TemplateServiceJourney | .//netex:DatedServiceJourney | .//netex:DatedVehicleJourney | .//netex:NormalDatedVehicleJourney"/>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>