diff --git a/_test_simple.ifc b/_test_simple.ifc
index fa828ca..9630177 100644
--- a/_test_simple.ifc
+++ b/_test_simple.ifc
@@ -4659,10 +4659,10 @@ DATA;
 #5961=IFCSHAPEREPRESENTATION(#11,'Body','MappedRepresentation',(#5960));
 #5962=IFCPRODUCTDEFINITIONSHAPE($,$,(#5961));
 #5963=IFCWALL('09HorAnUL0OQlDqI_PTE63',$,'extension south wall',$,$,#6072,#6018,$,$);
-#5964=IFCWALL('3qcGaF0Yr4V9BffHarUr5$',$,'extension west wall',$,$,#6052,#6019,$,$);
-#5965=IFCWALL('0tED2GeYz9XwxeQcd9Fn49',$,'extension east wall',$,$,#6067,#6020,$,$);
-#5966=IFCWALL('2d1hv_$YX1kwDVs$GFNVtK',$,'service partition',$,$,#6057,#6021,$,$);
-#5967=IFCWALL('1PaLULQ852m8y5R7mXVEHR',$,'wc-kitchen divider',$,$,#6062,#6022,$,$);
+#5964=IFCWALL('3qcGaF0Yr4V9BffHarUr5$',$,'extension west wall',$,$,#7074,#6019,$,$);
+#5965=IFCWALL('0tED2GeYz9XwxeQcd9Fn49',$,'extension east wall',$,$,#7069,#6020,$,$);
+#5966=IFCWALL('2d1hv_$YX1kwDVs$GFNVtK',$,'service partition',$,$,#7099,#6021,$,$);
+#5967=IFCWALL('1PaLULQ852m8y5R7mXVEHR',$,'wc-kitchen divider',$,$,#7114,#7165,$,$);
 #5968=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.33),(4.,0.33),(4.,0.),(0.,0.)));
 #5969=IFCINDEXEDPOLYCURVE(#5968,$,.F.);
 #5970=IFCDIRECTION((0.,0.,1.));
@@ -4703,41 +4703,10 @@ DATA;
 #6005=IFCAXIS2PLACEMENT3D(#6002,#6003,#6004);
 #6006=IFCEXTRUDEDAREASOLID(#6001,#6005,#6000,2.5);
 #6007=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#6006));
-#6008=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.1),(3.,0.1),(3.,0.),(0.,0.)));
-#6009=IFCINDEXEDPOLYCURVE(#6008,$,.F.);
-#6010=IFCDIRECTION((0.,0.,1.));
-#6011=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#6009);
-#6012=IFCCARTESIANPOINT((0.,0.,0.));
-#6013=IFCDIRECTION((0.,0.,1.));
-#6014=IFCDIRECTION((1.,0.,0.));
-#6015=IFCAXIS2PLACEMENT3D(#6012,#6013,#6014);
-#6016=IFCEXTRUDEDAREASOLID(#6011,#6015,#6010,2.5);
-#6017=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#6016));
 #6018=IFCPRODUCTDEFINITIONSHAPE($,$,(#5977));
 #6019=IFCPRODUCTDEFINITIONSHAPE($,$,(#5987));
 #6020=IFCPRODUCTDEFINITIONSHAPE($,$,(#5997));
 #6021=IFCPRODUCTDEFINITIONSHAPE($,$,(#6007));
-#6022=IFCPRODUCTDEFINITIONSHAPE($,$,(#6017));
-#6048=IFCCARTESIANPOINT((-2.,-7.,0.));
-#6049=IFCDIRECTION((0.,0.,1.));
-#6050=IFCDIRECTION((0.,1.,0.));
-#6051=IFCAXIS2PLACEMENT3D(#6048,#6049,#6050);
-#6052=IFCLOCALPLACEMENT(#92,#6051);
-#6053=IFCCARTESIANPOINT((-2.,-4.,0.));
-#6054=IFCDIRECTION((0.,0.,1.));
-#6055=IFCDIRECTION((1.,0.,0.));
-#6056=IFCAXIS2PLACEMENT3D(#6053,#6054,#6055);
-#6057=IFCLOCALPLACEMENT(#92,#6056);
-#6058=IFCCARTESIANPOINT((0.,-4.,0.));
-#6059=IFCDIRECTION((0.,0.,1.));
-#6060=IFCDIRECTION((0.,-1.,0.));
-#6061=IFCAXIS2PLACEMENT3D(#6058,#6059,#6060);
-#6062=IFCLOCALPLACEMENT(#92,#6061);
-#6063=IFCCARTESIANPOINT((2.,-3.,0.));
-#6064=IFCDIRECTION((0.,0.,1.));
-#6065=IFCDIRECTION((0.,-1.,0.));
-#6066=IFCAXIS2PLACEMENT3D(#6063,#6064,#6065);
-#6067=IFCLOCALPLACEMENT(#92,#6066);
 #6068=IFCCARTESIANPOINT((-2.,-7.,0.));
 #6069=IFCDIRECTION((0.,0.,1.));
 #6070=IFCDIRECTION((1.,0.,0.));
@@ -4809,10 +4778,10 @@ DATA;
 #6225=IFCDIRECTION((1.,0.,0.));
 #6226=IFCAXIS2PLACEMENT3D(#6223,#6224,#6225);
 #6227=IFCLOCALPLACEMENT(#92,#6226);
-#6228=IFCOPENINGELEMENT('2u4F3q7w169eyJ3M975MG0',$,'wc door opening',$,$,#6427,#6398,$,$);
-#6229=IFCOPENINGELEMENT('0ehxJvCx11IPAfp8RdmEya',$,'kitchenette door opening',$,$,#6433,#6399,$,$);
-#6230=IFCDOOR('3OgS0iC1f6sQYVDnwAtKs3',$,'wc door',$,$,#6440,#6453,$,$,$,$,$,$);
-#6231=IFCDOOR('3Lfsh275P5p9upb17NZ8ty',$,'kitchenette door',$,$,#6445,#6461,$,$,$,$,$,$);
+#6228=IFCOPENINGELEMENT('2u4F3q7w169eyJ3M975MG0',$,'wc door opening',$,$,#7124,#6398,$,$);
+#6229=IFCOPENINGELEMENT('0ehxJvCx11IPAfp8RdmEya',$,'kitchenette door opening',$,$,#7139,#6399,$,$);
+#6230=IFCDOOR('3OgS0iC1f6sQYVDnwAtKs3',$,'wc door',$,$,#7129,#6453,$,$,$,$,$,$);
+#6231=IFCDOOR('3Lfsh275P5p9upb17NZ8ty',$,'kitchenette door',$,$,#7144,#6461,$,$,$,$,$,$);
 #6232=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.3),(0.8,0.3),(0.8,0.),(0.,0.)));
 #6233=IFCINDEXEDPOLYCURVE(#6232,$,.F.);
 #6234=IFCDIRECTION((0.,0.,1.));
@@ -4836,29 +4805,9 @@ DATA;
 #6398=IFCPRODUCTDEFINITIONSHAPE($,$,(#6241));
 #6399=IFCPRODUCTDEFINITIONSHAPE($,$,(#6251));
 #6422=IFCRELVOIDSELEMENT('28UyL50ZL76gHei1hMIpZr',$,$,$,#5966,#6228);
-#6423=IFCCARTESIANPOINT((0.6,-0.0499999999999998,0.));
-#6424=IFCDIRECTION((0.,0.,1.));
-#6425=IFCDIRECTION((1.,0.,0.));
-#6426=IFCAXIS2PLACEMENT3D(#6423,#6424,#6425);
-#6427=IFCLOCALPLACEMENT(#6057,#6426);
 #6428=IFCRELVOIDSELEMENT('3zOHQfdH93zAkf39kcNzTL',$,$,$,#5966,#6229);
-#6429=IFCCARTESIANPOINT((2.6,-0.0499999999999998,0.));
-#6430=IFCDIRECTION((0.,0.,1.));
-#6431=IFCDIRECTION((1.,0.,0.));
-#6432=IFCAXIS2PLACEMENT3D(#6429,#6430,#6431);
-#6433=IFCLOCALPLACEMENT(#6057,#6432);
 #6434=IFCRELFILLSELEMENT('0CuGDM5KP8nPRjv1J9HqCC',$,$,$,#6228,#6230);
 #6435=IFCRELFILLSELEMENT('0zhYzZ2$r6$eWi1PKC4Enn',$,$,$,#6229,#6231);
-#6436=IFCCARTESIANPOINT((0.,0.,0.));
-#6437=IFCDIRECTION((0.,0.,1.));
-#6438=IFCDIRECTION((1.,0.,0.));
-#6439=IFCAXIS2PLACEMENT3D(#6436,#6437,#6438);
-#6440=IFCLOCALPLACEMENT(#6427,#6439);
-#6441=IFCCARTESIANPOINT((-1.11022302462516E-16,0.,0.));
-#6442=IFCDIRECTION((0.,0.,1.));
-#6443=IFCDIRECTION((1.,0.,0.));
-#6444=IFCAXIS2PLACEMENT3D(#6441,#6442,#6443);
-#6445=IFCLOCALPLACEMENT(#6433,#6444);
 #6446=IFCCARTESIANPOINT((0.,0.,0.));
 #6447=IFCDIRECTION((1.,0.,0.));
 #6448=IFCDIRECTION((0.,1.,0.));
@@ -4890,7 +4839,7 @@ DATA;
 #6508=IFCAXIS2PLACEMENT3D(#6505,#6506,#6507);
 #6509=IFCEXTRUDEDAREASOLID(#6504,#6508,#6503,3.5);
 #6510=IFCCARTESIANPOINT((0.,0.,2.384));
-#6511=IFCDIRECTION((0.419,0.,-0.908));
+#6511=IFCDIRECTION((-0.419,0.,0.908));
 #6512=IFCDIRECTION((0.,-1.,0.));
 #6513=IFCAXIS2PLACEMENT3D(#6510,#6511,#6512);
 #6514=IFCPLANE(#6513);
@@ -4907,14 +4856,14 @@ DATA;
 #6525=IFCAXIS2PLACEMENT3D(#6522,#6523,#6524);
 #6526=IFCEXTRUDEDAREASOLID(#6521,#6525,#6520,3.5);
 #6527=IFCCARTESIANPOINT((0.,0.,3.26));
-#6528=IFCDIRECTION((-0.419,0.,-0.908));
+#6528=IFCDIRECTION((0.419,0.,0.908));
 #6529=IFCDIRECTION((0.,1.,-0.));
 #6530=IFCAXIS2PLACEMENT3D(#6527,#6528,#6529);
 #6531=IFCPLANE(#6530);
 #6532=IFCHALFSPACESOLID(#6531,.F.);
 #6533=IFCBOOLEANCLIPPINGRESULT(.DIFFERENCE.,#6526,#6532);
 #6534=IFCSHAPEREPRESENTATION(#11,'Body','Clipping',(#6533));
-#6535=IFCOPENINGELEMENT('3XCVGMKkLCDBw_cj6UfBkX',$,'wc west window opening',$,$,#6723,#6579,$,.OPENING.);
+#6535=IFCOPENINGELEMENT('3XCVGMKkLCDBw_cj6UfBkX',$,'wc west window opening',$,$,#7084,#6579,$,.OPENING.);
 #6536=IFCOPENINGELEMENT('3Um_AZAh19VwS2QVi$vxVC',$,'wc south window opening',$,$,#6614,#6580,$,.OPENING.);
 #6537=IFCOPENINGELEMENT('0eEGfmac97Pw2r_1OHXmAZ',$,'kitchenette east window opening',$,$,#6620,#6581,$,.OPENING.);
 #6538=IFCOPENINGELEMENT('3ptm7A8Yb0K8zWa9TWO1JY',$,'kitchenette south window opening',$,$,#6626,#6582,$,.OPENING.);
@@ -4974,14 +4923,14 @@ DATA;
 #6617=IFCDIRECTION((0.,0.,1.));
 #6618=IFCDIRECTION((-1.,0.,0.));
 #6619=IFCAXIS2PLACEMENT3D(#6616,#6617,#6618);
-#6620=IFCLOCALPLACEMENT(#6067,#6619);
+#6620=IFCLOCALPLACEMENT(#7069,#6619);
 #6621=IFCRELVOIDSELEMENT('1CRb_RTTD7gQHKyE6v3jiG',$,$,$,#5963,#6538);
 #6622=IFCCARTESIANPOINT((2.6875,0.,0.9));
 #6623=IFCDIRECTION((0.,0.,1.));
 #6624=IFCDIRECTION((1.,0.,0.));
 #6625=IFCAXIS2PLACEMENT3D(#6622,#6623,#6624);
 #6626=IFCLOCALPLACEMENT(#6072,#6625);
-#6627=IFCWINDOW('2NBW01IIrFpfL9S45NhAO2',$,'wc west window',$,$,#6733,#6684,$,$,$,$,$,$);
+#6627=IFCWINDOW('2NBW01IIrFpfL9S45NhAO2',$,'wc west window',$,$,#7094,#6684,$,$,$,$,$,$);
 #6628=IFCWINDOW('2bn9sUKCf3qfl2ZMPB3w2N',$,'wc south window',$,$,#6661,#6692,$,$,$,$,$,$);
 #6629=IFCWINDOW('14ThWkSln9MwS3k9dCmXhA',$,'kitchenette east window',$,$,#6667,#6700,$,$,$,$,$,$);
 #6630=IFCWINDOW('08qEBaJOv60QsZlHGnKpBY',$,'kitchenette south window',$,$,#6672,#6708,$,$,$,$,$,$);
@@ -5038,16 +4987,6 @@ DATA;
 #6706=IFCMAPPEDITEM(#5873,#6705);
 #6707=IFCSHAPEREPRESENTATION(#11,'Body','MappedRepresentation',(#6706));
 #6708=IFCPRODUCTDEFINITIONSHAPE($,$,(#6707));
-#6719=IFCCARTESIANPOINT((0.6875,0.,0.9));
-#6720=IFCDIRECTION((0.,0.,1.));
-#6721=IFCDIRECTION((1.,0.,0.));
-#6722=IFCAXIS2PLACEMENT3D(#6719,#6720,#6721);
-#6723=IFCLOCALPLACEMENT(#6052,#6722);
-#6729=IFCCARTESIANPOINT((0.,0.,0.));
-#6730=IFCDIRECTION((0.,0.,1.));
-#6731=IFCDIRECTION((1.,0.,0.));
-#6732=IFCAXIS2PLACEMENT3D(#6729,#6730,#6731);
-#6733=IFCLOCALPLACEMENT(#6723,#6732);
 #6734=IFCCARTESIANPOINT((0.,0.,0.));
 #6735=IFCDIRECTION((0.,0.,1.));
 #6736=IFCDIRECTION((1.,0.,0.));
@@ -5227,9 +5166,9 @@ DATA;
 #6954=IFCSHAPEREPRESENTATION(#24,'Body','Curve2D',(#6946,#6948,#6951,#6953));
 #6955=IFCREPRESENTATIONMAP(#6939,#6954);
 #6956=IFCSANITARYTERMINALTYPE('2RWyo9tFj1UxIXXqoldH5y',$,'Generic Small Sink',$,$,$,(#6935,#6955),$,$,.NOTDEFINED.);
-#6957=IFCSANITARYTERMINAL('07$4mK3SX3vwKWLS0WLkBh',$,'wc toilet',$,$,#7049,#6969,$,$);
+#6957=IFCSANITARYTERMINAL('07$4mK3SX3vwKWLS0WLkBh',$,'wc toilet',$,$,#7149,#6969,$,$);
 #6958=IFCSANITARYTERMINAL('3u4Xv2VSj1NwyZPdD_Uheg',$,'wc basin',$,$,#7054,#6985,$,$);
-#6959=IFCFURNITURE('0MuI4no5nDGP5WPlpQswVk',$,'kitchenette bench',$,$,#7059,#7001,$,$);
+#6959=IFCFURNITURE('0MuI4no5nDGP5WPlpQswVk',$,'kitchenette bench',$,$,#7154,#7001,$,$);
 #6960=IFCSANITARYTERMINAL('3ZnkgWLA12gxvj8wXAPlZr',$,'kitchenette sink',$,$,#7064,#7017,$,$);
 #6961=IFCRELDEFINESBYTYPE('2bwuyrMz58DRvR1MQAPONX',$,$,$,(#6957),#6822);
 #6962=IFCCARTESIANPOINT((0.,0.,0.));
@@ -5295,25 +5234,86 @@ DATA;
 #7022=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#7019,#7020,#7018,1.,#7021);
 #7023=IFCMAPPEDITEM(#6955,#7022);
 #7024=IFCSHAPEREPRESENTATION(#24,'Body','MappedRepresentation',(#7023));
-#7045=IFCCARTESIANPOINT((1.,0.,-0.02));
-#7046=IFCDIRECTION((0.,0.,1.));
-#7047=IFCDIRECTION((1.,0.,0.));
-#7048=IFCAXIS2PLACEMENT3D(#7045,#7046,#7047);
-#7049=IFCLOCALPLACEMENT(#6222,#7048);
 #7050=IFCCARTESIANPOINT((2.,1.25,0.73));
 #7051=IFCDIRECTION((0.,0.,1.));
 #7052=IFCDIRECTION((0.,-1.,0.));
 #7053=IFCAXIS2PLACEMENT3D(#7050,#7051,#7052);
 #7054=IFCLOCALPLACEMENT(#6222,#7053);
-#7055=IFCCARTESIANPOINT((0.125,0.,-0.02));
-#7056=IFCDIRECTION((0.,0.,1.));
-#7057=IFCDIRECTION((1.,0.,0.));
-#7058=IFCAXIS2PLACEMENT3D(#7055,#7056,#7057);
-#7059=IFCLOCALPLACEMENT(#6227,#7058);
 #7060=IFCCARTESIANPOINT((2.,1.225,0.83));
 #7061=IFCDIRECTION((0.,0.,1.));
 #7062=IFCDIRECTION((0.,-1.,0.));
 #7063=IFCAXIS2PLACEMENT3D(#7060,#7061,#7062);
 #7064=IFCLOCALPLACEMENT(#6227,#7063);
+#7065=IFCCARTESIANPOINT((2.,-7.,0.));
+#7066=IFCDIRECTION((0.,0.,1.));
+#7067=IFCDIRECTION((0.,1.,0.));
+#7068=IFCAXIS2PLACEMENT3D(#7065,#7066,#7067);
+#7069=IFCLOCALPLACEMENT(#92,#7068);
+#7070=IFCCARTESIANPOINT((-2.,-3.,0.));
+#7071=IFCDIRECTION((0.,0.,1.));
+#7072=IFCDIRECTION((0.,-1.,0.));
+#7073=IFCAXIS2PLACEMENT3D(#7070,#7071,#7072);
+#7074=IFCLOCALPLACEMENT(#92,#7073);
+#7080=IFCCARTESIANPOINT((3.3125,0.,0.9));
+#7081=IFCDIRECTION((0.,0.,1.));
+#7082=IFCDIRECTION((1.,0.,0.));
+#7083=IFCAXIS2PLACEMENT3D(#7080,#7081,#7082);
+#7084=IFCLOCALPLACEMENT(#7074,#7083);
+#7090=IFCCARTESIANPOINT((0.,0.,0.));
+#7091=IFCDIRECTION((0.,0.,1.));
+#7092=IFCDIRECTION((1.,0.,0.));
+#7093=IFCAXIS2PLACEMENT3D(#7090,#7091,#7092);
+#7094=IFCLOCALPLACEMENT(#7084,#7093);
+#7095=IFCCARTESIANPOINT((-2.,-4.33,0.));
+#7096=IFCDIRECTION((0.,0.,1.));
+#7097=IFCDIRECTION((1.,0.,0.));
+#7098=IFCAXIS2PLACEMENT3D(#7095,#7096,#7097);
+#7099=IFCLOCALPLACEMENT(#92,#7098);
+#7110=IFCCARTESIANPOINT((0.,-4.33,0.));
+#7111=IFCDIRECTION((0.,0.,1.));
+#7112=IFCDIRECTION((0.,-1.,0.));
+#7113=IFCAXIS2PLACEMENT3D(#7110,#7111,#7112);
+#7114=IFCLOCALPLACEMENT(#92,#7113);
+#7120=IFCCARTESIANPOINT((0.6,-0.0499999999999998,0.));
+#7121=IFCDIRECTION((0.,0.,1.));
+#7122=IFCDIRECTION((1.,0.,0.));
+#7123=IFCAXIS2PLACEMENT3D(#7120,#7121,#7122);
+#7124=IFCLOCALPLACEMENT(#7099,#7123);
+#7125=IFCCARTESIANPOINT((0.,0.,0.));
+#7126=IFCDIRECTION((0.,0.,1.));
+#7127=IFCDIRECTION((1.,0.,0.));
+#7128=IFCAXIS2PLACEMENT3D(#7125,#7126,#7127);
+#7129=IFCLOCALPLACEMENT(#7124,#7128);
+#7135=IFCCARTESIANPOINT((2.6,-0.0499999999999998,0.));
+#7136=IFCDIRECTION((0.,0.,1.));
+#7137=IFCDIRECTION((1.,0.,0.));
+#7138=IFCAXIS2PLACEMENT3D(#7135,#7136,#7137);
+#7139=IFCLOCALPLACEMENT(#7099,#7138);
+#7140=IFCCARTESIANPOINT((-1.11022302462516E-16,0.,0.));
+#7141=IFCDIRECTION((0.,0.,1.));
+#7142=IFCDIRECTION((1.,0.,0.));
+#7143=IFCAXIS2PLACEMENT3D(#7140,#7141,#7142);
+#7144=IFCLOCALPLACEMENT(#7139,#7143);
+#7145=IFCCARTESIANPOINT((1.,0.33,-0.02));
+#7146=IFCDIRECTION((0.,0.,1.));
+#7147=IFCDIRECTION((-1.,0.,0.));
+#7148=IFCAXIS2PLACEMENT3D(#7145,#7146,#7147);
+#7149=IFCLOCALPLACEMENT(#6222,#7148);
+#7150=IFCCARTESIANPOINT((0.125,0.33,-0.02));
+#7151=IFCDIRECTION((0.,0.,1.));
+#7152=IFCDIRECTION((1.,0.,0.));
+#7153=IFCAXIS2PLACEMENT3D(#7150,#7151,#7152);
+#7154=IFCLOCALPLACEMENT(#6227,#7153);
+#7155=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.1),(2.67,0.1),(2.67,0.),(0.,0.)));
+#7156=IFCINDEXEDPOLYCURVE(#7155,$,.F.);
+#7157=IFCDIRECTION((0.,0.,1.));
+#7158=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#7156);
+#7159=IFCCARTESIANPOINT((0.,0.,0.));
+#7160=IFCDIRECTION((0.,0.,1.));
+#7161=IFCDIRECTION((1.,0.,0.));
+#7162=IFCAXIS2PLACEMENT3D(#7159,#7160,#7161);
+#7163=IFCEXTRUDEDAREASOLID(#7158,#7162,#7157,2.5);
+#7164=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#7163));
+#7165=IFCPRODUCTDEFINITIONSHAPE($,$,(#7164));
 ENDSEC;
 END-ISO-10303-21;