diff --git a/src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc b/src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc
index e5d2e3e6fb..8eb4b7b80a 100644
--- a/src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc	
+++ b/src/blenderbim/blenderbim/bim/data/libraries/IFC4 AU Library.ifc	
@@ -1,7 +1,7 @@
 ISO-10303-21;
 HEADER;
 FILE_DESCRIPTION(('ViewDefinition[DesignTransferView]'),'2;1');
-FILE_NAME('/dev/null','2023-04-14T19:01:34+05:00',(),(),'IfcOpenShell v0.7.0-476ab506d','IfcOpenShell v0.7.0-476ab506d','Nobody');
+FILE_NAME('/dev/null','2023-04-21T17:25:39+05:00',(),(),'IfcOpenShell v0.7.0-198fa67cc','IfcOpenShell v0.7.0-198fa67cc','Nobody');
 FILE_SCHEMA(('IFC4'));
 ENDSEC;
 DATA;
@@ -45,7 +45,7 @@ DATA;
 #38=IFCDIRECTION((0.,0.,1.));
 #39=IFCAXIS2PLACEMENT3D(#36,#38,#37);
 #40=IFCREPRESENTATIONMAP(#39,#29);
-#41=IFCRELDECLARES('2HGKNieKzFiuYnoNmsU6yU',$,$,$,#2,(#9317,#10908,#11436,#12180,#11412,#11940,#10778,#10232,#11676,#12204,#3378,#3750,#8887,#3534,#9428,#10579,#11268,#213,#11772,#11004,#12300,#11532,#12276,#426,#109,#558,#135,#11604,#10836,#10530,#5910,#11364,#8595,#8771,#11868,#5274,#1158,#10160,#10932,#8663,#2058,#11460,#9235,#10441,#11196,#10956,#4362,#858,#10628,#11700,#10392,#11796,#11028,#9516,#10328,#11556,#8858,#10088,#9465,#8829,#12060,#12036,#450,#10724,#9071,#11100,#2598,#10860,#9720,#10884,#11628,#9669,#12132,#161,#11892,#11124,#10490,#10184,#8916,#9354,#8742,#57,#9618,#11220,#11964,#6666,#10980,#4758,#10652,#10256,#11724,#9567,#11748,#10016,#7542,#12228,#9831,#11292,#11820,#11052,#10112,#12084,#11316,#474,#11844,#10748,#10352,#9980,#289,#11652,#8538,#1638,#12156,#11388,#4026,#9942,#11148,#11172,#11916,#10052,#10208,#1338,#187,#12012,#11244,#11988,#9391,#10304,#10280,#9153,#10676,#255,#83,#11508,#11484,#12252,#30,#10700,#11076,#362,#10136,#8800,#12348,#11580,#10812,#12324,#12108,#11340,#498,#8998));
+#41=IFCRELDECLARES('0qe7r9ppfDoPMyT5rZMAre',$,$,$,#2,(#10778,#10232,#11676,#12204,#3378,#3750,#8887,#3534,#9428,#10579,#11268,#213,#11772,#11004,#12300,#11532,#12276,#426,#109,#558,#135,#11604,#10836,#10530,#11364,#5910,#8595,#8771,#5274,#11868,#1158,#10160,#10932,#8663,#2058,#11460,#9235,#10441,#11196,#10956,#4362,#858,#10628,#11700,#10392,#11796,#11028,#9516,#10328,#11556,#8858,#10088,#9465,#8829,#12060,#12036,#450,#10352,#10724,#9071,#11100,#2598,#10860,#9720,#10884,#11628,#9669,#12132,#161,#11892,#11124,#10052,#10490,#10184,#8916,#9354,#8742,#57,#9618,#11220,#11964,#6666,#10980,#4758,#10652,#10256,#11724,#9567,#11748,#10016,#10908,#7542,#12228,#30,#9831,#11292,#11820,#11052,#10112,#12324,#12084,#11316,#474,#11844,#11436,#10748,#9980,#289,#11652,#8538,#1638,#12156,#11388,#4026,#9942,#11148,#11172,#11916,#10208,#1338,#187,#12012,#11244,#11988,#9391,#10304,#9153,#10676,#10280,#255,#83,#11508,#11484,#12252,#10700,#11076,#362,#10136,#8800,#12348,#11580,#10812,#12108,#11340,#498,#8998,#9317,#12180,#11412,#11940));
 #42=IFCCARTESIANPOINTLIST2D(((0.,0.),(920.,0.),(920.,1880.),(0.,1880.)));
 #43=IFCINDEXEDPOLYCURVE(#42,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #44=IFCCARTESIANPOINTLIST2D(((0.,1598.),(184.,1598.),(184.,1880.),(184.,1598.),(644.,1598.),(736.,1559.89235226168),(736.,1880.),(736.,1559.89235226168),(920.,1483.67705678503)));
@@ -8769,13 +8769,13 @@ DATA;
 #8762=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,750.),(0.,750.)));
 #8763=IFCINDEXEDPOLYCURVE(#8762,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8764=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,650.),(64.6446609406726,685.355339059327),(100.,700.),(800.,700.),(835.355339059327,685.355339059327),(850.,650.),(850.,100.),(835.355339059327,64.6446609406726),(800.,50.)));
-#8765=IFCINDEXEDPOLYCURVE(#8764,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8765=IFCINDEXEDPOLYCURVE(#8764,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8766=IFCCARTESIANPOINT((775.,625.));
 #8767=IFCAXIS2PLACEMENT2D(#8766,$);
 #8768=IFCCIRCLE(#8767,25.);
 #8769=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8763,#8765,#8768));
 #8770=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8761));
-#8771=IFCFURNITURETYPE('2chEfLNDjDBfuAcIHy$U7g',$,'Neufert Shower 75x90',$,$,$,(#8776,#8781),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8771=IFCSANITARYTERMINALTYPE('3U0$ARtYzFbP_oNE6zPHi2',$,'Neufert Shower 75x90',$,$,$,(#8776,#8781),$,$,.NOTDEFINED.);
 #8772=IFCCARTESIANPOINT((0.,0.,0.));
 #8773=IFCDIRECTION((1.,0.,0.));
 #8774=IFCDIRECTION((0.,0.,1.));
@@ -8798,13 +8798,13 @@ DATA;
 #8791=IFCCARTESIANPOINTLIST2D(((0.,0.),(800.,0.),(800.,800.),(0.,800.)));
 #8792=IFCINDEXEDPOLYCURVE(#8791,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8793=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,700.),(64.6446609406726,735.355339059327),(100.,750.),(700.,750.),(735.355339059327,735.355339059327),(750.,700.),(750.,100.),(735.355339059327,64.6446609406726),(700.,50.)));
-#8794=IFCINDEXEDPOLYCURVE(#8793,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8794=IFCINDEXEDPOLYCURVE(#8793,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8795=IFCCARTESIANPOINT((675.,675.));
 #8796=IFCAXIS2PLACEMENT2D(#8795,$);
 #8797=IFCCIRCLE(#8796,25.);
 #8798=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8792,#8794,#8797));
 #8799=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8790));
-#8800=IFCFURNITURETYPE('3tvqhdgN12U8zgpbiq9dyZ',$,'Neufert Shower 80x80',$,$,$,(#8805,#8810),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8800=IFCSANITARYTERMINALTYPE('2vHm$vQOD1xgAACHvuyeyR',$,'Neufert Shower 80x80',$,$,$,(#8805,#8810),$,$,.NOTDEFINED.);
 #8801=IFCCARTESIANPOINT((0.,0.,0.));
 #8802=IFCDIRECTION((1.,0.,0.));
 #8803=IFCDIRECTION((0.,0.,1.));
@@ -8827,13 +8827,13 @@ DATA;
 #8820=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,900.),(0.,900.)));
 #8821=IFCINDEXEDPOLYCURVE(#8820,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8822=IFCCARTESIANPOINTLIST2D(((100.,50.),(64.6446609406726,64.6446609406726),(50.,100.),(50.,800.),(64.6446609406726,835.355339059327),(100.,850.),(800.,850.),(835.355339059327,835.355339059327),(850.,800.),(850.,100.),(835.355339059327,64.6446609406726),(800.,50.)));
-#8823=IFCINDEXEDPOLYCURVE(#8822,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8823=IFCINDEXEDPOLYCURVE(#8822,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8824=IFCCARTESIANPOINT((775.,775.));
 #8825=IFCAXIS2PLACEMENT2D(#8824,$);
 #8826=IFCCIRCLE(#8825,25.);
 #8827=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8821,#8823,#8826));
 #8828=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8819));
-#8829=IFCFURNITURETYPE('1UyR8fZnv4SfxUZScwrbKJ',$,'Neufert Shower 90x90',$,$,$,(#8834,#8839),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8829=IFCSANITARYTERMINALTYPE('3HQEnvhRj1wQamEFWrV4kf',$,'Neufert Shower 90x90',$,$,$,(#8834,#8839),$,$,.NOTDEFINED.);
 #8830=IFCCARTESIANPOINT((0.,0.,0.));
 #8831=IFCDIRECTION((1.,0.,0.));
 #8832=IFCDIRECTION((0.,0.,1.));
@@ -8856,13 +8856,13 @@ DATA;
 #8849=IFCCARTESIANPOINTLIST2D(((0.,0.),(1600.,0.),(1600.,700.),(0.,700.)));
 #8850=IFCINDEXEDPOLYCURVE(#8849,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8851=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,400.),(123.223304703363,576.776695296637),(300.,650.),(1500.,650.),(1535.35533905933,635.355339059327),(1550.,600.),(1550.,100.),(1535.35533905933,64.6446609406726),(1500.,50.)));
-#8852=IFCINDEXEDPOLYCURVE(#8851,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8852=IFCINDEXEDPOLYCURVE(#8851,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8853=IFCCARTESIANPOINT((1475.,350.));
 #8854=IFCAXIS2PLACEMENT2D(#8853,$);
 #8855=IFCCIRCLE(#8854,25.);
 #8856=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8850,#8852,#8855));
 #8857=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8848));
-#8858=IFCFURNITURETYPE('0__rwF$0D6kRx13TBzmHBn',$,'Neufert Small Bathtub',$,$,$,(#8863,#8868),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8858=IFCSANITARYTERMINALTYPE('2MMyq_g4n8u85FkAhm47jZ',$,'Neufert Small Bathtub',$,$,$,(#8863,#8868),$,$,.NOTDEFINED.);
 #8859=IFCCARTESIANPOINT((0.,0.,0.));
 #8860=IFCDIRECTION((1.,0.,0.));
 #8861=IFCDIRECTION((0.,0.,1.));
@@ -8885,13 +8885,13 @@ DATA;
 #8878=IFCCARTESIANPOINTLIST2D(((0.,0.),(1700.,0.),(1700.,750.),(0.,750.)));
 #8879=IFCINDEXEDPOLYCURVE(#8878,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8880=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,450.),(123.223304703363,626.776695296637),(300.,700.),(1600.,700.),(1635.35533905933,685.355339059327),(1650.,650.),(1650.,100.),(1635.35533905933,64.6446609406726),(1600.,50.)));
-#8881=IFCINDEXEDPOLYCURVE(#8880,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8881=IFCINDEXEDPOLYCURVE(#8880,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8882=IFCCARTESIANPOINT((1575.,375.));
 #8883=IFCAXIS2PLACEMENT2D(#8882,$);
 #8884=IFCCIRCLE(#8883,25.);
 #8885=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8879,#8881,#8884));
 #8886=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8877));
-#8887=IFCFURNITURETYPE('1X7mg3PuL9rfGp$vmES4UV',$,'Neufert Medium Bathtub',$,$,$,(#8892,#8897),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8887=IFCSANITARYTERMINALTYPE('0NUlR8z5TFHed$dKBY5GZH',$,'Neufert Medium Bathtub',$,$,$,(#8892,#8897),$,$,.NOTDEFINED.);
 #8888=IFCCARTESIANPOINT((0.,0.,0.));
 #8889=IFCDIRECTION((1.,0.,0.));
 #8890=IFCDIRECTION((0.,0.,1.));
@@ -8914,13 +8914,13 @@ DATA;
 #8907=IFCCARTESIANPOINTLIST2D(((0.,0.),(1800.,0.),(1800.,800.),(0.,800.)));
 #8908=IFCINDEXEDPOLYCURVE(#8907,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #8909=IFCCARTESIANPOINTLIST2D(((300.,50.),(123.223304703363,123.223304703363),(50.,300.),(50.,500.),(123.223304703363,676.776695296637),(300.,750.),(1700.,750.),(1735.35533905933,735.355339059327),(1750.,700.),(1750.,100.),(1735.35533905933,64.6446609406726),(1700.,50.)));
-#8910=IFCINDEXEDPOLYCURVE(#8909,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#8910=IFCINDEXEDPOLYCURVE(#8909,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #8911=IFCCARTESIANPOINT((1675.,400.));
 #8912=IFCAXIS2PLACEMENT2D(#8911,$);
 #8913=IFCCIRCLE(#8912,25.);
 #8914=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8908,#8910,#8913));
 #8915=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8906));
-#8916=IFCFURNITURETYPE('1n7otEOHX7jBOfKKASIJps',$,'Neufert Large Bathtub',$,$,$,(#8921,#8926),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8916=IFCSANITARYTERMINALTYPE('2By7l0FbPCTvFIMnmpR6Fr',$,'Neufert Large Bathtub',$,$,$,(#8921,#8926),$,$,.NOTDEFINED.);
 #8917=IFCCARTESIANPOINT((0.,0.,0.));
 #8918=IFCDIRECTION((1.,0.,0.));
 #8919=IFCDIRECTION((0.,0.,1.));
@@ -8932,8 +8932,8 @@ DATA;
 #8925=IFCAXIS2PLACEMENT3D(#8922,#8924,#8923);
 #8926=IFCREPRESENTATIONMAP(#8925,#8914);
 #8927=IFCCARTESIANPOINTLIST2D(((275.,0.),(80.5456351736994,80.5456351736994),(0.,275.),(32.2182540694798,352.78174593052),(110.,385.),(55.,385.),(55.,450.),(495.,450.),(495.,385.),(440.,385.),(517.78174593052,352.78174593052),(550.,275.),(469.454364826301,80.5456351736994),(275.,0.)));
-#8928=IFCINDEXEDPOLYCURVE(#8927,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((1,14))),$);
-#8929=IFCINDEXEDPOLYCURVE(#8930,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((1,14))),$);
+#8928=IFCINDEXEDPOLYCURVE(#8927,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((14,1))),$);
+#8929=IFCINDEXEDPOLYCURVE(#8930,(IFCLINEINDEX((14,1)),IFCARCINDEX((1,2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCARCINDEX((12,13,14)),IFCLINEINDEX((14,1))),$);
 #8930=IFCCARTESIANPOINTLIST2D(((275.,0.),(80.5456351736994,80.5456351736994),(0.,275.),(32.2182540694798,352.78174593052),(110.,385.),(55.,385.),(55.,450.),(495.,450.),(495.,385.),(440.,385.),(517.78174593052,352.78174593052),(550.,275.),(469.454364826301,80.5456351736994),(275.,0.)));
 #8931=IFCCARTESIANPOINTLIST2D(((-275.,0.),(275.,0.),(275.,-200.),(-275.,-200.)));
 #8932=IFCINDEXEDPOLYCURVE(#8931,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
@@ -8965,7 +8965,7 @@ DATA;
 #8958=IFCTRIMMEDCURVE(#8955,(#8956),(#8957),.T.,.CARTESIAN.);
 #8959=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#8932,#8936,#8943,#8944,#8949,#8951,#8958));
 #8960=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(275.,-200.),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-50.,-650.),(-209.099029541016,-584.098999023438),(-275.,-425.)));
-#8961=IFCINDEXEDPOLYCURVE(#8960,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((1,8))),$);
+#8961=IFCINDEXEDPOLYCURVE(#8960,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((8,1))),$);
 #8962=IFCCARTESIANPOINT((0.,-425.));
 #8963=IFCAXIS2PLACEMENT2D(#8962,$);
 #8964=IFCCIRCLE(#8963,168.75);
@@ -8976,7 +8976,7 @@ DATA;
 #8969=IFCAXIS2PLACEMENT3D(#8966,#8967,#8968);
 #8970=IFCDIRECTION((0.,0.,1.));
 #8971=IFCEXTRUDEDAREASOLID(#8965,#8969,#8970,150.);
-#8972=IFCINDEXEDPOLYCURVE(#8973,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((1,8))),$);
+#8972=IFCINDEXEDPOLYCURVE(#8973,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCLINEINDEX((5,6)),IFCARCINDEX((6,7,8)),IFCLINEINDEX((8,1))),$);
 #8973=IFCCARTESIANPOINTLIST2D(((-275.,-200.),(275.,-200.),(275.,-425.),(209.099029541016,-584.098999023438),(50.,-650.),(-50.,-650.),(-209.099029541016,-584.098999023438),(-275.,-425.)));
 #8974=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#8972);
 #8975=IFCCARTESIANPOINT((0.,0.,200.));
@@ -9002,7 +9002,7 @@ DATA;
 #8995=IFCDIRECTION((0.,0.,1.));
 #8996=IFCEXTRUDEDAREASOLID(#8990,#8994,#8995,570.);
 #8997=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#8971,#8980,#8989,#8996));
-#8998=IFCFURNITURETYPE('3mCxX9DhT959tCgDkSzzNw',$,'Neufert Toilet with Cistern',$,$,$,(#9003,#9008),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#8998=IFCSANITARYTERMINALTYPE('2ELi2Yj71C4xU0Oz4KZxu6',$,'Neufert Toilet with Cistern',$,$,$,(#9003,#9008),$,$,.NOTDEFINED.);
 #8999=IFCCARTESIANPOINT((0.,0.,0.));
 #9000=IFCDIRECTION((1.,0.,0.));
 #9001=IFCDIRECTION((0.,0.,1.));
@@ -9014,8 +9014,8 @@ DATA;
 #9007=IFCAXIS2PLACEMENT3D(#9004,#9006,#9005);
 #9008=IFCREPRESENTATIONMAP(#9007,#8959);
 #9009=IFCCARTESIANPOINTLIST2D(((200.,0.),(58.5786437626905,58.5786437626905),(0.,200.),(0.,397.),(23.4314575050762,453.568542494924),(80.,477.),(40.,477.),(40.,530.),(360.,530.),(360.,477.),(320.,477.),(376.568542494924,453.568542494924),(400.,397.),(400.,200.),(341.42135623731,58.5786437626905),(200.,0.)));
-#9010=IFCINDEXEDPOLYCURVE(#9009,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((1,16))),$);
-#9011=IFCINDEXEDPOLYCURVE(#9012,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((1,16))),$);
+#9010=IFCINDEXEDPOLYCURVE(#9009,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((16,1))),$);
+#9011=IFCINDEXEDPOLYCURVE(#9012,(IFCLINEINDEX((16,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCLINEINDEX((7,8)),IFCLINEINDEX((8,9)),IFCLINEINDEX((9,10)),IFCLINEINDEX((10,11)),IFCARCINDEX((11,12,13)),IFCLINEINDEX((13,14)),IFCARCINDEX((14,15,16)),IFCLINEINDEX((16,1))),$);
 #9012=IFCCARTESIANPOINTLIST2D(((200.,0.),(58.5786437626905,58.5786437626905),(0.,200.),(0.,397.),(23.4314575050762,453.568542494924),(80.,477.),(40.,477.),(40.,530.),(360.,530.),(360.,477.),(320.,477.),(376.568542494924,453.568542494924),(400.,397.),(400.,200.),(341.42135623731,58.5786437626905),(200.,0.)));
 #9013=IFCCARTESIANPOINTLIST2D(((-120.,0.),(120.,0.)));
 #9014=IFCINDEXEDPOLYCURVE(#9013,(IFCLINEINDEX((1,2))),$);
@@ -9045,7 +9045,7 @@ DATA;
 #9038=IFCTRIMMEDCURVE(#9035,(#9036),(#9037),.T.,.CARTESIAN.);
 #9039=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9014,#9016,#9023,#9024,#9029,#9031,#9038));
 #9040=IFCCARTESIANPOINTLIST2D(((-200.,0.),(200.,0.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-141.421356201172,-471.421356201172),(-200.,-330.)));
-#9041=IFCINDEXEDPOLYCURVE(#9040,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((1,7))),$);
+#9041=IFCINDEXEDPOLYCURVE(#9040,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,1))),$);
 #9042=IFCCARTESIANPOINT((0.,-330.));
 #9043=IFCAXIS2PLACEMENT2D(#9042,$);
 #9044=IFCCIRCLE(#9043,150.);
@@ -9056,7 +9056,7 @@ DATA;
 #9049=IFCAXIS2PLACEMENT3D(#9046,#9047,#9048);
 #9050=IFCDIRECTION((0.,0.,1.));
 #9051=IFCEXTRUDEDAREASOLID(#9045,#9049,#9050,150.);
-#9052=IFCINDEXEDPOLYCURVE(#9053,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((1,7))),$);
+#9052=IFCINDEXEDPOLYCURVE(#9053,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCARCINDEX((3,4,5)),IFCARCINDEX((5,6,7)),IFCLINEINDEX((7,1))),$);
 #9053=IFCCARTESIANPOINTLIST2D(((-200.,0.),(200.,0.),(200.,-330.),(141.421356201172,-471.421356201172),(0.,-530.),(-141.421356201172,-471.421356201172),(-200.,-330.)));
 #9054=IFCARBITRARYCLOSEDPROFILEDEF(.AREA.,$,#9052);
 #9055=IFCCARTESIANPOINT((0.,0.,200.));
@@ -9075,7 +9075,7 @@ DATA;
 #9068=IFCDIRECTION((0.,0.,1.));
 #9069=IFCEXTRUDEDAREASOLID(#9063,#9067,#9068,200.);
 #9070=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9051,#9060,#9069));
-#9071=IFCFURNITURETYPE('3xUJfw$IbFUPh91ZO_d_fu',$,'Generic Toilet without Cistern',$,$,$,(#9076,#9081),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9071=IFCSANITARYTERMINALTYPE('2vY_mwxpT4KgZns4S6eU9l',$,'Generic Toilet without Cistern',$,$,$,(#9076,#9081),$,$,.NOTDEFINED.);
 #9072=IFCCARTESIANPOINT((0.,0.,0.));
 #9073=IFCDIRECTION((1.,0.,0.));
 #9074=IFCDIRECTION((0.,0.,1.));
@@ -9157,7 +9157,7 @@ DATA;
 #9150=IFCINDEXEDPOLYCURVE(#9151,(IFCARCINDEX((1,2,3))),$);
 #9151=IFCCARTESIANPOINTLIST2D(((105.,-35.),(105.01000213623,-35.),(140.,-70.)));
 #9152=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9133,#9135,#9138,#9145,#9147,#9149,#9150));
-#9153=IFCFURNITURETYPE('1YCUnWRTnESRIZdrbBF3VL',$,'Neufert Small Urinal',$,$,$,(#9158,#9163),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9153=IFCSANITARYTERMINALTYPE('0zb2_ICkH9NwVzxpLrXuTX',$,'Neufert Small Urinal',$,$,$,(#9158,#9163),$,$,.NOTDEFINED.);
 #9154=IFCCARTESIANPOINT((0.,0.,0.));
 #9155=IFCDIRECTION((1.,0.,0.));
 #9156=IFCDIRECTION((0.,0.,1.));
@@ -9239,7 +9239,7 @@ DATA;
 #9232=IFCINDEXEDPOLYCURVE(#9233,(IFCARCINDEX((1,2,3))),$);
 #9233=IFCCARTESIANPOINTLIST2D(((120.,-40.),(120.01000213623,-40.),(160.,-80.)));
 #9234=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9215,#9217,#9220,#9227,#9229,#9231,#9232));
-#9235=IFCFURNITURETYPE('3vdltXoZ50afR6p8pzbYyC',$,'Neufert Medium Urinal',$,$,$,(#9240,#9245),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9235=IFCSANITARYTERMINALTYPE('14zYtDSYbEC891_yH57cDT',$,'Neufert Medium Urinal',$,$,$,(#9240,#9245),$,$,.NOTDEFINED.);
 #9236=IFCCARTESIANPOINT((0.,0.,0.));
 #9237=IFCDIRECTION((1.,0.,0.));
 #9238=IFCDIRECTION((0.,0.,1.));
@@ -9321,7 +9321,7 @@ DATA;
 #9314=IFCINDEXEDPOLYCURVE(#9315,(IFCARCINDEX((1,2,3))),$);
 #9315=IFCCARTESIANPOINTLIST2D(((135.,-45.),(135.009994506836,-45.),(180.,-90.)));
 #9316=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9297,#9299,#9302,#9309,#9311,#9313,#9314));
-#9317=IFCFURNITURETYPE('0yaEPbrwX9cQ3AX$Ow8i6o',$,'Neufert Large Urinal',$,$,$,(#9322,#9327),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9317=IFCSANITARYTERMINALTYPE('0MPobFK4nA99hcB1hla$mr',$,'Neufert Large Urinal',$,$,$,(#9322,#9327),$,$,.NOTDEFINED.);
 #9318=IFCCARTESIANPOINT((0.,0.,0.));
 #9319=IFCDIRECTION((1.,0.,0.));
 #9320=IFCDIRECTION((0.,0.,1.));
@@ -9333,12 +9333,12 @@ DATA;
 #9326=IFCAXIS2PLACEMENT3D(#9323,#9325,#9324);
 #9327=IFCREPRESENTATIONMAP(#9326,#9316);
 #9328=IFCCARTESIANPOINTLIST2D(((-225.,-350.),(-210.355346679688,-385.355346679688),(-175.,-400.),(175.,-400.),(210.355346679688,-385.355346679688),(225.,-350.),(225.,-50.),(210.355346679688,-14.6446533203125),(175.,0.),(-175.,0.),(-210.355346679688,-14.6446533203125),(-225.,-50.)));
-#9329=IFCINDEXEDPOLYCURVE(#9328,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9330=IFCINDEXEDPOLYCURVE(#9331,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9329=IFCINDEXEDPOLYCURVE(#9328,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9330=IFCINDEXEDPOLYCURVE(#9331,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9331=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(400.,0.),(435.355339059327,14.6446609406726),(450.,50.),(450.,350.),(435.355339059327,385.355339059327),(400.,400.),(50.,400.),(14.6446609406726,385.355339059327),(0.,350.)));
 #9332=IFCCARTESIANPOINTLIST2D(((-202.5,-214.),(-158.566009521484,-320.066009521484),(-52.5,-364.),(52.5,-364.),(158.566009521484,-320.066009521484),(202.5,-214.),(202.5,-134.),(187.855346679688,-98.6446533203125),(152.5,-84.),(-152.5,-84.),(-187.855346679688,-98.6446533203125),(-202.5,-134.)));
-#9333=IFCINDEXEDPOLYCURVE(#9332,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9334=IFCINDEXEDPOLYCURVE(#9335,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9333=IFCINDEXEDPOLYCURVE(#9332,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9334=IFCINDEXEDPOLYCURVE(#9335,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9335=IFCCARTESIANPOINTLIST2D(((22.5,186.),(66.4339828220179,79.9339828220179),(172.5,36.),(277.5,36.),(383.566017177982,79.9339828220179),(427.5,186.),(427.5,266.),(412.855339059327,301.355339059327),(377.5,316.),(72.5,316.),(37.1446609406726,301.355339059327),(22.5,266.)));
 #9336=IFCCARTESIANPOINTLIST2D(((0.,-30.),(0.,-150.)));
 #9337=IFCINDEXEDPOLYCURVE(#9336,(IFCLINEINDEX((1,2))),$);
@@ -9358,7 +9358,7 @@ DATA;
 #9351=IFCDIRECTION((0.,0.,1.));
 #9352=IFCEXTRUDEDAREASOLID(#9346,#9350,#9351,100.);
 #9353=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9345,#9352));
-#9354=IFCFURNITURETYPE('05JxHlo9D4qBpvNf_FD3EO',$,'Neufert Extra Small Basin',$,$,$,(#9359,#9364),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9354=IFCSANITARYTERMINALTYPE('2woKwWEUP7lPTAJuxRv0Hq',$,'Neufert Extra Small Basin',$,$,$,(#9359,#9364),$,$,.NOTDEFINED.);
 #9355=IFCCARTESIANPOINT((0.,0.,0.));
 #9356=IFCDIRECTION((1.,0.,0.));
 #9357=IFCDIRECTION((0.,0.,1.));
@@ -9370,12 +9370,12 @@ DATA;
 #9363=IFCAXIS2PLACEMENT3D(#9360,#9362,#9361);
 #9364=IFCREPRESENTATIONMAP(#9363,#9338);
 #9365=IFCCARTESIANPOINTLIST2D(((-250.,-400.),(-235.355346679688,-435.355346679688),(-200.,-450.),(200.,-450.),(235.355346679688,-435.355346679688),(250.,-400.),(250.,-50.),(235.355346679688,-14.6446533203125),(200.,0.),(-200.,0.),(-235.355346679688,-14.6446533203125),(-250.,-50.)));
-#9366=IFCINDEXEDPOLYCURVE(#9365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9367=IFCINDEXEDPOLYCURVE(#9368,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9366=IFCINDEXEDPOLYCURVE(#9365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9367=IFCINDEXEDPOLYCURVE(#9368,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9368=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(450.,0.),(485.355339059327,14.6446609406726),(500.,50.),(500.,400.),(485.355339059327,435.355339059327),(450.,450.),(50.,450.),(14.6446609406726,435.355339059327),(0.,400.)));
 #9369=IFCCARTESIANPOINTLIST2D(((-225.,-259.5),(-181.066009521484,-365.566009521484),(-75.,-409.5),(75.,-409.5),(181.066009521484,-365.566009521484),(225.,-259.5),(225.,-144.5),(210.355346679688,-109.144653320312),(175.,-94.5),(-175.,-94.5),(-210.355346679688,-109.144653320312),(-225.,-144.5)));
-#9370=IFCINDEXEDPOLYCURVE(#9369,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9371=IFCINDEXEDPOLYCURVE(#9372,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9370=IFCINDEXEDPOLYCURVE(#9369,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9371=IFCINDEXEDPOLYCURVE(#9372,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9372=IFCCARTESIANPOINTLIST2D(((25.,190.5),(68.9339828220179,84.4339828220179),(175.,40.5),(325.,40.5),(431.066017177982,84.4339828220179),(475.,190.5),(475.,305.5),(460.355339059327,340.855339059327),(425.,355.5),(75.,355.5),(39.6446609406726,340.855339059327),(25.,305.5)));
 #9373=IFCCARTESIANPOINTLIST2D(((0.,-33.75),(0.,-153.75)));
 #9374=IFCINDEXEDPOLYCURVE(#9373,(IFCLINEINDEX((1,2))),$);
@@ -9395,7 +9395,7 @@ DATA;
 #9388=IFCDIRECTION((0.,0.,1.));
 #9389=IFCEXTRUDEDAREASOLID(#9383,#9387,#9388,100.);
 #9390=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9382,#9389));
-#9391=IFCFURNITURETYPE('0kYBmaLQf0eP_Nk0CBMDKj',$,'Neufert Small Basin',$,$,$,(#9396,#9401),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9391=IFCSANITARYTERMINALTYPE('3qg2RWSZzFxBTEAOnH9LnV',$,'Neufert Small Basin',$,$,$,(#9396,#9401),$,$,.NOTDEFINED.);
 #9392=IFCCARTESIANPOINT((0.,0.,0.));
 #9393=IFCDIRECTION((1.,0.,0.));
 #9394=IFCDIRECTION((0.,0.,1.));
@@ -9407,12 +9407,12 @@ DATA;
 #9400=IFCAXIS2PLACEMENT3D(#9397,#9399,#9398);
 #9401=IFCREPRESENTATIONMAP(#9400,#9375);
 #9402=IFCCARTESIANPOINTLIST2D(((-275.,-450.),(-260.355346679688,-485.355346679688),(-225.,-500.),(225.,-500.),(260.355346679688,-485.355346679688),(275.,-450.),(275.,-50.),(260.355346679688,-14.6446533203125),(225.,0.),(-225.,0.),(-260.355346679688,-14.6446533203125),(-275.,-50.)));
-#9403=IFCINDEXEDPOLYCURVE(#9402,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9404=IFCINDEXEDPOLYCURVE(#9405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9403=IFCINDEXEDPOLYCURVE(#9402,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9404=IFCINDEXEDPOLYCURVE(#9405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9405=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(500.,0.),(535.355339059327,14.6446609406726),(550.,50.),(550.,450.),(535.355339059327,485.355339059327),(500.,500.),(50.,500.),(14.6446609406726,485.355339059327),(0.,450.)));
 #9406=IFCCARTESIANPOINTLIST2D(((-247.5,-305.),(-203.566009521484,-411.066009521484),(-97.5,-455.),(97.5,-455.),(203.566009521484,-411.066009521484),(247.5,-305.),(247.5,-155.),(232.855346679688,-119.644653320312),(197.5,-105.),(-197.5,-105.),(-232.855346679688,-119.644653320312),(-247.5,-155.)));
-#9407=IFCINDEXEDPOLYCURVE(#9406,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9408=IFCINDEXEDPOLYCURVE(#9409,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9407=IFCINDEXEDPOLYCURVE(#9406,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9408=IFCINDEXEDPOLYCURVE(#9409,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9409=IFCCARTESIANPOINTLIST2D(((27.5,195.),(71.4339828220179,88.9339828220179),(177.5,45.),(372.5,45.),(478.566017177982,88.9339828220179),(522.5,195.),(522.5,345.),(507.855339059327,380.355339059327),(472.5,395.),(77.5,395.),(42.1446609406726,380.355339059327),(27.5,345.)));
 #9410=IFCCARTESIANPOINTLIST2D(((0.,-37.5),(0.,-157.5)));
 #9411=IFCINDEXEDPOLYCURVE(#9410,(IFCLINEINDEX((1,2))),$);
@@ -9432,7 +9432,7 @@ DATA;
 #9425=IFCDIRECTION((0.,0.,1.));
 #9426=IFCEXTRUDEDAREASOLID(#9420,#9424,#9425,100.);
 #9427=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9419,#9426));
-#9428=IFCFURNITURETYPE('3HOnoiBqfEaPpzRbqAX7kZ',$,'Neufert Medium Basin',$,$,$,(#9433,#9438),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9428=IFCSANITARYTERMINALTYPE('2hG4PoXST1MfIppfz0tX8j',$,'Neufert Medium Basin',$,$,$,(#9433,#9438),$,$,.NOTDEFINED.);
 #9429=IFCCARTESIANPOINT((0.,0.,0.));
 #9430=IFCDIRECTION((1.,0.,0.));
 #9431=IFCDIRECTION((0.,0.,1.));
@@ -9444,12 +9444,12 @@ DATA;
 #9437=IFCAXIS2PLACEMENT3D(#9434,#9436,#9435);
 #9438=IFCREPRESENTATIONMAP(#9437,#9412);
 #9439=IFCCARTESIANPOINTLIST2D(((-300.,-500.),(-285.355346679688,-535.355346679688),(-250.,-550.),(250.,-550.),(285.355346679688,-535.355346679688),(300.,-500.),(300.,-50.),(285.355346679688,-14.6446533203125),(250.,0.),(-250.,0.),(-285.355346679688,-14.6446533203125),(-300.,-50.)));
-#9440=IFCINDEXEDPOLYCURVE(#9439,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9441=IFCINDEXEDPOLYCURVE(#9442,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9440=IFCINDEXEDPOLYCURVE(#9439,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9441=IFCINDEXEDPOLYCURVE(#9442,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9442=IFCCARTESIANPOINTLIST2D(((0.,50.),(14.6446609406726,14.6446609406726),(50.,0.),(550.,0.),(585.355339059327,14.6446609406726),(600.,50.),(600.,500.),(585.355339059327,535.355339059327),(550.,550.),(50.,550.),(14.6446609406726,535.355339059327),(0.,500.)));
 #9443=IFCCARTESIANPOINTLIST2D(((-270.,-350.5),(-226.066009521484,-456.566009521484),(-120.,-500.5),(120.,-500.5),(226.066040039062,-456.566009521484),(270.,-350.5),(270.,-165.5),(255.355346679688,-130.144653320312),(220.,-115.5),(-220.,-115.5),(-255.355346679688,-130.144653320312),(-270.,-165.5)));
-#9444=IFCINDEXEDPOLYCURVE(#9443,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
-#9445=IFCINDEXEDPOLYCURVE(#9446,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#9444=IFCINDEXEDPOLYCURVE(#9443,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
+#9445=IFCINDEXEDPOLYCURVE(#9446,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #9446=IFCCARTESIANPOINTLIST2D(((30.,199.5),(73.9339828220179,93.4339828220179),(180.,49.5),(420.,49.5),(526.066017177982,93.4339828220179),(570.,199.5),(570.,384.5),(555.355339059327,419.855339059327),(520.,434.5),(80.,434.5),(44.6446609406726,419.855339059327),(30.,384.5)));
 #9447=IFCCARTESIANPOINTLIST2D(((0.,-41.25),(0.,-161.25)));
 #9448=IFCINDEXEDPOLYCURVE(#9447,(IFCLINEINDEX((1,2))),$);
@@ -9469,7 +9469,7 @@ DATA;
 #9462=IFCDIRECTION((0.,0.,1.));
 #9463=IFCEXTRUDEDAREASOLID(#9457,#9461,#9462,100.);
 #9464=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9456,#9463));
-#9465=IFCFURNITURETYPE('3nmkIPXnfEEBAnojjNPbJc',$,'Neufert Large Basin',$,$,$,(#9470,#9475),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9465=IFCSANITARYTERMINALTYPE('0DhF1owWTBQBX24vCUdbCL',$,'Neufert Large Basin',$,$,$,(#9470,#9475),$,$,.NOTDEFINED.);
 #9466=IFCCARTESIANPOINT((0.,0.,0.));
 #9467=IFCDIRECTION((1.,0.,0.));
 #9468=IFCDIRECTION((0.,0.,1.));
@@ -9984,7 +9984,7 @@ DATA;
 #9977=IFCCARTESIANPOINTLIST2D(((500.,570.),(348.915649414062,397.763854980469)));
 #9978=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9961));
 #9979=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#9963,#9966,#9969,#9971,#9972,#9974,#9976));
-#9980=IFCFURNITURETYPE('1AFtSxjp11OfXPVIXCEHTW',$,'Neufert Dishwasher',$,$,$,(#9985,#9990),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#9980=IFCELECTRICAPPLIANCETYPE('1sNE7qfUz3h9cTdLK3fjiA',$,'Neufert Dishwasher',$,$,$,(#9985,#9990),$,$,.NOTDEFINED.);
 #9981=IFCCARTESIANPOINT((0.,0.,0.));
 #9982=IFCDIRECTION((1.,0.,0.));
 #9983=IFCDIRECTION((0.,0.,1.));
@@ -10020,7 +10020,7 @@ DATA;
 #10013=IFCCARTESIANPOINT((464.,408.));
 #10014=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#9999));
 #10015=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10001,#10004,#10005,#10008,#10011));
-#10016=IFCFURNITURETYPE('2IGxEEswv8qP7nVni78cfm',$,'Neufert Cooktop 58x51',$,$,$,(#10021,#10026),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10016=IFCELECTRICAPPLIANCETYPE('0nKrtvdUHFAefjRSEpm9Vo',$,'Neufert Cooktop 58x51',$,$,$,(#10021,#10026),$,$,.NOTDEFINED.);
 #10017=IFCCARTESIANPOINT((0.,0.,0.));
 #10018=IFCDIRECTION((1.,0.,0.));
 #10019=IFCDIRECTION((0.,0.,1.));
@@ -10056,7 +10056,7 @@ DATA;
 #10049=IFCCARTESIANPOINT((600.,408.));
 #10050=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10035));
 #10051=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10037,#10040,#10041,#10044,#10047));
-#10052=IFCFURNITURETYPE('0u0AIl1iz1kg0k4hVZokMR',$,'Neufert Cooktop 75x51',$,$,$,(#10057,#10062),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10052=IFCELECTRICAPPLIANCETYPE('0h0jY$RHnDtuHFECA28DmA',$,'Neufert Cooktop 75x51',$,$,$,(#10057,#10062),$,$,.NOTDEFINED.);
 #10053=IFCCARTESIANPOINT((0.,0.,0.));
 #10054=IFCDIRECTION((1.,0.,0.));
 #10055=IFCDIRECTION((0.,0.,1.));
@@ -10092,7 +10092,7 @@ DATA;
 #10085=IFCCARTESIANPOINT((712.,408.));
 #10086=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10071));
 #10087=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10073,#10076,#10077,#10080,#10083));
-#10088=IFCFURNITURETYPE('0tLA79Xrj3ygMHNIS4kMgp',$,'Neufert Cooktop 89x51',$,$,$,(#10093,#10098),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10088=IFCELECTRICAPPLIANCETYPE('29HQ13NSn9$fDs0$FEoLi4',$,'Neufert Cooktop 89x51',$,$,$,(#10093,#10098),$,$,.NOTDEFINED.);
 #10089=IFCCARTESIANPOINT((0.,0.,0.));
 #10090=IFCDIRECTION((1.,0.,0.));
 #10091=IFCDIRECTION((0.,0.,1.));
@@ -10308,7 +10308,7 @@ DATA;
 #10301=IFCCARTESIANPOINTLIST2D(((0.,0.),(750.,0.),(750.,650.),(0.,650.)));
 #10302=IFCINDEXEDPOLYCURVE(#10301,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10303=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10302));
-#10304=IFCFURNITURETYPE('1vlTJXFfXAnh7gnD04f$1P',$,'Generic Small Fridge Zone',$,$,$,(#10309,#10314),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10304=IFCELECTRICAPPLIANCETYPE('2$EOIIzKDC9R3FuDYcR7Ch',$,'Generic Small Fridge Zone',$,$,$,(#10309,#10314),$,$,.NOTDEFINED.);
 #10305=IFCCARTESIANPOINT((0.,0.,0.));
 #10306=IFCDIRECTION((1.,0.,0.));
 #10307=IFCDIRECTION((0.,0.,1.));
@@ -10332,7 +10332,7 @@ DATA;
 #10325=IFCCARTESIANPOINTLIST2D(((0.,0.),(900.,0.),(900.,700.),(0.,700.)));
 #10326=IFCINDEXEDPOLYCURVE(#10325,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10327=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10326));
-#10328=IFCFURNITURETYPE('1pCxw0yID16ORM48tmev1T',$,'Generic Medium Fridge Zone',$,$,$,(#10333,#10338),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10328=IFCELECTRICAPPLIANCETYPE('1dJrjS_f50o98cKyloLBwg',$,'Generic Medium Fridge Zone',$,$,$,(#10333,#10338),$,$,.NOTDEFINED.);
 #10329=IFCCARTESIANPOINT((0.,0.,0.));
 #10330=IFCDIRECTION((1.,0.,0.));
 #10331=IFCDIRECTION((0.,0.,1.));
@@ -10356,7 +10356,7 @@ DATA;
 #10349=IFCCARTESIANPOINTLIST2D(((0.,0.),(1000.,0.),(1000.,750.),(0.,750.)));
 #10350=IFCINDEXEDPOLYCURVE(#10349,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10351=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10350));
-#10352=IFCFURNITURETYPE('2$$8n27rr6$hvFFgMEptvR',$,'Generic Large Fridge Zone',$,$,$,(#10357,#10362),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10352=IFCELECTRICAPPLIANCETYPE('0m9WySWkv6nwxrkqK2gOXU',$,'Generic Large Fridge Zone',$,$,$,(#10357,#10362),$,$,.NOTDEFINED.);
 #10353=IFCCARTESIANPOINT((0.,0.,0.));
 #10354=IFCDIRECTION((1.,0.,0.));
 #10355=IFCDIRECTION((0.,0.,1.));
@@ -10370,7 +10370,7 @@ DATA;
 #10363=IFCCARTESIANPOINTLIST2D(((-430.,-440.),(430.,-440.),(430.,0.),(-430.,0.)));
 #10364=IFCINDEXEDPOLYCURVE(#10363,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10365=IFCCARTESIANPOINTLIST2D(((-405.,-365.),(-390.355346679688,-400.355346679688),(-355.,-415.),(355.,-415.),(390.355346679688,-400.355346679688),(405.,-365.),(405.,-75.),(390.355346679688,-39.6446533203125),(355.,-25.),(-355.,-25.),(-390.355346679688,-39.6446533203125),(-405.,-75.)));
-#10366=IFCINDEXEDPOLYCURVE(#10365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10366=IFCINDEXEDPOLYCURVE(#10365,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10367=IFCCARTESIANPOINT((0.,-125.));
 #10368=IFCAXIS2PLACEMENT2D(#10367,$);
 #10369=IFCCIRCLE(#10368,25.);
@@ -10379,7 +10379,7 @@ DATA;
 #10372=IFCCARTESIANPOINTLIST2D(((0.,0.),(860.,0.),(860.,440.),(0.,440.)));
 #10373=IFCINDEXEDPOLYCURVE(#10372,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10374=IFCCARTESIANPOINTLIST2D(((25.,75.),(39.6446609406726,39.6446609406726),(75.,25.),(785.,25.),(820.355339059327,39.6446609406726),(835.,75.),(835.,365.),(820.355339059327,400.355339059327),(785.,415.),(75.,415.),(39.6446609406726,400.355339059327),(25.,365.)));
-#10375=IFCINDEXEDPOLYCURVE(#10374,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10375=IFCINDEXEDPOLYCURVE(#10374,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10376=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10373,(#10375));
 #10377=IFCCARTESIANPOINT((-430.,-440.,36.));
 #10378=IFCDIRECTION((0.,0.,1.));
@@ -10396,7 +10396,7 @@ DATA;
 #10389=IFCEXTRUDEDAREASOLID(#10383,#10387,#10388,36.);
 #10390=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10364,#10366,#10369,#10371));
 #10391=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10382,#10389));
-#10392=IFCFURNITURETYPE('0q4OLC4k59zQgK4HaRjm$m',$,'Neufert Sink 86x44',$,$,$,(#10397,#10402),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10392=IFCSANITARYTERMINALTYPE('2BgxNZ_oT9nwJKl8YigkmY',$,'Neufert Sink 86x44',$,$,$,(#10397,#10402),$,$,.NOTDEFINED.);
 #10393=IFCCARTESIANPOINT((0.,0.,0.));
 #10394=IFCDIRECTION((1.,0.,0.));
 #10395=IFCDIRECTION((0.,0.,1.));
@@ -10410,7 +10410,7 @@ DATA;
 #10403=IFCCARTESIANPOINTLIST2D(((-555.,-440.),(555.,-440.),(555.,0.),(-555.,0.)));
 #10404=IFCINDEXEDPOLYCURVE(#10403,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10405=IFCCARTESIANPOINTLIST2D(((25.,-365.),(39.6446533203125,-400.355346679688),(75.,-415.),(480.,-415.),(515.355346679688,-400.355346679688),(530.,-365.),(530.,-75.),(515.355346679688,-39.6446533203125),(480.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10406=IFCINDEXEDPOLYCURVE(#10405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10406=IFCINDEXEDPOLYCURVE(#10405,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10407=IFCCARTESIANPOINT((277.5,-125.));
 #10408=IFCAXIS2PLACEMENT2D(#10407,$);
 #10409=IFCCIRCLE(#10408,25.);
@@ -10428,7 +10428,7 @@ DATA;
 #10421=IFCCARTESIANPOINTLIST2D(((555.,0.),(1110.,0.),(1110.,440.),(555.,440.)));
 #10422=IFCINDEXEDPOLYCURVE(#10421,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10423=IFCCARTESIANPOINTLIST2D(((580.,75.),(594.644660940673,39.6446609406726),(630.,25.),(1035.,25.),(1070.35533905933,39.6446609406726),(1085.,75.),(1085.,365.),(1070.35533905933,400.355339059327),(1035.,415.),(630.,415.),(594.644660940673,400.355339059327),(580.,365.)));
-#10424=IFCINDEXEDPOLYCURVE(#10423,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10424=IFCINDEXEDPOLYCURVE(#10423,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10425=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10422,(#10424));
 #10426=IFCCARTESIANPOINT((-555.,-440.,36.));
 #10427=IFCDIRECTION((0.,0.,1.));
@@ -10445,7 +10445,7 @@ DATA;
 #10438=IFCEXTRUDEDAREASOLID(#10432,#10436,#10437,36.);
 #10439=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10404,#10406,#10409,#10411));
 #10440=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10420,#10431,#10438));
-#10441=IFCFURNITURETYPE('0kORuZKn58PQZTtdW8oCLl',$,'Neufert Sink 110x44',$,$,$,(#10446,#10451),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10441=IFCSANITARYTERMINALTYPE('1f15OHuoj2pAdtiC4FZRI1',$,'Neufert Sink 110x44',$,$,$,(#10446,#10451),$,$,.NOTDEFINED.);
 #10442=IFCCARTESIANPOINT((0.,0.,0.));
 #10443=IFCDIRECTION((1.,0.,0.));
 #10444=IFCDIRECTION((0.,0.,1.));
@@ -10459,7 +10459,7 @@ DATA;
 #10452=IFCCARTESIANPOINTLIST2D(((-620.,-440.),(620.,-440.),(620.,0.),(-620.,0.)));
 #10453=IFCINDEXEDPOLYCURVE(#10452,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10454=IFCCARTESIANPOINTLIST2D(((25.,-365.),(39.6446533203125,-400.355346679688),(75.,-415.),(545.,-415.),(580.355346679688,-400.355346679688),(595.,-365.),(595.,-75.),(580.355346679688,-39.6446533203125),(545.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10455=IFCINDEXEDPOLYCURVE(#10454,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10455=IFCINDEXEDPOLYCURVE(#10454,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10456=IFCCARTESIANPOINT((310.,-125.));
 #10457=IFCAXIS2PLACEMENT2D(#10456,$);
 #10458=IFCCIRCLE(#10457,25.);
@@ -10477,7 +10477,7 @@ DATA;
 #10470=IFCCARTESIANPOINTLIST2D(((620.,0.),(1240.,0.),(1240.,440.),(620.,440.)));
 #10471=IFCINDEXEDPOLYCURVE(#10470,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10472=IFCCARTESIANPOINTLIST2D(((645.,75.),(659.644660940673,39.6446609406726),(695.,25.),(1165.,25.),(1200.35533905933,39.6446609406726),(1215.,75.),(1215.,365.),(1200.35533905933,400.355339059327),(1165.,415.),(695.,415.),(659.644660940673,400.355339059327),(645.,365.)));
-#10473=IFCINDEXEDPOLYCURVE(#10472,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10473=IFCINDEXEDPOLYCURVE(#10472,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10474=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10471,(#10473));
 #10475=IFCCARTESIANPOINT((-620.,-440.,36.));
 #10476=IFCDIRECTION((0.,0.,1.));
@@ -10494,7 +10494,7 @@ DATA;
 #10487=IFCEXTRUDEDAREASOLID(#10481,#10485,#10486,36.);
 #10488=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10453,#10455,#10458,#10460));
 #10489=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10469,#10480,#10487));
-#10490=IFCFURNITURETYPE('0VKDCN_y17$h1$zxaTc2YO',$,'Neufert Sink 124x44',$,$,$,(#10495,#10500),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10490=IFCSANITARYTERMINALTYPE('2M2NjuGej10vAcBw7HPUOF',$,'Neufert Sink 124x44',$,$,$,(#10495,#10500),$,$,.NOTDEFINED.);
 #10491=IFCCARTESIANPOINT((0.,0.,0.));
 #10492=IFCDIRECTION((1.,0.,0.));
 #10493=IFCDIRECTION((0.,0.,1.));
@@ -10508,7 +10508,7 @@ DATA;
 #10501=IFCCARTESIANPOINTLIST2D(((-225.,-460.),(225.,-460.),(225.,0.),(-225.,0.)));
 #10502=IFCINDEXEDPOLYCURVE(#10501,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10503=IFCCARTESIANPOINTLIST2D(((-200.,-385.),(-185.355346679688,-420.355346679688),(-150.,-435.),(150.,-435.),(185.355346679688,-420.355346679688),(200.,-385.),(200.,-75.),(185.355346679688,-39.6446533203125),(150.,-25.),(-150.,-25.),(-185.355346679688,-39.6446533203125),(-200.,-75.)));
-#10504=IFCINDEXEDPOLYCURVE(#10503,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10504=IFCINDEXEDPOLYCURVE(#10503,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10505=IFCCARTESIANPOINT((0.,-125.));
 #10506=IFCAXIS2PLACEMENT2D(#10505,$);
 #10507=IFCCIRCLE(#10506,25.);
@@ -10517,7 +10517,7 @@ DATA;
 #10510=IFCCARTESIANPOINTLIST2D(((0.,0.),(450.,0.),(450.,460.),(0.,460.)));
 #10511=IFCINDEXEDPOLYCURVE(#10510,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10512=IFCCARTESIANPOINTLIST2D(((25.,75.),(39.6446609406726,39.6446609406726),(75.,25.),(375.,25.),(410.355339059327,39.6446609406726),(425.,75.),(425.,385.),(410.355339059327,420.355339059327),(375.,435.),(75.,435.),(39.6446609406726,420.355339059327),(25.,385.)));
-#10513=IFCINDEXEDPOLYCURVE(#10512,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10513=IFCINDEXEDPOLYCURVE(#10512,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10514=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10511,(#10513));
 #10515=IFCCARTESIANPOINT((-225.,-460.,42.));
 #10516=IFCDIRECTION((0.,0.,1.));
@@ -10534,7 +10534,7 @@ DATA;
 #10527=IFCEXTRUDEDAREASOLID(#10521,#10525,#10526,42.);
 #10528=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10502,#10504,#10507,#10509));
 #10529=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10520,#10527));
-#10530=IFCFURNITURETYPE('2pjroZyl10oPBZteEpnMt_',$,'Generic Small Sink',$,$,$,(#10535,#10540),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10530=IFCSANITARYTERMINALTYPE('2RWyo9tFj1UxIXXqoldH5y',$,'Generic Small Sink',$,$,$,(#10535,#10540),$,$,.NOTDEFINED.);
 #10531=IFCCARTESIANPOINT((0.,0.,0.));
 #10532=IFCDIRECTION((1.,0.,0.));
 #10533=IFCDIRECTION((0.,0.,1.));
@@ -10548,7 +10548,7 @@ DATA;
 #10541=IFCCARTESIANPOINTLIST2D(((-400.,-460.),(400.,-460.),(400.,0.),(-400.,0.)));
 #10542=IFCINDEXEDPOLYCURVE(#10541,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10543=IFCCARTESIANPOINTLIST2D(((25.,-385.),(39.6446533203125,-420.355346679688),(75.,-435.),(325.,-435.),(360.355346679688,-420.355346679688),(375.,-385.),(375.,-75.),(360.355346679688,-39.6446533203125),(325.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10544=IFCINDEXEDPOLYCURVE(#10543,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10544=IFCINDEXEDPOLYCURVE(#10543,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10545=IFCCARTESIANPOINT((200.,-125.));
 #10546=IFCAXIS2PLACEMENT2D(#10545,$);
 #10547=IFCCIRCLE(#10546,25.);
@@ -10566,7 +10566,7 @@ DATA;
 #10559=IFCCARTESIANPOINTLIST2D(((400.,0.),(800.,0.),(800.,460.),(400.,460.)));
 #10560=IFCINDEXEDPOLYCURVE(#10559,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10561=IFCCARTESIANPOINTLIST2D(((425.,75.),(439.644660940673,39.6446609406726),(475.,25.),(725.,25.),(760.355339059327,39.6446609406726),(775.,75.),(775.,385.),(760.355339059327,420.355339059327),(725.,435.),(475.,435.),(439.644660940673,420.355339059327),(425.,385.)));
-#10562=IFCINDEXEDPOLYCURVE(#10561,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10562=IFCINDEXEDPOLYCURVE(#10561,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10563=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10560,(#10562));
 #10564=IFCCARTESIANPOINT((-400.,-460.,42.));
 #10565=IFCDIRECTION((0.,0.,1.));
@@ -10583,7 +10583,7 @@ DATA;
 #10576=IFCEXTRUDEDAREASOLID(#10570,#10574,#10575,42.);
 #10577=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10542,#10544,#10547,#10549));
 #10578=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10558,#10569,#10576));
-#10579=IFCFURNITURETYPE('3P8g0eZYH438vX$VAfsGny',$,'Generic Medium Sink',$,$,$,(#10584,#10589),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10579=IFCSANITARYTERMINALTYPE('0qTxCveKTFp8fc8iAM75SF',$,'Generic Medium Sink',$,$,$,(#10584,#10589),$,$,.NOTDEFINED.);
 #10580=IFCCARTESIANPOINT((0.,0.,0.));
 #10581=IFCDIRECTION((1.,0.,0.));
 #10582=IFCDIRECTION((0.,0.,1.));
@@ -10597,7 +10597,7 @@ DATA;
 #10590=IFCCARTESIANPOINTLIST2D(((-550.,-490.),(550.,-490.),(550.,0.),(-550.,0.)));
 #10591=IFCINDEXEDPOLYCURVE(#10590,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10592=IFCCARTESIANPOINTLIST2D(((25.,-415.),(39.6446533203125,-450.355346679688),(75.,-465.),(475.,-465.),(510.355346679688,-450.355346679688),(525.,-415.),(525.,-75.),(510.355346679688,-39.6446533203125),(475.,-25.),(75.,-25.),(39.6446533203125,-39.6446533203125),(25.,-75.)));
-#10593=IFCINDEXEDPOLYCURVE(#10592,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10593=IFCINDEXEDPOLYCURVE(#10592,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10594=IFCCARTESIANPOINT((275.,-125.));
 #10595=IFCAXIS2PLACEMENT2D(#10594,$);
 #10596=IFCCIRCLE(#10595,25.);
@@ -10615,7 +10615,7 @@ DATA;
 #10608=IFCCARTESIANPOINTLIST2D(((550.,0.),(1100.,0.),(1100.,490.),(550.,490.)));
 #10609=IFCINDEXEDPOLYCURVE(#10608,(IFCLINEINDEX((1,2)),IFCLINEINDEX((2,3)),IFCLINEINDEX((3,4)),IFCLINEINDEX((4,1))),$);
 #10610=IFCCARTESIANPOINTLIST2D(((575.,75.),(589.644660940673,39.6446609406726),(625.,25.),(1025.,25.),(1060.35533905933,39.6446609406726),(1075.,75.),(1075.,415.),(1060.35533905933,450.355339059327),(1025.,465.),(625.,465.),(589.644660940673,450.355339059327),(575.,415.)));
-#10611=IFCINDEXEDPOLYCURVE(#10610,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((1,12))),$);
+#10611=IFCINDEXEDPOLYCURVE(#10610,(IFCLINEINDEX((12,1)),IFCARCINDEX((1,2,3)),IFCLINEINDEX((3,4)),IFCARCINDEX((4,5,6)),IFCLINEINDEX((6,7)),IFCARCINDEX((7,8,9)),IFCLINEINDEX((9,10)),IFCARCINDEX((10,11,12)),IFCLINEINDEX((12,1))),$);
 #10612=IFCARBITRARYPROFILEDEFWITHVOIDS(.AREA.,$,#10609,(#10611));
 #10613=IFCCARTESIANPOINT((-550.,-490.,44.));
 #10614=IFCDIRECTION((0.,0.,1.));
@@ -10632,7 +10632,7 @@ DATA;
 #10625=IFCEXTRUDEDAREASOLID(#10619,#10623,#10624,44.);
 #10626=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10591,#10593,#10596,#10598));
 #10627=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10607,#10618,#10625));
-#10628=IFCFURNITURETYPE('0D8gU$yLHAyOyIZ9ipVZ0x',$,'Generic Large Sink',$,$,$,(#10633,#10638),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10628=IFCSANITARYTERMINALTYPE('3klCEQBdP8p8G4$350f2zd',$,'Generic Large Sink',$,$,$,(#10633,#10638),$,$,.NOTDEFINED.);
 #10629=IFCCARTESIANPOINT((0.,0.,0.));
 #10630=IFCDIRECTION((1.,0.,0.));
 #10631=IFCDIRECTION((0.,0.,1.));
@@ -10782,7 +10782,7 @@ DATA;
 #10775=IFCCIRCLE(#10774,59.5);
 #10776=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10767));
 #10777=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10769,#10772,#10775));
-#10778=IFCFURNITURETYPE('3UABTzXzbDnAwQIRJnJ$kO',$,'Neufert Washing Machine',$,$,$,(#10783,#10788),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10778=IFCELECTRICAPPLIANCETYPE('3Z3u9w3a11N8E0Z$J6XcGg',$,'Neufert Washing Machine',$,$,$,(#10783,#10788),$,$,.NOTDEFINED.);
 #10779=IFCCARTESIANPOINT((0.,0.,0.));
 #10780=IFCDIRECTION((1.,0.,0.));
 #10781=IFCDIRECTION((0.,0.,1.));
@@ -10816,7 +10816,7 @@ DATA;
 #10809=IFCCARTESIANPOINTLIST2D(((386.75,359.125),(312.375,626.12939453125)));
 #10810=IFCSHAPEREPRESENTATION(#15,'Body','SweptSolid',(#10797));
 #10811=IFCSHAPEREPRESENTATION(#16,'Body','Curve2D',(#10799,#10802,#10805,#10807,#10808));
-#10812=IFCFURNITURETYPE('28$4UCrKfFvhM_N82QBikC',$,'Neufert Drier',$,$,$,(#10817,#10822),$,$,.NOTDEFINED.,.NOTDEFINED.);
+#10812=IFCELECTRICAPPLIANCETYPE('34Po40ClzDxftujBwTKoDd',$,'Neufert Drier',$,$,$,(#10817,#10822),$,$,.NOTDEFINED.);
 #10813=IFCCARTESIANPOINT((0.,0.,0.));
 #10814=IFCDIRECTION((1.,0.,0.));
 #10815=IFCDIRECTION((0.,0.,1.));
diff --git a/src/blenderbim/scripts/generate_furniture_library.py b/src/blenderbim/scripts/generate_furniture_library.py
index b6871e4083..844519f811 100644
--- a/src/blenderbim/scripts/generate_furniture_library.py
+++ b/src/blenderbim/scripts/generate_furniture_library.py
@@ -18,7 +18,6 @@
 
 import ifcopenshell
 import ifcopenshell.api
-import boltspy as bolts
 from math import cos, tan, pi
 from pathlib import Path
 from mathutils import Vector
@@ -85,7 +84,7 @@ def get_simple_2dcurve_data(coords, fillets=[], fillet_radius=[], closed=True, i
                 segments.append([current_point - 1, current_point])
 
     if closed:
-        segments.append([0, len(points) - 1])
+        segments.append([len(points) - 1, 0])
 
     # replace negative index
     if segments[0][0] == -1:
@@ -1612,7 +1611,7 @@ class LibraryGenerator:
 
         overall_width, overall_depth, overall_height = (500.0, 570.0, 820.0)
         representation_3d, representation_2d = create_dishwasher(overall_width, overall_depth, overall_height)
-        self.create_explicit_type("IfcElectricAppliance", "Neufert Dishwasher", representation_3d, representation_2d)
+        self.create_explicit_type("IfcElectricApplianceType", "Neufert Dishwasher", representation_3d, representation_2d)
 
         def create_cooktop(width, depth, height):
             items_3d, items_2d = create_box_objects(width, depth, height)