diff --git a/examples/functions/deckPlans/DeckPlans-Example.xml b/examples/functions/deckPlans/DeckPlans-Example.xml
index 09b81c72a..87cd3ce09 100644
--- a/examples/functions/deckPlans/DeckPlans-Example.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example.xml
@@ -677,7 +677,7 @@
forwards
-
+
diff --git a/examples/functions/deckPlans/DeckPlans-Example_bus.xml b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
index a9e938f1b..661cca902 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_bus.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_bus.xml
@@ -603,10 +603,6 @@ Lower deck
1
-
- 1
-
-
@@ -791,7 +787,7 @@ Lower deck
forwards
-
+
diff --git a/examples/functions/deckPlans/DeckPlans-Example_train.xml b/examples/functions/deckPlans/DeckPlans-Example_train.xml
index 43ad6f425..89f28cda9 100644
--- a/examples/functions/deckPlans/DeckPlans-Example_train.xml
+++ b/examples/functions/deckPlans/DeckPlans-Example_train.xml
@@ -1176,7 +1176,7 @@ The train reverse in the station and departs, oriented backwards to the right
0.80
1.80
-
+
@@ -3561,7 +3561,7 @@ The train reverse in the station and departs, oriented backwards to the right
forwards
-
+
diff --git a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
index 88faad935..098e6e71b 100644
--- a/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
+++ b/examples/functions/newModes/NewModes-ChauffeuredServiceExample.xml
@@ -588,11 +588,21 @@
Alphaville pick up
-
+
Alphaville pick up
+
+
+
+ Alphaville gare pick up
+
+
+
+
+ Alphaville gare pick up
+
diff --git a/examples/functions/newModes/NewModes-CycleSharingExample.xml b/examples/functions/newModes/NewModes-CycleSharingExample.xml
index 30f0123e1..29e5e7e58 100644
--- a/examples/functions/newModes/NewModes-CycleSharingExample.xml
+++ b/examples/functions/newModes/NewModes-CycleSharingExample.xml
@@ -378,26 +378,26 @@
+
+
+ true
+ dock
+
+
+ 10
+ docks
+
+
+ Ticket Machine s at Bike Station Alpha
+ true
+ 2
+ ticketMachines
+ debitCard creditCard contactlessPaymentCard epayDevice epayAccount
+ standard
+
+
-
-
- true
- dock
-
-
- 10
- docks
-
-
- Ticket Machine s at Bike Station Alpha
- true
- 2
- ticketMachines
- debitCard creditCard contactlessPaymentCard epayDevice epayAccount
- standard
-
-
10
@@ -495,11 +495,11 @@
-
+
10
docks
-
+
Ticket Machine at Bike Station Beta
true
1
@@ -521,11 +521,11 @@
-
+
true
dock
-
+
electricity
@@ -535,11 +535,11 @@
-
+
true
dock
-
+
electricity
@@ -791,7 +791,7 @@
-
+
diff --git a/examples/functions/site/Netex_21_Sites_Parking_2.xml b/examples/functions/site/Netex_21_Sites_Parking_2.xml
index 73f41f1cd..23062f0e7 100644
--- a/examples/functions/site/Netex_21_Sites_Parking_2.xml
+++ b/examples/functions/site/Netex_21_Sites_Parking_2.xml
@@ -542,7 +542,7 @@ v1.1 revised ids and corrections
-
+
@@ -609,7 +609,7 @@ v1.1 revised ids and corrections
-
+
diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
index b16dc9597..d5cd9203d 100644
--- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
+++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
@@ -4730,7 +4730,7 @@ Changes
8
-
+
none
diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
index 0f845a544..2bdd94de5 100644
--- a/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
+++ b/examples/functions/stopPlace/Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
@@ -4961,7 +4961,7 @@ Changes
8
-
+
none
diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
index c306718ff..216e91a39 100644
--- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
+++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
@@ -4834,7 +4834,7 @@ Changes
8
-
+
none
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 0a46b7c29..40ad9b0c0 100644
--- a/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
+++ b/examples/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
@@ -705,7 +705,7 @@ The Calendar is shown coded as
-
+
online callOffice
public
diff --git a/examples/functions/versioning/Netex_Uniqueness_01.xml b/examples/functions/versioning/Netex_Uniqueness_01.xml
index 298e2071c..3d6f3d5ba 100644
--- a/examples/functions/versioning/Netex_Uniqueness_01.xml
+++ b/examples/functions/versioning/Netex_Uniqueness_01.xml
@@ -244,7 +244,7 @@ This is part 1 of a multistep example on versioning
SIGN
-
+
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
index 5c230c4fa..5fb6a77f9 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
@@ -168,16 +168,16 @@ This is part 4 of a multistep example on versioning.
ntwkf001 experssed as a delta - only the removed stop is described - Baseline is version 3
-
+
-
+
-
+
-
+
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml
index b580dc905..d6e8365c2 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_ByRef.xml
@@ -65,25 +65,25 @@ This version shows the use of thye general frame to hold references rather than
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
index c9fca3ead..912ac00ba 100644
--- a/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
+++ b/examples/standards/noptis/NeTEx_Calendar_TimetableAndVehicleSchedule_PB2.xml
@@ -340,7 +340,7 @@ is relevant for supplying an Integrator with partial data from multiple sources.
true
true
-
+
public
10:00:00
PT1H
diff --git a/examples/standards/norway/stops/PointOfInterest.xml b/examples/standards/norway/stops/PointOfInterest.xml
index 1ce234033..8b70cda60 100644
--- a/examples/standards/norway/stops/PointOfInterest.xml
+++ b/examples/standards/norway/stops/PointOfInterest.xml
@@ -243,7 +243,7 @@ The example comprises
-
+
gates
both
10
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 6d3fb4286..401bf3c1d 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -12354,6 +12354,678 @@
+
+
+
+
+ Every [AccessZone Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [Equipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [Facility Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [FacilitySet Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [FlexibleLinkProperties Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [FlexiblePointProperties Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [FlexibleServiceProperties Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [GeneralFrameMember Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [GenericNavigationPath Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [GenericPathJunction Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [NetworkRestriction Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [ParkingEntrance Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [PlaceLightingEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [PointOfInterestVehicleEntrance Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [PriceableObject Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [LuggageLockerEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [OtherOrganisation Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SensorEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SignEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SiteComponent Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SiteElement Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SiteEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SiteNavigationPath Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [SpotEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [StopAssignment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [TypeOfMobilityService Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [TypeOfModeOfOperation Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [VehicleEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [VehicleEntrance Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [VehiclePoolingMeetingPlace Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [WaitingEquipment Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Every [WheelchairVehicle Id + Version] must be unique within document.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+