diff --git a/IFC4x3/ModelViews/General Usage/DocModelView.xml b/IFC4x3/ModelViews/General Usage/DocModelView.xml
index 3f88bba3a..d63eae002 100644
--- a/IFC4x3/ModelViews/General Usage/DocModelView.xml	
+++ b/IFC4x3/ModelViews/General Usage/DocModelView.xml	
@@ -530,6 +530,60 @@ The **IfcActionRequest** may have assignments of its own using the [IfcRelAssign
 						<DocTemplateItem UniqueId="0598115b-43cc-43ad-8a41-dbcd5ca83279" />
 					</Items>
 				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Aggregation To Project" UniqueId="cf2ad581-5f73-4f92-ae9d-24b391e1dd31">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Aggregation_To_Project_1MEMw1fUTIaA4$xGhgfkna" />
+					<Items>
+						<DocTemplateItem UniqueId="8d72b7b8-bb4f-44a9-9600-c47cc1a3e010" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Layout - Horizontal, Vertical and Cant " UniqueId="0f1d2e7a-b790-460d-917d-b39d861a9010">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Layout__Horizontal_Vertical_and_Cant_2V8Y3_cEnQ$OB$FD2mkym2" />
+					<Items>
+						<DocTemplateItem UniqueId="32c0fd97-d7ac-49b1-a977-c5e71f2856b5" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Layout - Reusing Horizontal Layout" UniqueId="d8c14fa6-4395-44fe-87c3-656e230ade60">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Layout__Reusing_Horizontal_Layout_0no0rXgd1VtA7awvJZU8Nw" />
+					<Items>
+						<DocTemplateItem UniqueId="1c08d360-36da-42be-9a82-b7bd91fee749" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Geometry - Horizontal" UniqueId="868c7f90-c335-43d6-9f24-0686ad82a8f2">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Geometry__Horizontal_3LXVAJawzPPBdDBLmm0u65" />
+					<Items>
+						<DocTemplateItem UniqueId="ca810572-56e5-42aa-aac3-e0c946c90907" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Geometry - Horizontal and Vertical" UniqueId="bbbac2ee-0e90-4d6e-9bae-2608b9b0934d">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Geometry__Horizontal_and_Vertical_1L33qYzorPxwRD$oEvnvm$" />
+					<Items>
+						<DocTemplateItem UniqueId="51b6cee4-25ee-4fa2-9680-bc00819355e3" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Geometry - Horizontal, Vertical and Cant " UniqueId="6f89fa08-e83a-4d37-8897-039af4154f2c">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Geometry__Horizontal_Vertical_and_Cant_3ZE42DYi1VHOy$Ip3ZCc4S" />
+					<Items>
+						<DocTemplateItem UniqueId="e9144cec-d592-48fb-b536-f701e09eb81f" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Spatial Reference" UniqueId="6a306d5f-edd8-44d7-b6c0-89f628b982ad">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Spatial_Reference_0HnloJcazUjh0IPz5Z2WL7" />
+					<Items>
+						<DocTemplateItem UniqueId="804485ea-558c-43ac-9bf9-8b9962a2aafc" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Alignment Grouping" UniqueId="dafe9e85-3900-46fc-8728-9a530cfb3450">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Grouping_3zfyWD_85Q_BYIEWtuHH76" />
+					<Items>
+						<DocTemplateItem UniqueId="2d63bc86-ad5c-487b-a7f3-4ef652715bb1" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Property Sets for Objects" UniqueId="6e3dda07-be29-4546-aa16-e498dddc0291">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Property_Sets_for_Objects_3tGbMc30vFCOIj99WTjYHX" />
+					<Items>
+						<DocTemplateItem UniqueId="c8868890-ab3b-4c76-8e55-0628836d33ac" RuleParameters="PsetName=Pset_LinearReferencingMethod;" />
+					</Items>
+				</DocTemplateUsage>
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="425ea152-03b9-4561-a5c8-8bc3b50f9289" Type="IfcAlignment" />
 		</DocConceptRoot>
@@ -557,6 +611,15 @@ The **IfcActionRequest** may have assignments of its own using the [IfcRelAssign
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="98a8569d-942a-4a37-88b8-5ed70956158f" Type="IfcAlignmentHorizontal" />
 		</DocConceptRoot>
+		<DocConceptRoot UniqueId="0p3OhlOk58VBbdKPN1ZPO$">
+			<ApplicableEntity xsi:type="DocEntity" xsi:nil="true" href="IfcAlignmentSegment" />
+			<Concepts>
+				<DocTemplateUsage UniqueId="3FfC2m4F5CMhYIaGhy8K3o">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Alignment_Geometry__Segments_2h_0fAkXPV6Q_1L$yP0p7l" />
+				</DocTemplateUsage>
+			</Concepts>
+			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="99cd3f9a-3a71-49b1-8b5e-fb0a2b90690e" Type="IfcAlignmentSegment" />
+		</DocConceptRoot>
 		<DocConceptRoot Name="IfcAlignmentVertical" UniqueId="0399907a-9c3c-49ef-80f1-806a7c984006">
 			<ApplicableEntity xsi:type="DocEntity" xsi:nil="true" href="IfcAlignmentVertical" />
 			<Concepts>
@@ -603,6 +666,51 @@ The **IfcActionRequest** may have assignments of its own using the [IfcRelAssign
 						</DocTemplateItem>
 					</Items>
 				</DocTemplateUsage>
+				<DocTemplateUsage Name="Single Survey Point" UniqueId="147e71bc-5c28-4694-840f-6ea5be189fef">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Single_Survey_Point_3vEfSso1DOuR05cDucUhpk" />
+					<Items>
+						<DocTemplateItem UniqueId="9544bf97-5540-4b9c-9ef8-293d1a4df548" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Single Survey Point Linearly Placed" UniqueId="4eb4812d-2a27-45ee-8d25-29f44361e09d">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Single_Survey_Point_Linearly_Placed_3OYcAmhnXRNPC$Tkt4Zee7" />
+					<Items>
+						<DocTemplateItem UniqueId="874dc10c-8abb-4b0c-b7bd-c817e90c636e" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Set Of Survey Points" UniqueId="57c2c0a3-55cd-40f5-ac00-ffcb60f0e610">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Set_Of_Survey_Points_0NNULiiKbOVwEuK0eB$s5Q" />
+					<Items>
+						<DocTemplateItem UniqueId="efb4bb76-b6d6-4518-b81b-0a948ab37169" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Single Survey Line" UniqueId="17f7e020-5dfe-461c-b249-c63adb23ec08">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Single_Survey_Line_3ajnw5vVDJkxh9PUzi2Bjk" />
+					<Items>
+						<DocTemplateItem UniqueId="16bf0545-4d68-4392-95fa-f3c1ceaf91dd" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Survey Elements Grouping" UniqueId="1631942b-145d-43e2-be12-49d8f971bb39">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Survey_Elements_Grouping_2Ht$8G$8LTZRtOTHPSH_7z" />
+					<Items>
+						<DocTemplateItem UniqueId="77caf627-39b7-4d3c-8e83-549a2a4e308d" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Survey Elements Nesting" UniqueId="18b6f381-3800-42f2-b64f-0bba62da4617">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Survey_Elements_Nesting_3LRO5S9gbOTvallYM7RUjK" />
+					<Items>
+						<DocTemplateItem UniqueId="7169c285-3f76-4e75-8a50-dd72810d5912" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Property Sets for Objects" UniqueId="096f40b4-d08a-48b5-a9de-d45575c256d6">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Property_Sets_for_Objects_3tGbMc30vFCOIj99WTjYHX" />
+					<Items>
+						<DocTemplateItem UniqueId="6446fcbe-0425-4b04-95f7-1eec71ab00db" RuleParameters="PsetName=Pset_AnnotationLineOfSight;" />
+						<DocTemplateItem UniqueId="3043fc85-d2f1-4f7e-8fc5-c168f1885919" RuleParameters="PsetName=Pset_SoundAttenuation;" />
+						<DocTemplateItem UniqueId="ec81b996-c02d-4704-8e45-d745b6e3b900" RuleParameters="PredefinedType=CONTOURLINE;PsetName=Pset_AnnotationContourLine;" />
+						<DocTemplateItem UniqueId="ce2381fa-6981-421c-b10d-8078c2d7833d" RuleParameters="PredefinedType=SURVEY;PsetName=Pset_AnnotationSurveyArea;" />
+					</Items>
+				</DocTemplateUsage>
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="882370a7-5191-4ed3-b85d-a4034b38659a" Type="IfcAnnotation" />
 		</DocConceptRoot>
@@ -2061,6 +2169,12 @@ Elements can also be referenced in an _IfcBuildingStorey_, for example, if they
 					<Documentation>Some _IfcBuildingElement_ may be represented by an surface as an abstract geometric representation. See each subtype for specific guidance.</Documentation>
 					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Surface_3D_Geometry_2zWfWzETL1ifxeyxs7TzCL" />
 				</DocTemplateUsage>
+				<DocTemplateUsage Name="Material Set" UniqueId="77f86863-266c-462c-a8a7-7a228fc9b0a4">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Material_Set_0caab3Is5PigUIHQoMpysa" />
+					<Items>
+						<DocTemplateItem UniqueId="2988ed91-f7eb-4812-a83b-4bad5f6f789d" />
+					</Items>
+				</DocTemplateUsage>
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="3b67fb81-a19a-4b42-9eb6-623eb4fdad37" Type="IfcBuildingElement" />
 		</DocConceptRoot>
@@ -4853,6 +4967,12 @@ The assignment of types to distribution element occurrences is vital for providi
 				<DocTemplateUsage Name="Component to Distribution System" UniqueId="55bb52a2-9c7b-4956-b219-61cfe5b97b00">
 					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Component_to_Distribution_System_1onvxOOUP93vJsvqrxspFX" />
 				</DocTemplateUsage>
+				<DocTemplateUsage Name="Material Set" UniqueId="72132f66-b19c-49a9-b90a-5abe3c7b7614">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Material_Set_0caab3Is5PigUIHQoMpysa" />
+					<Items>
+						<DocTemplateItem UniqueId="074874fd-e5bc-4271-b065-abd079d08596" />
+					</Items>
+				</DocTemplateUsage>
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="bca85539-d6bc-49b4-8764-7ffa2887a997" Type="IfcDistributionElement" />
 		</DocConceptRoot>
@@ -10508,6 +10628,24 @@ Figure 1 illustrates project relationships with spatial structures, elements, an
 						<DocTemplateItem UniqueId="4e051762-ab94-4192-aeee-d1f9706c0342" />
 					</Items>
 				</DocTemplateUsage>
+				<DocTemplateUsage Name="Project Global Positioning Mapped" UniqueId="d72f25b4-c617-4d1e-8d90-75c28c80640a">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Project_Global_Positioning_Mapped_0JQ3WWC0jGq8WHK7Wemcwd" />
+					<Items>
+						<DocTemplateItem UniqueId="7a4a5849-dc96-45fe-877b-8112c4fcdae2" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Project Global Positioning Geographic" UniqueId="e8bf9c11-41bd-4efe-a016-9956eb704d58">
+					<Definition xsi:type="DocTemplateDefinition" xsi:nil="true" href="Project_Global_Positioning_Geographic_0cDif64JPKYvcF$uBj0eVt" />
+					<Items>
+						<DocTemplateItem UniqueId="b6cc3d7e-cee6-481e-9a3f-bbd86842d50f" />
+					</Items>
+				</DocTemplateUsage>
+				<DocTemplateUsage Name="Property Sets for Contexts" UniqueId="14e18b7d-514c-4784-a941-3a659f44a8bb">
+					<Definition xsi:type="DocTemplateDefinition" UniqueId="4aea27a9-686f-4b29-9ce8-8776e3ddf6ca" />
+					<Items>
+						<DocTemplateItem UniqueId="405531a2-bcef-4288-a92d-6a95e3fa11b9" />
+					</Items>
+				</DocTemplateUsage>
 			</Concepts>
 			<ApplicableTemplate xsi:type="DocTemplateDefinition" UniqueId="6f8fffaf-d383-423d-94db-b1e1efb5fdae" Type="IfcProject" />
 		</DocConceptRoot>
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcAlignmentSegment/DocEntity.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcAlignmentSegment/DocEntity.xml
index 1d0c497af..e604903ef 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcAlignmentSegment/DocEntity.xml	
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcAlignmentSegment/DocEntity.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="IfcAlignmentSegment" UniqueId="99256c95-26f9-40c1-8626-d82861f2eecc" BaseDefinition="IfcLinearElement" EntityFlags="32">
+<DocEntity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="IfcAlignmentSegment" Name="IfcAlignmentSegment" UniqueId="99256c95-26f9-40c1-8626-d82861f2eecc" BaseDefinition="IfcLinearElement" EntityFlags="32">
 	<Localization>
 		<DocLocalization Locale="en" Name="Alignment 2D Segment" />
 	</Localization>
diff --git a/IFC4x3/Templates/Object Assignment/Assignment to Group/Alignment Grouping/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Assignment/Assignment to Group/Alignment Grouping/DocTemplateDefinition.xml
index 07aae2a2e..fce951b07 100644
--- a/IFC4x3/Templates/Object Assignment/Assignment to Group/Alignment Grouping/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Assignment/Assignment to Group/Alignment Grouping/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Grouping" UniqueId="fda7c80d-f881-5af8-b892-3a0df84511c6" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Grouping_3zfyWD_85Q_BYIEWtuHH76" Name="Alignment Grouping" UniqueId="fda7c80d-f881-5af8-b892-3a0df84511c6" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en" />
 	</Localization>
diff --git a/IFC4x3/Templates/Object Assignment/Assignment to Group/Survey Elements Grouping/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Assignment/Assignment to Group/Survey Elements Grouping/DocTemplateDefinition.xml
index aa18f5774..c39299175 100644
--- a/IFC4x3/Templates/Object Assignment/Assignment to Group/Survey Elements Grouping/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Assignment/Assignment to Group/Survey Elements Grouping/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Survey Elements Grouping" UniqueId="91dff210-fc85-5d8d-bdd8-75165c47e1fd" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Survey_Elements_Grouping_2Ht$8G$8LTZRtOTHPSH_7z" Name="Survey Elements Grouping" UniqueId="91dff210-fc85-5d8d-bdd8-75165c47e1fd" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;The assignment of survey annotations, such as point and lines, to a group. The template can be used when the order of the elements is irrelevant, for example for point clouds or collections of survey string lines.&lt;/p&gt;
@@ -34,9 +34,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_0O8Aku1XrCNBYUO_8WUFjz" Name="IfcAnnotationTypeEnum" UniqueId="1820abb8-061d-4c5c-b89e-63e22078fb7d">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_0O8Aku1XrCNBYUO_8WUFjz" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Object Association/Material Association/Material Set/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Association/Material Association/Material Set/DocTemplateDefinition.xml
index 0f981753d..8dc9b2d82 100644
--- a/IFC4x3/Templates/Object Association/Material Association/Material Set/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Association/Material Association/Material Set/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Material Set" UniqueId="26924943-4b61-59b2-a792-45ac96cfcda4" Status="Sample" Type="IfcObjectDefinition">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Material_Set_0caab3Is5PigUIHQoMpysa" Name="Material Set" UniqueId="26924943-4b61-59b2-a792-45ac96cfcda4" Status="Sample" Type="IfcObjectDefinition">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Composite or multiple materials may be described using a material set. There are three types of material sets to choose from:&lt;/p&gt;
diff --git a/IFC4x3/Templates/Object Composition/Aggregation/Alignment Aggregation To Project/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Composition/Aggregation/Alignment Aggregation To Project/DocTemplateDefinition.xml
index 8286fe261..b8ac81542 100644
--- a/IFC4x3/Templates/Object Composition/Aggregation/Alignment Aggregation To Project/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Composition/Aggregation/Alignment Aggregation To Project/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Aggregation To Project" UniqueId="56396e81-a5e7-5290-a13f-ed0aeaa6ec64" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Aggregation_To_Project_1MEMw1fUTIaA4$xGhgfkna" Name="Alignment Aggregation To Project" UniqueId="56396e81-a5e7-5290-a13f-ed0aeaa6ec64" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Every &lt;em&gt;IfcAlignment&lt;/em&gt; must be related to &lt;em&gt;IfcProject&lt;/em&gt; using the &lt;em&gt;IfcRelAggregates&lt;/em&gt; relationship - either directly or indirectly. The indirect case is when a child alignment is aggregated to a parent alignment. In this case, only the parent alignment must be related to &lt;em&gt;IfcProject&lt;/em&gt;.&lt;/p&gt;
diff --git a/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Horizontal, Vertical and Cant/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Horizontal, Vertical and Cant/DocTemplateDefinition.xml
index ba214b338..d58959f77 100644
--- a/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Horizontal, Vertical and Cant/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Horizontal, Vertical and Cant/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Layout - Horizontal, Vertical and Cant" UniqueId="9f2220fe-98ec-5afd-82ff-3cd0b0bbcc02" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Layout__Horizontal_Vertical_and_Cant_2V8Y3_cEnQ$OB$FD2mkym2" Name="Alignment Layout - Horizontal, Vertical and Cant" UniqueId="9f2220fe-98ec-5afd-82ff-3cd0b0bbcc02" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Nesting relationships between &lt;em&gt;IfcAlignment&lt;/em&gt; and the three layouts, with respective segments, that may define it (i.e., &lt;em&gt;IfcAlignmentHorizontal&lt;/em&gt;, &lt;em&gt;IfcAlignmentVerticalSegment&lt;/em&gt;, &lt;em&gt;IfcAlignmentCant&lt;/em&gt;).&lt;/p&gt;
diff --git a/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Reusing Horizontal Layout/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Reusing Horizontal Layout/DocTemplateDefinition.xml
index 3eb42fd0e..99ff5d5af 100644
--- a/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Reusing Horizontal Layout/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Composition/Nesting/Alignment Layouts/Alignment Layout - Reusing Horizontal Layout/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Layout - Reusing Horizontal Layout" UniqueId="31c80d61-aa70-5fdc-a1e4-eb94e37885fa" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Layout__Reusing_Horizontal_Layout_0no0rXgd1VtA7awvJZU8Nw" Name="Alignment Layout - Reusing Horizontal Layout" UniqueId="31c80d61-aa70-5fdc-a1e4-eb94e37885fa" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Nesting and aggregation relationships between &lt;em&gt;IfcAlignment&lt;/em&gt;&apos;s and their layouts, in the case where multiple alignments re-use the same horizontal layout definition.&lt;/p&gt;
diff --git a/IFC4x3/Templates/Object Composition/Nesting/Survey Elements Nesting/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Composition/Nesting/Survey Elements Nesting/DocTemplateDefinition.xml
index db5f81083..4f8416e90 100644
--- a/IFC4x3/Templates/Object Composition/Nesting/Survey Elements Nesting/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Composition/Nesting/Survey Elements Nesting/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Survey Elements Nesting" UniqueId="d56d815c-26a9-5877-992f-be25876deb54" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Survey_Elements_Nesting_3LRO5S9gbOTvallYM7RUjK" Name="Survey Elements Nesting" UniqueId="d56d815c-26a9-5877-992f-be25876deb54" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;The ordered arrangement of survey annotations, such as point, lines, curves.&lt;/p&gt;
@@ -21,9 +21,16 @@
 									<Rules>
 										<DocModelRuleAttribute Name="PredefinedType">
 											<Rules>
-												<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+												<DocModelRuleEntity id="IfcAnnotationTypeEnum_0hz5Bwl513SB4k7OHyakz1" Name="IfcAnnotationTypeEnum" UniqueId="2bf452fa-bc50-4370-b12e-1d847c92ef41">
 													<Rules>
-														<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+														<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_0hz5Bwl513SB4k7OHyakz1" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -38,9 +45,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_1JumVV2WH3F9fMFxSF4hpw" Name="IfcAnnotationTypeEnum" UniqueId="53e307df-0a04-433c-9a56-3fb70f12bcfa">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_1JumVV2WH3F9fMFxSF4hpw" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Object Connectivity/Alignment Spatial Reference/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Connectivity/Alignment Spatial Reference/DocTemplateDefinition.xml
index cf9919504..f5d3fff98 100644
--- a/IFC4x3/Templates/Object Connectivity/Alignment Spatial Reference/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Connectivity/Alignment Spatial Reference/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Spatial Reference" UniqueId="11c6fc93-9a4f-5eb6-b012-67d1630a0547" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Spatial_Reference_0HnloJcazUjh0IPz5Z2WL7" Name="Alignment Spatial Reference" UniqueId="11c6fc93-9a4f-5eb6-b012-67d1630a0547" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;```
diff --git a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Contexts/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Contexts/DocTemplateDefinition.xml
index 68033590e..17930d1dd 100644
--- a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Contexts/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Contexts/DocTemplateDefinition.xml	
@@ -19,27 +19,27 @@
 											<Rules>
 												<DocModelRuleEntity Name="IfcPropertySingleValue">
 													<References>
-														<DocTemplateDefinition xsi:nil="true" href="Single_Value_3MfV0W6ZvUcB29k_1LeDIE" />
+														<DocTemplateDefinition xsi:nil="true" href="Single_Value_1cLVRGAQX7k8yzoVpfoQOW" />
 													</References>
 												</DocModelRuleEntity>
 												<DocModelRuleEntity Name="IfcPropertyBoundedValue">
 													<References>
-														<DocTemplateDefinition xsi:nil="true" href="Bounded_Value_17vZz$W_DUdQo8k3WrgK7G" />
+														<DocTemplateDefinition xsi:nil="true" href="Bounded_Value_0zPwBITXr4sQ2Uj$kn_bOo" />
 													</References>
 												</DocModelRuleEntity>
 												<DocModelRuleEntity Name="IfcPropertyEnumeratedValue">
 													<References>
-														<DocTemplateDefinition xsi:nil="true" href="Enumerated_Value_1MIlWW4iXU4eU0CtYZRywq" />
+														<DocTemplateDefinition xsi:nil="true" href="Enumerated_Value_31IA2Pmr53g99cNptWj5gL" />
 													</References>
 												</DocModelRuleEntity>
 												<DocModelRuleEntity Name="IfcPropertyListValue">
 													<References>
-														<DocTemplateDefinition xsi:nil="true" href="List_Value_2sR_$RrbrMWB$5TzYb_eQ4" />
+														<DocTemplateDefinition xsi:nil="true" href="List_Value_2E4BQ8aNbEEesoQhog$fKj" />
 													</References>
 												</DocModelRuleEntity>
 												<DocModelRuleEntity Name="IfcPropertyTableValue">
 													<References>
-														<DocTemplateDefinition xsi:nil="true" href="Table_Value_0p5_$6cK1RtO1fnMgZn8OM" />
+														<DocTemplateDefinition xsi:nil="true" href="Table_Value_0roKUmQhnB4ux7QMxo11SX" />
 													</References>
 												</DocModelRuleEntity>
 											</Rules>
diff --git a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Materials/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Materials/DocTemplateDefinition.xml
index a87d7f648..7f2c19f74 100644
--- a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Materials/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Materials/DocTemplateDefinition.xml	
@@ -32,32 +32,34 @@ concept {
 							<Rules>
 								<DocModelRuleEntity Name="IfcPropertySingleValue">
 									<References>
-										<DocTemplateDefinition xsi:nil="true" href="Single_Value_3MfV0W6ZvUcB29k_1LeDIE" />
+										<DocTemplateDefinition xsi:nil="true" href="Single_Value_1cLVRGAQX7k8yzoVpfoQOW" />
 									</References>
 								</DocModelRuleEntity>
 								<DocModelRuleEntity Name="IfcPropertyBoundedValue">
 									<References>
-										<DocTemplateDefinition xsi:nil="true" href="Bounded_Value_17vZz$W_DUdQo8k3WrgK7G" />
+										<DocTemplateDefinition xsi:nil="true" href="Bounded_Value_0zPwBITXr4sQ2Uj$kn_bOo" />
 									</References>
 								</DocModelRuleEntity>
 								<DocModelRuleEntity Name="IfcPropertyEnumeratedValue">
 									<References>
-										<DocTemplateDefinition xsi:nil="true" href="Enumerated_Value_1MIlWW4iXU4eU0CtYZRywq" />
+										<DocTemplateDefinition xsi:nil="true" href="Enumerated_Value_31IA2Pmr53g99cNptWj5gL" />
 									</References>
 								</DocModelRuleEntity>
 								<DocModelRuleEntity Name="IfcPropertyListValue">
 									<References>
-										<DocTemplateDefinition xsi:nil="true" href="List_Value_2sR_$RrbrMWB$5TzYb_eQ4" />
+										<DocTemplateDefinition xsi:nil="true" href="List_Value_2E4BQ8aNbEEesoQhog$fKj" />
 									</References>
 								</DocModelRuleEntity>
 								<DocModelRuleEntity Name="IfcPropertyTableValue">
 									<References>
-										<DocTemplateDefinition xsi:nil="true" href="Table_Value_0p5_$6cK1RtO1fnMgZn8OM" />
+										<DocTemplateDefinition xsi:nil="true" href="Table_Value_0roKUmQhnB4ux7QMxo11SX" />
 									</References>
 								</DocModelRuleEntity>
 							</Rules>
 						</DocModelRuleAttribute>
 					</Rules>
+						</DocModelRuleAttribute>
+					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
 		</DocModelRuleAttribute>
diff --git a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Profiles/DocTemplateDefinition.xml b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Profiles/DocTemplateDefinition.xml
index b7a790f5a..5e18ed5c1 100644
--- a/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Profiles/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Object Definition/Property Sets/Property Sets for Profiles/DocTemplateDefinition.xml	
@@ -30,11 +30,31 @@ concept {
 						</DocModelRuleAttribute>
 						<DocModelRuleAttribute Name="Properties" Identification="Properties">
 							<Rules>
-								<DocModelRuleEntity Name="IfcPropertySingleValue" />
-								<DocModelRuleEntity Name="IfcPropertyBoundedValue" />
-								<DocModelRuleEntity Name="IfcPropertyEnumeratedValue" />
-								<DocModelRuleEntity Name="IfcPropertyListValue" />
-								<DocModelRuleEntity Name="IfcPropertyTableValue" />
+								<DocModelRuleEntity Name="IfcPropertySingleValue">
+									<References>
+										<DocTemplateDefinition xsi:nil="true" href="Single_Value_1cLVRGAQX7k8yzoVpfoQOW" />
+									</References>
+								</DocModelRuleEntity>
+								<DocModelRuleEntity Name="IfcPropertyBoundedValue">
+									<References>
+										<DocTemplateDefinition xsi:nil="true" href="Bounded_Value_0zPwBITXr4sQ2Uj$kn_bOo" />
+									</References>
+								</DocModelRuleEntity>
+								<DocModelRuleEntity Name="IfcPropertyEnumeratedValue">
+									<References>
+										<DocTemplateDefinition xsi:nil="true" href="Enumerated_Value_31IA2Pmr53g99cNptWj5gL" />
+									</References>
+								</DocModelRuleEntity>
+								<DocModelRuleEntity Name="IfcPropertyListValue">
+									<References>
+										<DocTemplateDefinition xsi:nil="true" href="List_Value_2E4BQ8aNbEEesoQhog$fKj" />
+									</References>
+								</DocModelRuleEntity>
+								<DocModelRuleEntity Name="IfcPropertyTableValue">
+									<References>
+										<DocTemplateDefinition xsi:nil="true" href="Table_Value_0roKUmQhnB4ux7QMxo11SX" />
+									</References>
+								</DocModelRuleEntity>
 							</Rules>
 						</DocModelRuleAttribute>
 					</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal and Vertical/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal and Vertical/DocTemplateDefinition.xml
index 67cd15a28..3db810994 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal and Vertical/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal and Vertical/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Geometry - Horizontal and Vertical" UniqueId="550c3d22-f72d-59ef-a6cd-ff23b9c79c3f" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Geometry__Horizontal_and_Vertical_1L33qYzorPxwRD$oEvnvm$" Name="Alignment Geometry - Horizontal and Vertical" UniqueId="550c3d22-f72d-59ef-a6cd-ff23b9c79c3f" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;This concept template applies to alignments defined by an horizontal and a vertical layouts.&lt;/p&gt;
@@ -28,18 +28,32 @@
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_3GPSwatYT5JxM9Pbrw28aL" Name="IfcLabel" UniqueId="d065cea4-de27-454f-b589-665d7a088915">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;FootPrint&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;FootPrint&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_3GPSwatYT5JxM9Pbrw28aL" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;FootPrint&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_2WsqEcRSzCBhkiehICb6NO" Name="IfcLabel" UniqueId="a0db43a6-6dcf-4c2e-bbac-a2b48c9465d8">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve2D&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve2D&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_2WsqEcRSzCBhkiehICb6NO" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve2D&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -63,18 +77,32 @@
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_2$jU6ywRzDafV5PQ$atHVl" Name="IfcLabel" UniqueId="bfb5e1bc-e9bf-4d92-97c5-65afe4dd17ef">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Axis&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Axis&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_2$jU6ywRzDafV5PQ$atHVl" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Axis&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_1UYtoD$5v0guZRMSRNtvMf" Name="IfcLabel" UniqueId="5e8b7c8d-fc5e-40ab-88db-59c6d7df95a9">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve3D&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve3D&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_1UYtoD$5v0guZRMSRNtvMf" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve3D&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal, Vertical and Cant/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal, Vertical and Cant/DocTemplateDefinition.xml
index cee4de7d6..7b1801be5 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal, Vertical and Cant/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal, Vertical and Cant/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Geometry - Horizontal, Vertical and Cant" UniqueId="e338408d-8ac0-5f45-8f3f-4b30e332611c" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Geometry__Horizontal_Vertical_and_Cant_3ZE42DYi1VHOy$Ip3ZCc4S" Name="Alignment Geometry - Horizontal, Vertical and Cant" UniqueId="e338408d-8ac0-5f45-8f3f-4b30e332611c" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;This concept template applies to alignments defined by an horizontal, a vertical and a cant layouts.&lt;/p&gt;
@@ -28,18 +28,32 @@
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_251NB$4pz5RB_huFCNI$AW" Name="IfcLabel" UniqueId="850572ff-133f-456c-bfab-e0f3174bf2a0">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;FootPrint&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;FootPrint&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_251NB$4pz5RB_huFCNI$AW" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;FootPrint&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_0HJWYBybv5lQ7NxNOIijdb" Name="IfcLabel" UniqueId="114e088b-f25e-45bd-a1d7-ed7612b2d9e5">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve2D&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve2D&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_0HJWYBybv5lQ7NxNOIijdb" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve2D&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -63,18 +77,32 @@
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_2UN2GzjOn3_xuGseJmv4nG" Name="IfcLabel" UniqueId="9e5c243d-b58c-43fb-be10-da84f0e44c50">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Axis&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Axis&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_2UN2GzjOn3_xuGseJmv4nG" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Axis&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_3_hyFDErX3beYIKJni3SN0" Name="IfcLabel" UniqueId="feafc3cd-3b58-4396-8892-513c6c0dc5c0">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve3D&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve3D&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_3_hyFDErX3beYIKJni3SN0" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve3D&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal/DocTemplateDefinition.xml
index e94c3989d..aabd103a2 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Horizontal/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Geometry - Horizontal" UniqueId="d585f293-93af-5964-b9cd-2d5c30038185" Status="Sample" Type="IfcAlignment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Geometry__Horizontal_3LXVAJawzPPBdDBLmm0u65" Name="Alignment Geometry - Horizontal" UniqueId="d585f293-93af-5964-b9cd-2d5c30038185" Status="Sample" Type="IfcAlignment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;This concept template applies to alignments defined only by an horizontal layout.&lt;/p&gt;
@@ -39,18 +39,32 @@ concept {
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_0x42H6XF9FO9LIHis1LGwJ" Name="IfcLabel" UniqueId="3b102446-84f2-4f60-9552-46cd81550e93">
 													<Rules>
-														<DocModelRuleConstraint Description="RepresentationIdentifier[Value] = &apos;Axis&apos;" />
+														<DocModelRuleConstraint Description="RepresentationIdentifier[Value] = &apos;Axis&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_0x42H6XF9FO9LIHis1LGwJ" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Axis&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_319gNp$Zv7UvIUON2Puk0y" Name="IfcLabel" UniqueId="c126a5f3-fe3e-477b-949e-617099e2e03c">
 													<Rules>
-														<DocModelRuleConstraint Description="RepresentationType[Value] = &apos;Curve2D&apos;" />
+														<DocModelRuleConstraint Description="RepresentationType[Value] = &apos;Curve2D&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_319gNp$Zv7UvIUON2Puk0y" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve2D&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Segments/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Segments/DocTemplateDefinition.xml
index f6cfa466c..893600eab 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Segments/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Alignment Geometry/Alignment Geometry - Segments/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Alignment Geometry - Segments" UniqueId="abf80a4a-ba16-5f19-af81-57ff190331ef" Status="Sample" Type="IfcAlignmentSegment">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Alignment_Geometry__Segments_2h_0fAkXPV6Q_1L$yP0p7l" Name="Alignment Geometry - Segments" UniqueId="abf80a4a-ba16-5f19-af81-57ff190331ef" Status="Sample" Type="IfcAlignmentSegment">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;This concept template applies to segments of all type of alignment layout: &lt;em&gt;IfcAlignmentHorizontalSegment&lt;/em&gt;, &lt;em&gt;IfcAlignmentVerticalSegment&lt;/em&gt; and &lt;em&gt;IfcAlignmentCantSegment&lt;/em&gt;.&lt;/p&gt;
@@ -35,18 +35,32 @@ concept {
 									<Rules>
 										<DocModelRuleAttribute Name="RepresentationIdentifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_3AA2hVB$TAmgqryt9E3pcw" Name="IfcLabel" UniqueId="ca282adf-2ff7-4ac2-ad35-f3724e0f39ba">
 													<Rules>
-														<DocModelRuleConstraint Description="RepresentationIdentifier[Value] = &apos;Axis&apos;" />
+														<DocModelRuleConstraint Description="RepresentationIdentifier[Value] = &apos;Axis&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_3AA2hVB$TAmgqryt9E3pcw" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Axis&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_2yxd2c$Q1FVAglVQPEEU6v" Name="IfcLabel" UniqueId="bcee70a6-fda0-4f7c-aaaf-7da64e39e1b9">
 													<Rules>
-														<DocModelRuleConstraint Description="RepresentationType[Value] = &apos;Segment&apos;" />
+														<DocModelRuleConstraint Description="RepresentationType[Value] = &apos;Segment&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_2yxd2c$Q1FVAglVQPEEU6v" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Segment&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Set Of Survey Points/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Set Of Survey Points/DocTemplateDefinition.xml
index dc9888fbe..b1f7f3c41 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Set Of Survey Points/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Set Of Survey Points/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Set Of Survey Points" UniqueId="175de56c-b149-587f-a3b8-500a0bff615a" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Set_Of_Survey_Points_0NNULiiKbOVwEuK0eB$s5Q" Name="Set Of Survey Points" UniqueId="175de56c-b149-587f-a3b8-500a0bff615a" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Geometry representation of a set of survey points. They can be 2D points or 3D points. The set of points may not form a closed surface or a survey line.&lt;/p&gt;
@@ -25,18 +25,32 @@
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_0oAYax_pnF1fUVWUoKKN5a" Name="IfcLabel" UniqueId="322a293b-fb3c-4f06-979f-81ec94517164">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_0oAYax_pnF1fUVWUoKKN5a" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Annotation&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_0cXO0tkGH0qATK1l3RU_7s" Name="IfcLabel" UniqueId="26858037-b904-40d0-a754-06f0db7be1f6">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_0cXO0tkGH0qATK1l3RU_7s" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Point&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -57,9 +71,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_13vIRY_eT7bRDD$YKapVu$" Name="IfcAnnotationTypeEnum" UniqueId="43e526e2-fa87-4795-b34d-fe2524cdfe3f">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_13vIRY_eT7bRDD$YKapVu$" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Line/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Line/DocTemplateDefinition.xml
index d75f450ec..175a63b2f 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Line/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Line/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Single Survey Line" UniqueId="e4b71e85-e5f3-53bb-bac9-65ef6c08bb6e" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Single_Survey_Line_3ajnw5vVDJkxh9PUzi2Bjk" Name="Single Survey Line" UniqueId="e4b71e85-e5f3-53bb-bac9-65ef6c08bb6e" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Geometry representation of a single survey line. It can be a 2D or a 3D line, therefore using &lt;em&gt;IfcPolyline&lt;/em&gt;, or &lt;em&gt;IfcIndexedPolyCurve&lt;/em&gt;, or &lt;em&gt;IfcGradientCurve&lt;/em&gt;, or &lt;em&gt;IfcCompositeCurve&lt;/em&gt;&lt;/p&gt;
@@ -22,18 +22,32 @@
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_3uGwiGBtLEefDjuBfuAUql" Name="IfcLabel" UniqueId="f843ab10-2f75-4ea2-936d-e0ba7829ed2f">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_3uGwiGBtLEefDjuBfuAUql" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Annotation&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_1ooNJPvALCYOb0AviM$AXe" Name="IfcLabel" UniqueId="72c974d9-e4a5-4c89-8940-2b9b16fca868">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Curve&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_1ooNJPvALCYOb0AviM$AXe" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Curve&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -56,9 +70,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_3ehGyEQQn8GAPH4gMhBafd" Name="IfcAnnotationTypeEnum" UniqueId="e8ad0f0e-69ac-4840-a651-12a5ab2e4a67">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_3ehGyEQQn8GAPH4gMhBafd" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point Linearly Placed/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point Linearly Placed/DocTemplateDefinition.xml
index 89a374ddb..4d043f3a6 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point Linearly Placed/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point Linearly Placed/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Single Survey Point Linearly Placed" UniqueId="d88a62b0-af18-5b5d-933f-76edc48e8a07" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Single_Survey_Point_Linearly_Placed_3OYcAmhnXRNPC$Tkt4Zee7" Name="Single Survey Point Linearly Placed" UniqueId="d88a62b0-af18-5b5d-933f-76edc48e8a07" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Geometry representation of a single survey point linearly placed along a curve.&lt;/p&gt;
@@ -22,18 +22,32 @@
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_1rqi$YDyT1PhHV0Ow7_bnJ" Name="IfcLabel" UniqueId="75d2cfe2-37c7-4166-b45f-018e87fa5c53">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_1rqi$YDyT1PhHV0Ow7_bnJ" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Annotation&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_3trizY5G97mgzxLksvOpI5" Name="IfcLabel" UniqueId="f7d6cf62-1502-47c2-af7b-56edb9633485">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_3trizY5G97mgzxLksvOpI5" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Point&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -53,9 +67,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_1_FoGN_ODCcux30YBXV9TS" Name="IfcAnnotationTypeEnum" UniqueId="7e3f2417-f983-4c9b-8ec3-0222e17c975c">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_1_FoGN_ODCcux30YBXV9TS" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point/DocTemplateDefinition.xml b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point/DocTemplateDefinition.xml
index 72414f899..251454588 100644
--- a/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Product Shape/Product Geometric Representation/Annotation Geometry/Single Survey Point/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Single Survey Point" UniqueId="f93a9736-c813-58e1-b005-98de267abcee" Status="Sample" Type="IfcAnnotation">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Single_Survey_Point_3vEfSso1DOuR05cDucUhpk" Name="Single Survey Point" UniqueId="f93a9736-c813-58e1-b005-98de267abcee" Status="Sample" Type="IfcAnnotation">
 	<Localization>
 		<DocLocalization Locale="en">
 			<Documentation>&lt;p&gt;Geometry representation of a single survey point.&lt;/p&gt;
@@ -22,18 +22,32 @@
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationIdentifier" Identification="Identifier">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_0qwxZo78L9oPQUaFstQu1z" Name="IfcLabel" UniqueId="34ebb8f2-1c85-49c9-969e-90fdb76b807d">
 													<Rules>
-														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;" />
+														<DocModelRuleConstraint Description="Identifier[Value] = &apos;Annotation&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_0qwxZo78L9oPQUaFstQu1z" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Annotation&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
 										</DocModelRuleAttribute>
 										<DocModelRuleAttribute Name="RepresentationType" Identification="Type">
 											<Rules>
-												<DocModelRuleEntity Name="IfcLabel">
+												<DocModelRuleEntity id="IfcLabel_26egH8sgTA$QEkphbDu_z3" Name="IfcLabel" UniqueId="86a2a448-daa7-4afd-a3ae-ceb94de3ef43">
 													<Rules>
-														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;" />
+														<DocModelRuleConstraint Description="Type[Value] = &apos;Point&apos;">
+															<Expression xsi:type="DocOpStatement" Operation="compareequal">
+																<Reference xsi:type="DocOpReference">
+																	<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcLabel_26egH8sgTA$QEkphbDu_z3" />
+																</Reference>
+																<Value xsi:type="DocOpLiteral" Literal=" &apos;Point&apos;" />
+															</Expression>
+														</DocModelRuleConstraint>
 													</Rules>
 												</DocModelRuleEntity>
 											</Rules>
@@ -53,9 +67,16 @@
 		</DocModelRuleAttribute>
 		<DocModelRuleAttribute Name="PredefinedType">
 			<Rules>
-				<DocModelRuleEntity Name="IfcAnnotationTypeEnum">
+				<DocModelRuleEntity id="IfcAnnotationTypeEnum_1JJp9PrHfFvOo9MfsVy01k" Name="IfcAnnotationTypeEnum" UniqueId="534f3259-d51a-4fe5-8c89-5a9d9ff0006e">
 					<Rules>
-						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY" />
+						<DocModelRuleConstraint Description="PredefinedType[Value] = SURVEY">
+							<Expression xsi:type="DocOpStatement" Operation="compareequal">
+								<Reference xsi:type="DocOpReference">
+									<EntityRule xsi:type="DocModelRuleEntity" xsi:nil="true" href="IfcAnnotationTypeEnum_1JJp9PrHfFvOo9MfsVy01k" />
+								</Reference>
+								<Value xsi:type="DocOpLiteral" Literal=" SURVEY" />
+							</Expression>
+						</DocModelRuleConstraint>
 					</Rules>
 				</DocModelRuleEntity>
 			</Rules>
diff --git a/IFC4x3/Templates/Project Context/Project Global Positioning Geographic/DocTemplateDefinition.xml b/IFC4x3/Templates/Project Context/Project Global Positioning Geographic/DocTemplateDefinition.xml
index a07702284..66c754c10 100644
--- a/IFC4x3/Templates/Project Context/Project Global Positioning Geographic/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Project Context/Project Global Positioning Geographic/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Project Global Positioning Geographic" UniqueId="2636ca46-1136-548b-998f-ff82ed0287f7" Status="Sample" Type="IfcProject">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Project_Global_Positioning_Geographic_0cDif64JPKYvcF$uBj0eVt" Name="Project Global Positioning Geographic" UniqueId="2636ca46-1136-548b-998f-ff82ed0287f7" Status="Sample" Type="IfcProject">
 	<Localization>
 		<DocLocalization Locale="en" />
 	</Localization>
diff --git a/IFC4x3/Templates/Project Context/Project Global Positioning Mapped/DocTemplateDefinition.xml b/IFC4x3/Templates/Project Context/Project Global Positioning Mapped/DocTemplateDefinition.xml
index 861ec0889..f0a23a5bd 100644
--- a/IFC4x3/Templates/Project Context/Project Global Positioning Mapped/DocTemplateDefinition.xml	
+++ b/IFC4x3/Templates/Project Context/Project Global Positioning Mapped/DocTemplateDefinition.xml	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Project Global Positioning Mapped" UniqueId="13683820-300b-50d0-8811-507828c26ea7" Status="Sample" Type="IfcProject">
+<DocTemplateDefinition xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Project_Global_Positioning_Mapped_0JQ3WWC0jGq8WHK7Wemcwd" Name="Project Global Positioning Mapped" UniqueId="13683820-300b-50d0-8811-507828c26ea7" Status="Sample" Type="IfcProject">
 	<Localization>
 		<DocLocalization Locale="en" />
 	</Localization>