diff --git a/IFC4x3/Constants/a/ASBUILTAREA_1GqT215CzEOPMpaERlWkqA.xml b/IFC4x3/Constants/a/ASBUILTAREA_1GqT215CzEOPMpaERlWkqA.xml
deleted file mode 100644
index 6c52a9bee..000000000
--- a/IFC4x3/Constants/a/ASBUILTAREA_1GqT215CzEOPMpaERlWkqA.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A set of as-built survey points on a surface.
-
-
diff --git a/IFC4x3/Constants/a/ASBUILTLINE_2PVqtTOCH2a8hDkyRfWZT_.xml b/IFC4x3/Constants/a/ASBUILTLINE_2PVqtTOCH2a8hDkyRfWZT_.xml
deleted file mode 100644
index 1d92bfc34..000000000
--- a/IFC4x3/Constants/a/ASBUILTLINE_2PVqtTOCH2a8hDkyRfWZT_.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A set of as-built survey points on a line (e.g. breakline).
-
-
diff --git a/IFC4x3/Constants/a/ASBUILTPOINT_3_QCsR1LH1H8l9zpru1ojH.xml b/IFC4x3/Constants/a/ASBUILTPOINT_3_QCsR1LH1H8l9zpru1ojH.xml
deleted file mode 100644
index 7cbc943ad..000000000
--- a/IFC4x3/Constants/a/ASBUILTPOINT_3_QCsR1LH1H8l9zpru1ojH.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A single as-built survey point.
-
-
diff --git a/IFC4x3/Constants/a/ASSUMEDAREA_2q$hwGYfv6R85b7Uy5iQJz.xml b/IFC4x3/Constants/a/ASSUMEDAREA_2q$hwGYfv6R85b7Uy5iQJz.xml
deleted file mode 100644
index 0d0a7c660..000000000
--- a/IFC4x3/Constants/a/ASSUMEDAREA_2q$hwGYfv6R85b7Uy5iQJz.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A set of extra points on a surface as an assumption or interpretation, used to complement survey data in initial state modelling.
-
-
diff --git a/IFC4x3/Constants/a/ASSUMEDLINE_3KoBmqa2XEAehiZezAhu1R.xml b/IFC4x3/Constants/a/ASSUMEDLINE_3KoBmqa2XEAehiZezAhu1R.xml
deleted file mode 100644
index 660092a19..000000000
--- a/IFC4x3/Constants/a/ASSUMEDLINE_3KoBmqa2XEAehiZezAhu1R.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A set of extra points on a line (breakline) as an assumption or interpretation, used to complement survey data in initial state modelling.
-
-
diff --git a/IFC4x3/Constants/a/ASSUMEDPOINT_3reTam0_v1_xR9Cp_tbrCz.xml b/IFC4x3/Constants/a/ASSUMEDPOINT_3reTam0_v1_xR9Cp_tbrCz.xml
deleted file mode 100644
index c3529de74..000000000
--- a/IFC4x3/Constants/a/ASSUMEDPOINT_3reTam0_v1_xR9Cp_tbrCz.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A single extra point (assumption or interpretation), used to complement survey data in initial state modelling.
-
-
diff --git a/IFC4x3/Constants/c/CONTOURLINE_30oVU06B13Hw29vsovjfJn.xml b/IFC4x3/Constants/c/CONTOURLINE_30oVU06B13Hw29vsovjfJn.xml
new file mode 100644
index 000000000..a42ae93b9
--- /dev/null
+++ b/IFC4x3/Constants/c/CONTOURLINE_30oVU06B13Hw29vsovjfJn.xml
@@ -0,0 +1,7 @@
+
+
+ Annotation used to illustrate lines connecting points of equal elevation or depth, on a map or chart.
+
+>EXAMPLE Typically used in cartography, geography, or geology maps, where the spacing of lines at constant intervals of elevation may be used as an indication of slope.
+
+
diff --git a/IFC4x3/Constants/d/DIMENSION_0yn9BV2W91YBdVw9PNqRJ6.xml b/IFC4x3/Constants/d/DIMENSION_0yn9BV2W91YBdVw9PNqRJ6.xml
new file mode 100644
index 000000000..8a996024c
--- /dev/null
+++ b/IFC4x3/Constants/d/DIMENSION_0yn9BV2W91YBdVw9PNqRJ6.xml
@@ -0,0 +1,5 @@
+
+
+ Annotation used to illustrate the measurement or size of an object, often accompanied by numerical values.
+
+
diff --git a/IFC4x3/Constants/i/ISOBAR_3IJjq8889EewanR4cGwspS.xml b/IFC4x3/Constants/i/ISOBAR_3IJjq8889EewanR4cGwspS.xml
new file mode 100644
index 000000000..75842c4f1
--- /dev/null
+++ b/IFC4x3/Constants/i/ISOBAR_3IJjq8889EewanR4cGwspS.xml
@@ -0,0 +1,7 @@
+
+
+ Annotation used to illustrate lines connecting points of equal pressure on a map or chart.
+
+>EXAMPLE Typically used on weather maps or to show pressure gradient in spaces, chambers or externally.
+
+
diff --git a/IFC4x3/Constants/i/ISOLUX_0U5W79Z7P8894oHKPIPONx.xml b/IFC4x3/Constants/i/ISOLUX_0U5W79Z7P8894oHKPIPONx.xml
new file mode 100644
index 000000000..b6093f1d2
--- /dev/null
+++ b/IFC4x3/Constants/i/ISOLUX_0U5W79Z7P8894oHKPIPONx.xml
@@ -0,0 +1,7 @@
+
+
+ Annotation used to illustrate lines connecting points of equal illuminance or light intensity.
+
+>EXAMPLE Typically used in lighting design or photometry to show the distribution of illumination levels and/or day lighting in a space or externally.
+
+
diff --git a/IFC4x3/Constants/i/ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ.xml b/IFC4x3/Constants/i/ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ.xml
new file mode 100644
index 000000000..d838a292d
--- /dev/null
+++ b/IFC4x3/Constants/i/ISOTHERM_2koIfWNpD3dOkE6Q8YXArJ.xml
@@ -0,0 +1,7 @@
+
+
+ Annotation used to illustrate lines connecting points of equal temperature on a map or chart.
+
+>EXAMPLE Typically used in to show the heating or cooling distribution within a space or to show temperature distribution on a geographic map.
+
+
diff --git a/IFC4x3/Constants/k/KILOPOINT_04lMKO3TX7iuTAK7xaIR10.xml b/IFC4x3/Constants/k/KILOPOINT_04lMKO3TX7iuTAK7xaIR10.xml
new file mode 100644
index 000000000..2905274b5
--- /dev/null
+++ b/IFC4x3/Constants/k/KILOPOINT_04lMKO3TX7iuTAK7xaIR10.xml
@@ -0,0 +1,5 @@
+
+
+ Kilo point
+
+
diff --git a/IFC4x3/Constants/l/LEADER_2LaYi9ivzC5xPCTYEno1so.xml b/IFC4x3/Constants/l/LEADER_2LaYi9ivzC5xPCTYEno1so.xml
new file mode 100644
index 000000000..e53f37fb9
--- /dev/null
+++ b/IFC4x3/Constants/l/LEADER_2LaYi9ivzC5xPCTYEno1so.xml
@@ -0,0 +1,7 @@
+
+
+ Annotation that includes a line or arrow.
+
+>EXAMPLE Typically used to connect an object to a specific point of reference or to an explanation.
+
+
diff --git a/IFC4x3/Constants/m/MILEPOINT_29sFZrnybFQP2rA6f23AYS.xml b/IFC4x3/Constants/m/MILEPOINT_29sFZrnybFQP2rA6f23AYS.xml
new file mode 100644
index 000000000..3a7874ee4
--- /dev/null
+++ b/IFC4x3/Constants/m/MILEPOINT_29sFZrnybFQP2rA6f23AYS.xml
@@ -0,0 +1,5 @@
+
+
+ Mile point
+
+
diff --git a/IFC4x3/Constants/n/NON_PHYSICAL_SIGNAL_29M9iosMPAt95pX0XMsWlM.xml b/IFC4x3/Constants/n/NON_PHYSICAL_SIGNAL_29M9iosMPAt95pX0XMsWlM.xml
deleted file mode 100644
index 5cf3d03ef..000000000
--- a/IFC4x3/Constants/n/NON_PHYSICAL_SIGNAL_29M9iosMPAt95pX0XMsWlM.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- A virtual or fictitious signal. As opposed to the physical signal, the non-physical signal does not need to send information to the train. E.g. a fictitious signal on the signalman's display needed to define the route exit towards open line where there's no real signal. A virtual ERTMS L2 signal is also a non-physical signal but can have a physical presence, i.e. a stop marker board along the track.
-
-
diff --git a/IFC4x3/Constants/s/SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y.xml b/IFC4x3/Constants/s/SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y.xml
new file mode 100644
index 000000000..4915fc17a
--- /dev/null
+++ b/IFC4x3/Constants/s/SURVEY_0bUzI9_Mz1gOrZ$Cjje63Y.xml
@@ -0,0 +1,8 @@
+
+
+ Annotation used for survey information, such as survey points, survey lines or survey areas.
+
+>EXAMPLE Typically used in surveying or mapping to indicate the location, elevation, or other relevant data about a specific point or area.
+>NOTE The shape representation of the _IfcAnnotation_ indicates if it is a survey point, survey line, survey area or any other type of representation connected to survey.
+
+
diff --git a/IFC4x3/Constants/s/SYMBOL_3vP2xXztvFBg7Qtz1PsrtH.xml b/IFC4x3/Constants/s/SYMBOL_3vP2xXztvFBg7Qtz1PsrtH.xml
new file mode 100644
index 000000000..41feb7d21
--- /dev/null
+++ b/IFC4x3/Constants/s/SYMBOL_3vP2xXztvFBg7Qtz1PsrtH.xml
@@ -0,0 +1,5 @@
+
+
+ Annotation that employs graphical symbols or icons to represent specific meanings.
+
+
diff --git a/IFC4x3/Constants/t/TEXT_2xYMbndJb1U9AQip7Vkanz.xml b/IFC4x3/Constants/t/TEXT_2xYMbndJb1U9AQip7Vkanz.xml
new file mode 100644
index 000000000..fbb768f39
--- /dev/null
+++ b/IFC4x3/Constants/t/TEXT_2xYMbndJb1U9AQip7Vkanz.xml
@@ -0,0 +1,5 @@
+
+
+ A textual annotation.
+
+
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRelAssociatesMaterial/DocEntity.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRelAssociatesMaterial/DocEntity.xml
index 4aa70ecb1..69de4cf4f 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRelAssociatesMaterial/DocEntity.xml
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcRelAssociatesMaterial/DocEntity.xml
@@ -24,8 +24,6 @@
SIZEOF(TYPEOF(temp) * [
'IFCPRODUCTEXTENSION.IFCELEMENT',
'IFCPRODUCTEXTENSION.IFCELEMENTTYPE',
- 'IFCSHAREDBLDGELEMENTS.IFCWINDOWSTYLE',
- 'IFCSHAREDBLDGELEMENTS.IFCDOORSTYLE',
'IFCSTRUCTURALANALYSISDOMAIN.IFCSTRUCTURALMEMBER',
'IFCPRODUCTEXTENSION.IFCPORT',
'IFCSHAREDINFRASTRUCTUREELEMENTS.IFCGEOSCIENCEOBSERVATION']) = 0)
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/DocEntity.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/DocEntity.xml
index 938a16caa..3dae14d2b 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/DocEntity.xml
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/DocEntity.xml
@@ -7,10 +7,16 @@
-
-
-
+ A list of types to further identify the object. Some property sets may be specifically applicable to one of these types.
+
+ >NOTE If the object has an associated IfcTypeObject with a PredefinedType, then this attribute shall not be used.
+
+
+ The attribute ObjectType shall be given if the predefined type is set to USERDEFINED.
+ NOT EXISTS(PredefinedType) OR (PredefinedType <> IfcVirtualElementTypeEnum.USERDEFINED) OR EXISTS(SELF\IfcObject.ObjectType);
+
+
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/Documentation.md b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/Documentation.md
index 6e10e42d9..4b1e791ee 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/Documentation.md
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Entities/IfcVirtualElement/Documentation.md
@@ -10,3 +10,5 @@ The _IfcVirtualElement_ is mainly used to define a virtual boundary between two
{ .change-ifc2x3}
> IFC2x2 CHANGE The entity _IfcVirtualElement_ has been added. Upward compatibility for file based exchange is guaranteed.
+
+> IFC4.3.0.0-CHANGE Virtual elements can now be used for void provisions and clearance to replace existing functionality on _IfcBuildingElementProxy_.
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcAnnotationTypeEnum/DocEnumeration.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcAnnotationTypeEnum/DocEnumeration.xml
index a44e10f18..54ad500b4 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcAnnotationTypeEnum/DocEnumeration.xml
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcAnnotationTypeEnum/DocEnumeration.xml
@@ -1,15 +1,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcReferentTypeEnum/DocEnumeration.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcReferentTypeEnum/DocEnumeration.xml
index 5c1ec8581..fdf4b2eba 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcReferentTypeEnum/DocEnumeration.xml
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcReferentTypeEnum/DocEnumeration.xml
@@ -4,12 +4,16 @@
-
-
-
+
+
+
+
+
+
+
diff --git a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcVirtualElementTypeEnum/DocEnumeration.xml b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcVirtualElementTypeEnum/DocEnumeration.xml
index 5ebb8a01c..35920cd2b 100644
--- a/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcVirtualElementTypeEnum/DocEnumeration.xml
+++ b/IFC4x3/Sections/Core data schemas/Schemas/IfcProductExtension/Types/IfcVirtualElementTypeEnum/DocEnumeration.xml
@@ -1,6 +1,5 @@
-
-
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricModelResource/Entities/IfcRevolvedAreaSolid/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricModelResource/Entities/IfcRevolvedAreaSolid/DocEntity.xml
index 92eecd2bb..ac9e6ac6d 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricModelResource/Entities/IfcRevolvedAreaSolid/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometricModelResource/Entities/IfcRevolvedAreaSolid/DocEntity.xml
@@ -21,7 +21,7 @@
The start of the axis shall lie in the XY plane of the position coordinate system.
- Axis.Location.Coordinates[3] = 0.0
+ ('IFC4X3_ADD2.IFCCARTESIANPOINT' IN TYPEOF(Axis.Location)) AND (Axis.Location\IfcCartesianPoint.Coordinates[3] = 0.0)
The direction of the axis shall be parallel to the XY plane of the position coordinate system.
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcCartesianPoint/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcCartesianPoint/DocEntity.xml
index 92ce807ad..017e3b07a 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcCartesianPoint/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcCartesianPoint/DocEntity.xml
@@ -9,10 +9,6 @@
The first, second, and third coordinate of the point location. If placed in a two or three dimensional rectangular Cartesian coordinate system, Coordinates[1] is the X coordinate, Coordinates[2] is the Y coordinate, and Coordinates[3] is the Z coordinate.
-
- The space dimensionality of this class, determined by the number of coordinates in the List of Coordinates.
- HIINDEX(Coordinates)
-
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPoint/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPoint/DocEntity.xml
index 0d5fb1219..b824ac34c 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPoint/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPoint/DocEntity.xml
@@ -5,5 +5,11 @@
+
+
+ The space dimensionality of this abstract class, handled by a function specific for concrete subtypes. Determined by the number of coordinate components in case of IfcCartesianPoint or by the dimensionality of the basis curve or surface in other cases.
+ IfcPointDim(SELF)
+
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointByDistanceExpression/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointByDistanceExpression/DocEntity.xml
index a86b00093..1dfc51169 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointByDistanceExpression/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointByDistanceExpression/DocEntity.xml
@@ -17,9 +17,6 @@
Offset parallel to the basis curve after applying DistanceAlong, OffsetLateral, and OffsetVertical to reach locations for the case of a tangentially discontinuous basis curve.
-
- BasisCurve.Dim
-
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnCurve/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnCurve/DocEntity.xml
index b19e5e386..9b7cb6dfd 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnCurve/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnCurve/DocEntity.xml
@@ -12,10 +12,6 @@
The parameter value of the point location.
-
- The space dimensionality of this class, determined by the space dimensionality of the basis curve.
- BasisCurve.Dim
-
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnSurface/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnSurface/DocEntity.xml
index 1302c74d6..84b3a41e5 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnSurface/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcPointOnSurface/DocEntity.xml
@@ -15,10 +15,6 @@
The second parameter value of the point location.
-
- The space dimensionality of this class, determined by the space dimensionality of the basis surface.
- BasisSurface.Dim
-
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcSpiral/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcSpiral/DocEntity.xml
index b552bb33a..b98e49c51 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcSpiral/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Entities/IfcSpiral/DocEntity.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/DocFunction.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/DocFunction.xml
new file mode 100644
index 000000000..68a1ebe32
--- /dev/null
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/DocFunction.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Documentation.md b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Documentation.md
new file mode 100644
index 000000000..dfc6e59f4
--- /dev/null
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Documentation.md
@@ -0,0 +1,5 @@
+This function checks the dimensionality of the various subtypes of IfcPoint.
+
+Returns the number of coordinate components in case of IfcCartesianPoint or the dimensionality of the basis curve or surface in other cases.
+
+> HISTORY New function in IFC4.3.0.1
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Expression.txt b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Expression.txt
new file mode 100644
index 000000000..6bfd4820f
--- /dev/null
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Functions/IfcPointDim/Expression.txt
@@ -0,0 +1,16 @@
+ (Point : IfcPoint)
+ : IfcDimensionCount;
+
+ IF ('IFC4X3_ADD2.IFCCARTESIANPOINT' IN TYPEOF(Point))
+ THEN RETURN(HIINDEX(Point\IfcCartesianPoint.Coordinates));
+ END_IF;
+ IF ('IFC4X3_ADD2.IFCPOINTBYDISTANCEEXPRESSION' IN TYPEOF(Point))
+ THEN RETURN(Point\IfcPointByDistanceExpression.BasisCurve.Dim);
+ END_IF;
+ IF ('IFC4X3_ADD2.IFCPOINTONCURVE' IN TYPEOF(Point))
+ THEN RETURN(Point\IfcPointOnCurve.BasisCurve.Dim);
+ END_IF;
+ IF ('IFC4X3_ADD2.IFCPOINTONSURFACE' IN TYPEOF(Point))
+ THEN RETURN(Point\IfcPointOnSurface.BasisSurface.Dim);
+ END_IF;
+ RETURN (?);
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Types/IfcCurveMeasureSelect/DocSelect.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Types/IfcCurveMeasureSelect/DocSelect.xml
index 535d002bb..f56008d05 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Types/IfcCurveMeasureSelect/DocSelect.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcGeometryResource/Types/IfcCurveMeasureSelect/DocSelect.xml
@@ -5,3 +5,4 @@
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/DocDefined.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/DocDefined.xml
index cbee6413f..114706bb0 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/DocDefined.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/DocDefined.xml
@@ -1,9 +1,9 @@
-
+
-
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/Documentation.md b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/Documentation.md
index 2a108ef4d..5bdcc5855 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/Documentation.md
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcMeasureResource/Types/IfcCountMeasure/Documentation.md
@@ -1,7 +1,9 @@
A count measure is the value of a count of items.
-Type: NUMBER
+Type: INTEGER
> NOTE Type adapted from **count_measure** defined in ISO 10303-41.
> HISTORY New type in IFC1.5.1.
+
+> HISTORY IFC4.3.0.0 Type changed from NUMBER to INTEGER
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcPresentationAppearanceResource/Entities/IfcTextureCoordinateIndicesWithVoids/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcPresentationAppearanceResource/Entities/IfcTextureCoordinateIndicesWithVoids/DocEntity.xml
index 41e1a975b..9e53cf69d 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcPresentationAppearanceResource/Entities/IfcTextureCoordinateIndicesWithVoids/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcPresentationAppearanceResource/Entities/IfcTextureCoordinateIndicesWithVoids/DocEntity.xml
@@ -1,12 +1,8 @@
-
-
+
-
-
-
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/DocSchema.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/DocSchema.xml
index 4a7be211e..2d7b3753c 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/DocSchema.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/DocSchema.xml
@@ -19,6 +19,7 @@
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityCount/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityCount/DocEntity.xml
index b4f482005..340c1b22c 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityCount/DocEntity.xml
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityCount/DocEntity.xml
@@ -18,7 +18,7 @@
The value of the count shall be greater than or equal to zero.
- CountValue >= 0.
+ CountValue >= 0
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/DocEntity.xml b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/DocEntity.xml
new file mode 100644
index 000000000..d32d803d1
--- /dev/null
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/DocEntity.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ Count measure value of this quantity.
+
+
+ A formula by which the quantity has been calculated. It can be assigned in addition to the actual value of the quantity. Formulas could be mathematic calculations (like width x height), database links, or a combination. The formula is for informational purposes only.
+
+> IFC4 CHANGE Attribute added to the end of the attribute list.
+
+
+
+
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/Documentation.md b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/Documentation.md
new file mode 100644
index 000000000..228ebbfc3
--- /dev/null
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcQuantityResource/Entities/IfcQuantityNumber/Documentation.md
@@ -0,0 +1,5 @@
+> NOTE This entity is not part of a standardized schema subset or implementation level.
+
+IfcQuantityNumber is a physical quantity that defines a derived number measure (integer or non-integer) to provide an element's physical property. It is normally derived from the physical properties of the element under the specific measure rules given by a method of measurement.
+
+> HISTORY IFC4.3.0.0 New entity. It has been introduced to provide additional clarity to have IfcQuantityCount strictly constrained to an integer.
diff --git a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcRepresentationResource/Functions/IfcShapeRepresentationTypes/Expression.txt b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcRepresentationResource/Functions/IfcShapeRepresentationTypes/Expression.txt
index c704574fd..959db7ac7 100644
--- a/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcRepresentationResource/Functions/IfcShapeRepresentationTypes/Expression.txt
+++ b/IFC4x3/Sections/Resource definition data schemas/Schemas/IfcRepresentationResource/Functions/IfcShapeRepresentationTypes/Expression.txt
@@ -7,12 +7,13 @@
CASE RepType OF
'Point' :
BEGIN
- Count := SIZEOF(QUERY(temp <* Items | ('IFCGEOMETRYRESOURCE.IFCPOINT' IN TYPEOF(temp))));
+ Count := SIZEOF(QUERY(temp <* Items | ('IFCGEOMETRYRESOURCE.IFCPOINT' IN TYPEOF(temp))
+ OR ('IFCGEOMETRICMODELRESOURCE.IFCCARTESIANPOINTLIST' IN TYPEOF(temp))));
END;
'PointCloud' :
BEGIN
- Count := SIZEOF(QUERY(temp <* Items | ('IFCGEOMETRYRESOURCE.IFCCARTESIANPOINTLIST3D' IN TYPEOF(temp))));
+ Count := SIZEOF(QUERY(temp <* Items | ('IFCGEOMETRICMODELRESOURCE.IFCCARTESIANPOINTLIST3D' IN TYPEOF(temp))));
END;
'Curve' :