diff --git a/.gitignore b/.gitignore
index 3ce15e17c..744889bcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@ fabric.properties
 # Editor-based Rest Client
 .idea/httpRequests
 
+/.idea
diff --git a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml
index 5aca118bd..85e0825b8 100644
--- a/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml
+++ b/examples/functions/timetable/Netex_01.2_Bus_SimpleTimetable_WithTimings.xml
@@ -420,6 +420,10 @@ The Calendar is shown coded as
 											<Advertised>true</Advertised>
 										</NoticeAssignment>
 									</noticeAssignments>
+									<!-- check for CheckConstraint. V2.1 -->
+									<CheckConstraint id="mybus:cc:1" version="any">
+										<Congestion>noWaiting</Congestion>
+									</CheckConstraint>
 								</StopPointInJourneyPattern>
 								<StopPointInJourneyPattern version="any" order="2" id="hde:spijp_24o_02">
 									<ScheduledStopPointRef version="any" ref="mybus:SSP_002"/>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index 05f21f6d0..a8be5909a 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -3,11 +3,13 @@
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
 	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd"/>
 	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
 	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
 	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
 	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourneyStopAssignment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -63,8 +65,7 @@
 					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
-						<Copyright>CEN, Crown Copyright 2009-2023</Copyright>
-				</Rights>
+						<Copyright>CEN, Crown Copyright 2009-2023</Copyright></Rights>
 				<Source>
 					<ul>
 						<li>Derived from the Transmodel, VDV, TransXChange, NEPTUNE, BISON and Trident standards.</li>
@@ -901,6 +902,9 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Nature of use of stop, e.g. access, interchange only, or pass through. Default is Access.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:group ref="QuayAssignmentGroup"/>
+			<xsd:element ref="AccessibilityAssessment" minOccurs="0"/>
+			<xsd:element ref="CheckConstraint" minOccurs="0"/>
 			<xsd:choice>
 				<xsd:element name="bookingArrangements" type="bookingArrangements_RelStructure" minOccurs="0">
 					<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 1faa2c962..42dec9855 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -3,6 +3,7 @@
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
 	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
 	<xsd:include schemaLocation="../../netex_part_2/part2_occupancy/netex_oc_occupancy_version.xsd"/>
 	<!-- ======================================================================= -->
@@ -204,6 +205,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Number of days after the starting time of the journey if not same calendar day. Default is 0 for same day.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
+			<xsd:element ref="CheckConstraint" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>A CHECK CONSTRAINT can be used on StopPointInJourneyPattern as well. It should be used there, if it affects every SERVICE JOURNEY with that SERVICE JOURNEY PATTERN. If the CONSTRAINT only affects one single SERVICE JOURNEY it is better to use this CHECK CONSTRAINT here in PASSING TIME.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 			<xsd:element name="occupancies" type="OccupancyView_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>OCCUPANCYs associated with this journey. +v2.0</xsd:documentation>