diff --git a/_test_simple.ifc b/_test_simple.ifc
index 5abd672..bb2b7e4 100644
--- a/_test_simple.ifc
+++ b/_test_simple.ifc
@@ -84,7 +84,7 @@ DATA;
 #97=IFCAXIS2PLACEMENT3D(#94,#95,#96);
 #98=IFCLOCALPLACEMENT(#82,#97);
 #99=IFCELEMENTASSEMBLY('1JMWfAC15Dh9jLMGikyiLb',$,'exterior',$,$,#110,$,$,$,$);
-#105=IFCRELCONTAINEDINSPATIALSTRUCTURE('3Pqhf1QtP2Ivceh_6HdxtU',$,$,$,(#1305,#99,#3095,#4285,#4667,#4320,#2162,#2524,#1653),#86);
+#105=IFCRELCONTAINEDINSPATIALSTRUCTURE('3Pqhf1QtP2Ivceh_6HdxtU',$,$,$,(#1305,#99,#3095,#4285,#4320,#2162,#2524,#1653),#86);
 #106=IFCCARTESIANPOINT((-3.44354057312012,3.,0.));
 #107=IFCDIRECTION((0.,0.,1.));
 #108=IFCDIRECTION((0.233915393914003,-0.972256955999831,0.));
@@ -1850,7 +1850,7 @@ DATA;
 #2012=IFCWINDOWTYPE('3drh98S5j1zuYHuhF7t208',$,'sash_big',$,$,(#1760,#1763),(#1890,#1943,#1956,#1965,#2011),$,$,.WINDOW.,.SINGLE_PANEL.,$,$);
 #2013=IFCSTYLEDITEM(#1876,(#582),'Timber');
 #2014=IFCSTYLEDITEM(#1888,(#156),'Masonry');
-#2015=IFCRELDEFINESBYTYPE('2BCgIpFQvEQOqVNzHoHpeE',$,$,$,(#2413,#2332,#2251,#2081,#1742),#2012);
+#2015=IFCRELDEFINESBYTYPE('2BCgIpFQvEQOqVNzHoHpeE',$,$,$,(#2251,#2081,#1742,#2332),#2012);
 #2016=IFCCARTESIANPOINT((0.,0.,0.));
 #2017=IFCDIRECTION((1.,0.,0.));
 #2018=IFCDIRECTION((0.,1.,0.));
@@ -2193,72 +2193,8 @@ DATA;
 #2410=IFCPOLYLINE((#2405,#2406,#2407,#2408,#2409));
 #2411=IFCCURVEBOUNDEDPLANE(#2404,#2410,());
 #2412=IFCCONNECTIONSURFACEGEOMETRY(#2411,$);
-#2413=IFCWINDOW('1XfC63etTE3upDcmPVSTrF',$,'living outside window',$,$,#3655,#2436,$,1.82,0.91,$,$,$);
-#2414=IFCPROPERTYSET('2fleJOwTTDyBZLKPUBF3Yr',$,'EPset_Topology',$,(#2416,#2417,#2418));
-#2415=IFCRELDEFINESBYPROPERTIES('2Zl81btDj0bhogBhhTYg2V',$,$,$,(#2413),#2414);
-#2416=IFCPROPERTYSINGLEVALUE('FaceIndex',$,IFCLABEL('4'),$);
-#2417=IFCPROPERTYSINGLEVALUE('StyleName',$,IFCLABEL('default'),$);
-#2418=IFCPROPERTYSINGLEVALUE('BackCellIndex',$,IFCLABEL('0'),$);
-#2429=IFCCARTESIANPOINT((0.,0.,0.));
-#2430=IFCDIRECTION((1.,0.,0.));
-#2431=IFCDIRECTION((0.,1.,0.));
-#2432=IFCDIRECTION((0.,0.,1.));
-#2433=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#2430,#2431,#2429,1.,#2432);
-#2434=IFCMAPPEDITEM(#1890,#2433);
-#2435=IFCSHAPEREPRESENTATION(#11,'Body','MappedRepresentation',(#2434));
-#2436=IFCPRODUCTDEFINITIONSHAPE($,$,(#2435,#2443,#2450,#2457,#2464));
-#2437=IFCCARTESIANPOINT((0.,0.,0.));
-#2438=IFCDIRECTION((1.,0.,0.));
-#2439=IFCDIRECTION((0.,1.,0.));
-#2440=IFCDIRECTION((0.,0.,1.));
-#2441=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#2438,#2439,#2437,1.,#2440);
-#2442=IFCMAPPEDITEM(#1943,#2441);
-#2443=IFCSHAPEREPRESENTATION(#63,'Clearance','MappedRepresentation',(#2442));
-#2444=IFCCARTESIANPOINT((0.,0.,0.));
-#2445=IFCDIRECTION((1.,0.,0.));
-#2446=IFCDIRECTION((0.,1.,0.));
-#2447=IFCDIRECTION((0.,0.,1.));
-#2448=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#2445,#2446,#2444,1.,#2447);
-#2449=IFCMAPPEDITEM(#1956,#2448);
-#2450=IFCSHAPEREPRESENTATION(#18,'Profile','MappedRepresentation',(#2449));
-#2451=IFCCARTESIANPOINT((0.,0.,0.));
-#2452=IFCDIRECTION((1.,0.,0.));
-#2453=IFCDIRECTION((0.,1.,0.));
-#2454=IFCDIRECTION((0.,0.,1.));
-#2455=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#2452,#2453,#2451,1.,#2454);
-#2456=IFCMAPPEDITEM(#1965,#2455);
-#2457=IFCSHAPEREPRESENTATION(#13,'Box','MappedRepresentation',(#2456));
-#2458=IFCCARTESIANPOINT((0.,0.,0.));
-#2459=IFCDIRECTION((1.,0.,0.));
-#2460=IFCDIRECTION((0.,1.,0.));
-#2461=IFCDIRECTION((0.,0.,1.));
-#2462=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#2459,#2460,#2458,1.,#2461);
-#2463=IFCMAPPEDITEM(#2011,#2462);
-#2464=IFCSHAPEREPRESENTATION(#25,'Annotation','MappedRepresentation',(#2463));
-#2465=IFCSHAPEREPRESENTATION(#11,'Body','Tessellation',(#1941));
-#2466=IFCOPENINGELEMENT('2tqhk1IeP8wRrHUei$zj5d',$,'sash_big',$,$,#2478,#2467,$,.OPENING.);
-#2467=IFCPRODUCTDEFINITIONSHAPE($,$,(#2465));
+#2466=IFCOPENINGELEMENT('2tqhk1IeP8wRrHUei$zj5d',$,'sash_big',$,$,#4810,#4805,$,.OPENING.);
 #2473=IFCRELVOIDSELEMENT('2uVaeJWsH5qhLN7kWvYzaM',$,$,$,#2173,#2466);
-#2474=IFCCARTESIANPOINT((4.08128381093343,-0.25,0.75));
-#2475=IFCDIRECTION((0.,0.,1.));
-#2476=IFCDIRECTION((1.,0.,0.));
-#2477=IFCAXIS2PLACEMENT3D(#2474,#2475,#2476);
-#2478=IFCLOCALPLACEMENT(#2250,#2477);
-#2479=IFCRELFILLSELEMENT('3gFZ5mc_TAGvd7qPExBBtx',$,$,$,#2466,#2413);
-#2480=IFCRELSPACEBOUNDARY2NDLEVEL('3bLuV5zhn2_PCLLI4l_zj7',$,'FaceIndex 4','CellIndex 0',#2997,#2413,#2493,.PHYSICAL.,.EXTERNAL.,#2175,$);
-#2481=IFCCARTESIANPOINT((-2.08128381093343,3.,0.75));
-#2482=IFCDIRECTION((0.,1.,0.));
-#2483=IFCDIRECTION((-1.,0.,0.));
-#2484=IFCAXIS2PLACEMENT3D(#2481,#2482,#2483);
-#2485=IFCPLANE(#2484);
-#2486=IFCCARTESIANPOINT((0.,0.));
-#2487=IFCCARTESIANPOINT((0.91,0.));
-#2488=IFCCARTESIANPOINT((0.91,1.82));
-#2489=IFCCARTESIANPOINT((0.,1.82));
-#2490=IFCCARTESIANPOINT((0.,0.));
-#2491=IFCPOLYLINE((#2486,#2487,#2488,#2489,#2490));
-#2492=IFCCURVEBOUNDEDPLANE(#2485,#2491,());
-#2493=IFCCONNECTIONSURFACEGEOMETRY(#2492,$);
 #2494=IFCFOOTINGTYPE('2v1yWetPf5auqUN$gOOy61',$,'ground beam',$,$,$,$,$,$,.NOTDEFINED.);
 #2495=IFCRELASSOCIATESMATERIAL('3tG5iCV0bDBfEZ17j$ihdb',$,$,$,(#2494),#2507);
 #2496=IFCMATERIAL('Concrete',$,$);
@@ -3239,7 +3175,7 @@ DATA;
 #3592=IFCPRODUCTDEFINITIONSHAPE($,$,(#3591));
 #3593=IFCRELCONNECTSSTRUCTURALMEMBER('2gK6H$AGH6ow8wKSQtEQNk',$,$,$,#3363,#3584,$,$,$,$);
 #3594=IFCRELCONNECTSSTRUCTURALMEMBER('2l8IzIAaz728B49QCfElql',$,$,$,#1382,#3584,$,$,$,$);
-#3595=IFCRELCONTAINEDINSPATIALSTRUCTURE('0oaxPQzDHEpOQPJMGelWyq',$,$,$,(#2251,#2081,#1742,#1459,#1519,#647,#4343,#299,#3048,#4695,#2413,#1245,#1593,#2332),#2997);
+#3595=IFCRELCONTAINEDINSPATIALSTRUCTURE('0oaxPQzDHEpOQPJMGelWyq',$,$,$,(#2251,#2081,#1742,#1459,#1519,#647,#4343,#299,#4811,#3048,#1245,#1593,#2332),#2997);
 #3596=IFCCARTESIANPOINT((0.,0.,-0.02));
 #3597=IFCDIRECTION((0.,0.,1.));
 #3598=IFCDIRECTION((1.,0.,0.));
@@ -3295,11 +3231,6 @@ DATA;
 #3648=IFCDIRECTION((1.,0.,0.));
 #3649=IFCAXIS2PLACEMENT3D(#3646,#3647,#3648);
 #3650=IFCLOCALPLACEMENT(#2397,#3649);
-#3651=IFCCARTESIANPOINT((0.,0.,0.));
-#3652=IFCDIRECTION((0.,0.,1.));
-#3653=IFCDIRECTION((1.,0.,0.));
-#3654=IFCAXIS2PLACEMENT3D(#3651,#3652,#3653);
-#3655=IFCLOCALPLACEMENT(#2478,#3654);
 #3656=IFCCARTESIANPOINTLIST3D(((-2.,-3.,0.),(-2.,-3.,3.),(-2.72177028656006,0.,4.38465929031372),(-3.44354057312012,3.,3.),(-3.44354057312012,3.,0.),(2.,-3.,3.),(2.,-3.,0.),(2.,3.,0.),(2.,0.,4.38465929031372),(2.,3.,3.)));
 #3657=IFCINDEXEDPOLYGONALFACE((1,2,3,4,5));
 #3658=IFCINDEXEDPOLYGONALFACE((6,2,1,7));
@@ -3575,11 +3506,7 @@ DATA;
 #3933=IFCQUANTITYAREA('Area',$,$,2.59146618680234,$);
 #3934=IFCQUANTITYLENGTH('Height',$,$,1.98333302140235,$);
 #3935=IFCQUANTITYLENGTH('Width',$,$,0.995000004768371,$);
-#3936=IFCELEMENTQUANTITY('1qUxcCz1z3BPuVLsnYzO_p',$,'Qto_WindowBaseQuantities',$,'BaseQuantities',(#3938,#3939,#3940));
-#3937=IFCRELDEFINESBYPROPERTIES('0L2tdXK8zCSBYU14PxTKAm',$,$,$,(#2413),#3936);
 #3938=IFCQUANTITYAREA('Area',$,$,2.59146618680234,$);
-#3939=IFCQUANTITYLENGTH('Height',$,$,1.98333302140235,$);
-#3940=IFCQUANTITYLENGTH('Width',$,$,0.995000004768371,$);
 #3941=IFCWORKPLAN('1oOoanHin6f8fl3gUJuoYx',$,'Construction Plan',$,$,$,'2026-02-23T23:51:39.573925',$,$,$,$,'2026-02-23T23:51:39.574118',$,.ACTUAL.);
 #3942=IFCWORKSCHEDULE('0gYQ15_sr4nwN2F_1efOoY',$,'Construction Schedule',$,$,$,'2026-02-23T23:51:47.596165',$,$,$,$,'2026-02-23T23:51:47.595572',$,.PLANNED.);
 #3943=IFCRELAGGREGATES('1PJwHSLpn3Mh49pzMn9Rem',$,$,$,#3941,(#3942));
@@ -3605,7 +3532,7 @@ DATA;
 #3963=IFCRELASSIGNSTOPROCESS('16N2HwfPH6tupu3pdTkUlY',$,$,$,(#3125),$,#3952,$);
 #3964=IFCRELASSIGNSTOPROCESS('1Fzqr7iBz4L9xyNiZyTJGz',$,$,$,(#111,#1316,#1664,#2173),$,#3953,$);
 #3965=IFCRELASSIGNSTOPROCESS('1lhxYL5jH5juiyOh$ZOCtg',$,$,$,(#3241,#3343),$,#3955,$);
-#3966=IFCRELASSIGNSTOPROCESS('04mpLTV4L6Xeu9GgWdXvrI',$,$,$,(#299,#647,#1245,#1459,#1519,#1593,#1742,#2081,#2251,#2332,#2413),$,#3957,$);
+#3966=IFCRELASSIGNSTOPROCESS('04mpLTV4L6Xeu9GgWdXvrI',$,$,$,(#299,#647,#1245,#1459,#1519,#1593,#1742,#2081,#2251,#2332),$,#3957,$);
 #3967=IFCRELASSIGNSTOPROCESS('1nuupdZRD6I9$I8xqbnhpW',$,$,$,(#2798,#2900,#2925,#2973,#2848,#2949),$,#3959,$);
 #3968=IFCRELASSIGNSTOPROCESS('14w$CYP510xudcpVBnZUn8',$,$,$,(#3048),$,#3961,$);
 #3969=IFCRELSEQUENCE('1Eie02rhH3Ket6S3RWMgju',$,$,$,#3950,#3952,$,.FINISH_START.,$);
@@ -3652,7 +3579,7 @@ DATA;
 #4010=IFCRELASSIGNSTOCONTROL('173N4FutH9LPDFsbSuSTNQ',$,$,$,(#2530,#2584,#2637,#2690),$,#3996);
 #4011=IFCRELASSIGNSTOCONTROL('1_2JLTVNT6e8CLf_QU0a37',$,$,$,(#3125),$,#4006);
 #4012=IFCRELASSIGNSTOCONTROL('31M7z$PFL6FAfpI0uaFe69',$,$,$,(#111,#1316,#1664,#2173),$,#3998);
-#4013=IFCRELASSIGNSTOCONTROL('0Att3FEqX9ZBrn362rFcCy',$,$,$,(#299,#647,#1245,#1459,#1519,#1593,#1742,#2081,#2251,#2332,#2413),$,#4000);
+#4013=IFCRELASSIGNSTOCONTROL('0Att3FEqX9ZBrn362rFcCy',$,$,$,(#299,#647,#1245,#1459,#1519,#1593,#1742,#2081,#2251,#2332),$,#4000);
 #4014=IFCRELASSIGNSTOCONTROL('3uQt2Wqc10keWSvrpyH8Zc',$,$,$,(#3241,#3343),$,#4002);
 #4015=IFCRELASSIGNSTOCONTROL('2w9IDcsxnAowYFf1mCahG9',$,$,$,(#2900,#2973),$,#4007);
 #4016=IFCRELASSIGNSTOCONTROL('3lgJoqx1n3ZRqfnEHBigNS',$,$,$,(#2798,#2925),$,#4008);
@@ -4217,44 +4144,42 @@ DATA;
 #4664=IFCSHAPEREPRESENTATION(#11,'Body','Tessellation',(#4663));
 #4665=IFCREPRESENTATIONMAP(#4375,#4664);
 #4666=IFCDOORTYPE('1pBdMgeyX0Vxjow_vwaQ9Q',$,'door_panelled',$,$,(#4368,#4371),(#4665),$,$,.DOOR.,.SINGLE_SWING_LEFT.,$,$);
-#4667=IFCOPENINGELEMENT('3CPxcQNf91ie3670BLvPLj',$,'entrance door opening',$,$,#4694,#4678,$,.OPENING.);
-#4668=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.5),(0.91,0.5),(0.91,0.),(0.,0.)));
-#4669=IFCINDEXEDPOLYCURVE(#4668,$,.F.);
-#4670=IFCDIRECTION((0.,0.,1.));
-#4671=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#4669);
-#4672=IFCCARTESIANPOINT((0.,0.,0.));
-#4673=IFCDIRECTION((0.,0.,1.));
-#4674=IFCDIRECTION((1.,0.,0.));
-#4675=IFCAXIS2PLACEMENT3D(#4672,#4673,#4674);
-#4676=IFCEXTRUDEDAREASOLID(#4671,#4675,#4670,2.2);
-#4677=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#4676));
-#4678=IFCPRODUCTDEFINITIONSHAPE($,$,(#4677));
-#4689=IFCRELVOIDSELEMENT('1muK4S9RbDDuf_PL49$UPo',$,$,$,#2173,#4667);
-#4690=IFCCARTESIANPOINT((5.08,0.,0.));
-#4691=IFCDIRECTION((0.,0.,1.));
-#4692=IFCDIRECTION((1.,0.,0.));
-#4693=IFCAXIS2PLACEMENT3D(#4690,#4691,#4692);
-#4694=IFCLOCALPLACEMENT(#2250,#4693);
-#4695=IFCDOOR('25yab6W856g9y4kFqx2Isy',$,'entrance door',$,$,#4779,#4789,$,2.08,0.91,$,$,$);
-#4775=IFCCARTESIANPOINT((-3.08,3.,-0.02));
-#4776=IFCDIRECTION((0.,0.,1.));
-#4777=IFCDIRECTION((-1.,0.,0.));
-#4778=IFCAXIS2PLACEMENT3D(#4775,#4776,#4777);
-#4779=IFCLOCALPLACEMENT(#3047,#4778);
-#4780=IFCRELFILLSELEMENT('1g_7od6BHC6BvAW8scRSXJ',$,$,$,#4667,#4695);
-#4781=IFCRELDEFINESBYTYPE('17jlmh9_PFjx8HsrmK5EDG',$,$,$,(#4695),#4666);
-#4782=IFCCARTESIANPOINT((0.,0.,0.));
-#4783=IFCDIRECTION((1.,0.,0.));
-#4784=IFCDIRECTION((0.,1.,0.));
-#4785=IFCDIRECTION((0.,0.,1.));
-#4786=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#4783,#4784,#4782,1.,#4785);
-#4787=IFCMAPPEDITEM(#4665,#4786);
-#4788=IFCSHAPEREPRESENTATION(#11,'Body','MappedRepresentation',(#4787));
-#4789=IFCPRODUCTDEFINITIONSHAPE($,$,(#4788));
-#4790=IFCPROPERTYSET('3SLIN8OUH5euiA8ybwQ24d',$,'EPset_Pattern',$,(#4792,#4793,#4794));
-#4791=IFCRELDEFINESBYPROPERTIES('3QW1wHKPb1LeUlc1Wf9Tf0',$,$,$,(#4695),#4790);
-#4792=IFCPROPERTYSINGLEVALUE('PatternNumber',$,IFCLABEL('112/130'),$);
-#4793=IFCPROPERTYSINGLEVALUE('PatternName',$,IFCLABEL('Entrance Transition / Entrance Room'),$);
-#4794=IFCPROPERTYSINGLEVALUE('Notes',$,IFCLABEL('Single panelled door at north wall entrance. Marks threshold between exterior approach and interior gathering space.'),$);
+#4795=IFCCARTESIANPOINTLIST2D(((0.,0.),(0.,0.5),(0.995,0.5),(0.995,0.),(0.,0.)));
+#4796=IFCINDEXEDPOLYCURVE(#4795,$,.F.);
+#4797=IFCDIRECTION((0.,0.,1.));
+#4798=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#4796);
+#4799=IFCCARTESIANPOINT((0.,0.,0.));
+#4800=IFCDIRECTION((0.,0.,1.));
+#4801=IFCDIRECTION((1.,0.,0.));
+#4802=IFCAXIS2PLACEMENT3D(#4799,#4800,#4801);
+#4803=IFCEXTRUDEDAREASOLID(#4798,#4802,#4797,2.2);
+#4804=IFCSHAPEREPRESENTATION(#11,'Body','SweptSolid',(#4803));
+#4805=IFCPRODUCTDEFINITIONSHAPE($,$,(#4804));
+#4806=IFCCARTESIANPOINT((4.08128381093343,-0.25,0.));
+#4807=IFCDIRECTION((0.,0.,1.));
+#4808=IFCDIRECTION((1.,0.,0.));
+#4809=IFCAXIS2PLACEMENT3D(#4806,#4807,#4808);
+#4810=IFCLOCALPLACEMENT(#2250,#4809);
+#4811=IFCDOOR('34kVAZxf9AW9dw7VL_00uH',$,'entrance door',$,$,#4895,#4905,$,2.08,0.91,$,$,$);
+#4891=IFCCARTESIANPOINT((-2.08128381093343,3.25,-0.02));
+#4892=IFCDIRECTION((0.,0.,1.));
+#4893=IFCDIRECTION((-1.,0.,0.));
+#4894=IFCAXIS2PLACEMENT3D(#4891,#4892,#4893);
+#4895=IFCLOCALPLACEMENT(#3047,#4894);
+#4896=IFCRELFILLSELEMENT('05PWrNR3b9xga5doQpElIG',$,$,$,#2466,#4811);
+#4897=IFCRELDEFINESBYTYPE('2c6D0LKy97KfS84gOaPtcK',$,$,$,(#4811),#4666);
+#4898=IFCCARTESIANPOINT((0.,0.,0.));
+#4899=IFCDIRECTION((1.,0.,0.));
+#4900=IFCDIRECTION((0.,1.,0.));
+#4901=IFCDIRECTION((0.,0.,1.));
+#4902=IFCCARTESIANTRANSFORMATIONOPERATOR3D(#4899,#4900,#4898,1.,#4901);
+#4903=IFCMAPPEDITEM(#4665,#4902);
+#4904=IFCSHAPEREPRESENTATION(#11,'Body','MappedRepresentation',(#4903));
+#4905=IFCPRODUCTDEFINITIONSHAPE($,$,(#4904));
+#4906=IFCPROPERTYSET('20giMbAd5BZubWL9lLYkRl',$,'EPset_Pattern',$,(#4908,#4909,#4910));
+#4907=IFCRELDEFINESBYPROPERTIES('15PIodX4bA38pfbwVMCPyf',$,$,$,(#4811),#4906);
+#4908=IFCPROPERTYSINGLEVALUE('PatternNumber',$,IFCLABEL('112/130'),$);
+#4909=IFCPROPERTYSINGLEVALUE('PatternName',$,IFCLABEL('Entrance Transition / Entrance Room'),$);
+#4910=IFCPROPERTYSINGLEVALUE('Notes',$,IFCLABEL('Single panelled door at north wall entrance, replacing window. Marks threshold between exterior approach and interior gathering space.'),$);
 ENDSEC;
 END-ISO-10303-21;