diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-1000_-300_1_Meter.ifc
index f018dacc..575f00cb 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-1000_1_Meter.ifc
index 97dc53d3..165769a9 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-inf_1_Meter.ifc
index 59e53f65..8c48515c 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-inf_-300_1_Meter.ifc
index f8278ce5..7b1bd7d7 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_1000_300_1_Meter.ifc
index 87bb3f1d..dd8135d5 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_300_inf_1_Meter.ifc
index 9cdafc9f..d67d228d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_inf_300_1_Meter.ifc
index 8084469f..47f09d21 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_BlossCurve_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-1000_-300_1_Meter.ifc
index dae8dd3a..d091823d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-1000_1_Meter.ifc
index dae8dd3a..d091823d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-inf_1_Meter.ifc
index dae8dd3a..d091823d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-inf_-300_1_Meter.ifc
index dae8dd3a..d091823d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_1000_300_1_Meter.ifc
index f57280a7..3cbaa679 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_1000_1_Meter.ifc
index e942bbbc..23f0d66e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_inf_1_Meter.ifc
index e942bbbc..23f0d66e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_inf_300_1_Meter.ifc
index e942bbbc..23f0d66e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CircularArc_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-1000_-300_1_Meter.ifc
index 073d387b..50eeea2d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-1000_1_Meter.ifc
index a0d5be35..fbf77f4b 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-inf_1_Meter.ifc
index b3b69476..282d1ab7 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-inf_-300_1_Meter.ifc
index b5133202..e77f8078 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_1000_300_1_Meter.ifc
index 65ac0fe9..ea2f3eab 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_1000_1_Meter.ifc
index ea7d7012..81dde8dd 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_inf_1_Meter.ifc
index e658307b..56431d14 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_inf_300_1_Meter.ifc
index b954552b..e149302e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Clothoid_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-1000_-300_1_Meter.ifc
index c08cab96..7cf3ede1 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-1000_1_Meter.ifc
index 33f5903d..942bb06c 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-inf_1_Meter.ifc
index 651b5d93..a8f305c4 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-inf_-300_1_Meter.ifc
index 8d1f8676..f7b4e78d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_1000_300_1_Meter.ifc
index cd38ef46..9560887d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_1000_1_Meter.ifc
index afe6742a..c5e7c1f6 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_inf_1_Meter.ifc
index 19a6785a..b9d0429b 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_inf_300_1_Meter.ifc
index 2b71588b..5f2ce422 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_CosineCurve_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-1000_-300_1_Meter.ifc
index f39b3d39..2e195230 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-1000_1_Meter.ifc
index 707f37f9..1d5b925e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-inf_1_Meter.ifc
index 5a3c6d35..5b35664a 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-inf_-300_1_Meter.ifc
index c636863b..6d726345 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_1000_300_1_Meter.ifc
index 9feb9c0b..d605330c 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_1000_1_Meter.ifc
index 4a090389..c08e8a7d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_inf_1_Meter.ifc
index 806075b3..c85cbb55 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_inf_300_1_Meter.ifc
index 79e14c83..92a8206e 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Cubic_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-1000_-300_1_Meter.ifc
index fd54bd9d..7a724d78 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-1000_1_Meter.ifc
index 271738e8..9d9edd3f 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-inf_1_Meter.ifc
index 800a1052..bc6e9815 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-inf_-300_1_Meter.ifc
index 9561cb9f..74c81bb3 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_1000_300_1_Meter.ifc
index 6e01a78e..0ce006d2 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_1000_1_Meter.ifc
index 8217ab9d..d409e398 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_inf_1_Meter.ifc
index ec8c3c02..69fa66f4 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_inf_300_1_Meter.ifc
index 33a96e6b..b2129bd0 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_HelmertCurve_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-1000_-300_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-1000_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-inf_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-inf_-300_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_1000_300_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_1000_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_inf_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_inf_300_1_Meter.ifc
index dbd5e1f5..46755290 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_Line_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-1000_-300_1_Meter.ifc
index c2644484..7597592c 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-1000_1_Meter.ifc
index b1aa9051..d89c1665 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-inf_1_Meter.ifc
index ef135870..41c28214 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-inf_-300_1_Meter.ifc
index 42fba9aa..036245a1 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_1000_300_1_Meter.ifc
index 13413190..785fe8f9 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_1000_1_Meter.ifc
index cde56a13..3410743b 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_inf_1_Meter.ifc
index 429967ba..ad277e9d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_inf_300_1_Meter.ifc
index 43bc1ff2..efb7e0bf 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_SineCurve_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-1000_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-1000_-300_1_Meter.ifc
index d227a704..dba9a110 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-1000_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-1000_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-1000_1_Meter.ifc
index a0063aa3..f831c65f 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-inf_1_Meter.ifc
index 98c43d5a..7910a5b5 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-300_-inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-inf_-300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-inf_-300_1_Meter.ifc
index c661d6ac..81eedf2d 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-inf_-300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_-inf_-300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_1000_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_1000_300_1_Meter.ifc
index c60c4f3b..d02fc10c 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_1000_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_1000_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_1000_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_1000_1_Meter.ifc
index 0f3d8734..035a1743 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_1000_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_1000_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_inf_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_inf_1_Meter.ifc
index 7bc5577f..e104c5c9 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_inf_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_300_inf_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);
diff --git a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_inf_300_1_Meter.ifc b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_inf_300_1_Meter.ifc
index 9324a5c7..928cc1c1 100644
--- a/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_inf_300_1_Meter.ifc
+++ b/alignment_testset/IFC-WithGeneratedGeometry/GENERATED__HorizontalAlignment_VienneseBend_100.0_inf_300_1_Meter.ifc
@@ -2,7 +2,7 @@ ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION (('ViewDefinition [CoordinationView]'), '2;1');
 FILE_NAME ('example-single-transition-curve.ifc', '2022-02-22T22:00:00', ('IFC Rail Technical Services'), ('buildingSMART International RailwayRoom'), 'RDF Ltd. (https://rdf.bg/)', '2019.1.1995.0', '');
-FILE_SCHEMA (('IFC4X3'));
+FILE_SCHEMA (('IFC4X3_ADD2'));
 ENDSEC;
 DATA;
 #1 = IFCPROJECT('1FNFy8AJeHwwz7wDZHIYIu', #3, 'IFC Rail Referencedata', 'Rail alignment sample', $, 'Longname', 'Design', $, #9);