diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view
index 06fb9926cabec1c5b6151cd3cbf549fb0b10c8fe..aeabf10d1d75ffd4a9d1729e9a1d4afd0b49a1e9 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/Construction.view
@@ -28,8 +28,9 @@
         <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//Construction/layers"/>
       </domainModelReference>
     </domainModelReference>
-    <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="20" minWidth="65"/>
-    <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_-2jXEMHcEeuIHZm4y-I19A" columnDomainReference="_T27I4ME1EeuIHZm4y-I19A" weight="30" minWidth="80"/>
+    <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_d7H2QL8HEeuIHZm4y-I19A" columnDomainReference="_QnRfELPZEeup29SeaUMpQQ" weight="25" minWidth="70"/>
+    <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_4Wqa0MqVEeukSbPYqPhO9g" columnDomainReference="_BjnwoME1EeuIHZm4y-I19A" weight="50" minWidth="180"/>
+    <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:WidthConfiguration" xmi:id="_2M1yIMqWEeukSbPYqPhO9g" columnDomainReference="_T27I4ME1EeuIHZm4y-I19A" weight="25" minWidth="70"/>
     <columnConfigurations xsi:type="org.eclipse.emf.ecp.view.table.model:ReadOnlyColumnConfiguration" xmi:id="_ifhxAME1EeuIHZm4y-I19A" columnDomainReferences="_T27I4ME1EeuIHZm4y-I19A"/>
   </children>
   <ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view
index 90ee7e06d437cf2dc9eb5b4f320d3b62cb82bed2..f221441ca36519fc7ec36a41f495a4a498b004d2 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowType.view
@@ -38,7 +38,7 @@
       </domainModelReference>
     </children>
     <children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="_7hPBXq21Eeup29SeaUMpQQ" name="Control embodiedCarbon">
-      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_7hPBX621Eeup29SeaUMpQQ">
+      <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_11eAsMg1EeuLhPP9_K73gQ">
         <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/embodiedCarbon"/>
       </domainModelReference>
     </children>
diff --git a/de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.xmi b/de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.buildphys
similarity index 89%
rename from de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.xmi
rename to de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.buildphys
index 395a093aada61519c9bf5c28b437c62687160ba1..2fd013d416a4117f81fe91bef356be8eea3790aa 100644
--- a/de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.xmi	
+++ b/de.hftstuttgart.buildingphysics/catalogs/2020 German Buildings IWU.buildphys	
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildphys:BuildingPhysicsCatalog xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:buildphys="http://www.hftstuttgart.de/buildingphysics" name="German Building Typology Library IWU" description="Update: 27.02.2018 / inspired from Deutsche Gebaeudetypologie, Institut Wohnen und Umwelt (2003 and 2011), including the EnEV2016 standards.&#xA;Update: 27.06.2019 Verena Weiler : window ratio calculated from reference building types' area for walls and windows from IWU 2015." source="http://www.iwu.de">
   <windows>
-    <windowTypes windowTypeId="window_0" name="Double-glazed window with old wooden/aluminum frame" uValue="3.2 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="809.02 kW·h/m²" embodiedCarbon="143.4 kg" constructionDescription="double glazing with old wooden/aluminum frame, produced in Germany, transportation 50 km " disposalEnergy="5.16 kW·h/m²" disposalCarbon="1.5 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_1" name="Double-glazed window with plastic frame" uValue="2.57 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="577.53 kW·h/m²" embodiedCarbon="106.92 kg" constructionDescription="double glazing with plastic frame, produced in Germany, transportation 50 km " disposalEnergy="4.48 kW·h/m²" disposalCarbon="2.26 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_2" name="Low-E double-glazed window" uValue="1.6 W/(m²·K)" gValue="0.63" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kg" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_3" name="Low-E double-glazed window EnEV2016" uValue="1.3 W/(m²·K)" gValue="0.6" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kg" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_4" name="Low-E triple-glazed window" uValue="1.05 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_5" name="Low-E triple-glazed window KfW 40" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <windowTypes windowTypeId="window_6" name="Low-E triple-glazed window KfW 55" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kg" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_0" name="Double-glazed window with old wooden/aluminum frame" uValue="3.2 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="809.02 kW·h/m²" embodiedCarbon="143.4 kgCO₂eq/m²" constructionDescription="double glazing with old wooden/aluminum frame, produced in Germany, transportation 50 km " disposalEnergy="5.16 kW·h/m²" disposalCarbon="1.5 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_1" name="Double-glazed window with plastic frame" uValue="2.57 W/(m²·K)" gValue="0.76" glazingNumber="2" frameRatio="0.3" embodiedEnergy="577.53 kW·h/m²" embodiedCarbon="106.92 kgCO₂eq/m²" constructionDescription="double glazing with plastic frame, produced in Germany, transportation 50 km " disposalEnergy="4.48 kW·h/m²" disposalCarbon="2.26 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_2" name="Low-E double-glazed window" uValue="1.6 W/(m²·K)" gValue="0.63" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kgCO₂eq/m²" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_3" name="Low-E double-glazed window EnEV2016" uValue="1.3 W/(m²·K)" gValue="0.6" glazingNumber="2" frameRatio="0.3" embodiedEnergy="628.89 kW·h/m²" embodiedCarbon="81.57 kgCO₂eq/m²" constructionDescription="double glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="3.97 kW·h/m²" disposalCarbon="4.48 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_4" name="Low-E triple-glazed window" uValue="1.05 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kgCO₂eq/m²" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_5" name="Low-E triple-glazed window KfW 40" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kgCO₂eq/m²" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <windowTypes windowTypeId="window_6" name="Low-E triple-glazed window KfW 55" uValue="0.91 W/(m²·K)" gValue="0.5" glazingNumber="3" frameRatio="0.3" embodiedEnergy="694.42 kW·h/m²" embodiedCarbon="98.5 kgCO₂eq/m²" constructionDescription="triple glazing with wooden frame, produced in Germany, transportation 50 km " disposalEnergy="4.56 kW·h/m²" disposalCarbon="4.93 kgCO₂eq/m²" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <windowTypes windowTypeId="window_7" name="Single-glazed window" uValue="5 W/(m²·K)" gValue="0.86" frameRatio="0.3" constructionDescription="" disposalDescription=""/>
   </windows>
   <materialCategories name="Brick">
-    <materials materialId="material_0" name="Solid brick" density="2000 kg/m³" heatCapacity="840 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="0.8 kW·h/kg" embodiedCarbon="0.25 kg" constructionDescription="solid brick made of clay, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_0" name="Solid brick" density="2000 kg/m³" heatCapacity="840 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="0.8 kW·h/kg" embodiedCarbon="0.25 kgCO₂eq/kg" constructionDescription="solid brick made of clay, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_1" name="Cored brick" density="1500 kg/m³" heatCapacity="920 J/K" conductivity="0.71 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_2" name="Honeycomb brick" density="1120 kg/m³" heatCapacity="790 J/K" conductivity="0.3 W/(m·K)" embodiedEnergy="0.77 kW·h/kg" embodiedCarbon="0.14 kg" constructionDescription="light clay brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_3" name="Inner leaf brick" density="1800 kg/m³" heatCapacity="840 J/K" conductivity="0.62 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_4" name="Outer leaf brick" density="2000 kg/m³" heatCapacity="650 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_2" name="Honeycomb brick" density="1120 kg/m³" heatCapacity="790 J/K" conductivity="0.3 W/(m·K)" embodiedEnergy="0.77 kW·h/kg" embodiedCarbon="0.14 kgCO₂eq/kg" constructionDescription="light clay brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_3" name="Inner leaf brick" density="1800 kg/m³" heatCapacity="840 J/K" conductivity="0.62 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kgCO₂eq/kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_4" name="Outer leaf brick" density="2000 kg/m³" heatCapacity="650 J/K" conductivity="0.96 W/(m·K)" embodiedEnergy="1.1 kW·h/kg" embodiedCarbon="0.95 kgCO₂eq/kg" constructionDescription="made of portland clinker, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_5" name="Vermiculite insulated brick" density="700 kg/m³" heatCapacity="840 J/K" conductivity="0.27 W/(m·K)" constructionDescription="" disposalDescription=""/>
   </materialCategories>
   <materialCategories name="Concrete">
-    <materials materialId="material_6" name="Breeze block" density="1500 kg/m³" heatCapacity="650 J/K" conductivity="0.44 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.12 kg" constructionDescription="concrete block, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_7" name="Concrete dense" density="2000 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.16 kg" constructionDescription="concrete 50MPa, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_6" name="Breeze block" density="1500 kg/m³" heatCapacity="650 J/K" conductivity="0.44 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.12 kgCO₂eq/kg" constructionDescription="concrete block, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_7" name="Concrete dense" density="2000 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.16 kgCO₂eq/kg" constructionDescription="concrete 50MPa, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_8" name="Concrete lightweight" density="1200 kg/m³" heatCapacity="1014 J/K" conductivity="0.38 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_9" name="Aerated concrete block" density="500 kg/m³" heatCapacity="840 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.01 kW·h/kg" embodiedCarbon="0.48 kg" constructionDescription="autoclaved aerated concrete, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_9" name="Aerated concrete block" density="500 kg/m³" heatCapacity="840 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.01 kW·h/kg" embodiedCarbon="0.48 kgCO₂eq/kg" constructionDescription="autoclaved aerated concrete, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_10" name="Foamed slag concrete" density="1040 kg/m³" heatCapacity="960 J/K" conductivity="0.25 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_11" name="Vermiculite aggregate concrete" density="450 kg/m³" heatCapacity="833 J/K" conductivity="0.17 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_12" name="No fines concrete" density="1800 kg/m³" heatCapacity="840 J/K" conductivity="0.96 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_13" name="Glass reinforced concrete" density="1950 kg/m³" heatCapacity="840 J/K" conductivity="0.9 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_14" name="Reinforced concrete" density="2240 kg/m³" heatCapacity="900 J/K" conductivity="1.95 W/(m·K)" embodiedEnergy="0.46 kW·h/kg" embodiedCarbon="0.18 kg" constructionDescription="concrete 25 MPa, steel low alloyed, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_14" name="Reinforced concrete" density="2240 kg/m³" heatCapacity="900 J/K" conductivity="1.95 W/(m·K)" embodiedEnergy="0.46 kW·h/kg" embodiedCarbon="0.18 kgCO₂eq/kg" constructionDescription="concrete 25 MPa, steel low alloyed, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
   </materialCategories>
   <materialCategories name="Ground covering">
     <materials materialId="material_15" name="Infusorial (9% mc)" density="480 kg/m³" heatCapacity="180 J/K" conductivity="0.09 W/(m·K)" constructionDescription="" disposalDescription=""/>
@@ -38,16 +38,16 @@
     <materials materialId="material_18" name="Asbestos insulation" density="577 kg/m³" heatCapacity="833 J/K" conductivity="0.16 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_19" name="Cork insulation" density="105 kg/m³" heatCapacity="1810 J/K" conductivity="0.045 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_20" name="Woodwool" density="500 kg/m³" heatCapacity="1014 J/K" conductivity="0.1 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_21" name="Glasswool" density="250 kg/m³" heatCapacity="840 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kg" constructionDescription="glaswool mat for insulation, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_21" name="Glasswool" density="250 kg/m³" heatCapacity="840 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kgCO₂eq/kg" constructionDescription="glaswool mat for insulation, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_22" name="Sheeps wool" density="198 kg/m³" heatCapacity="1360 J/K" conductivity="0.06 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_23" name="Mineral fibre" density="105 kg/m³" heatCapacity="1800 J/K" conductivity="0.045 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_24" name="Urea formaldehyde foam (UFFI)" density="30 kg/m³" heatCapacity="1764 J/K" conductivity="0.03 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_25" name="Polyurethane (PUR)" density="30 kg/m³" heatCapacity="837 J/K" conductivity="0.025 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_26" name="Foamed glass" density="125 kg/m³" heatCapacity="833 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="9.04 kW·h/kg" embodiedCarbon="2.04 kg" constructionDescription="foamed glass, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_27" name="Cellulose (loose fill)" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.037 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kg" constructionDescription="cellulose loose fill including blow in, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_26" name="Foamed glass" density="125 kg/m³" heatCapacity="833 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="9.04 kW·h/kg" embodiedCarbon="2.04 kgCO₂eq/kg" constructionDescription="foamed glass, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_27" name="Cellulose (loose fill)" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.037 W/(m·K)" embodiedEnergy="2.98 kW·h/kg" embodiedCarbon="0.54 kgCO₂eq/kg" constructionDescription="cellulose loose fill including blow in, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_28" name="Extruded polystyrene (XPS 030)" density="32 kg/m³" heatCapacity="1412 J/K" conductivity="0.03 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_29" name="Expanded polystyrene (EPS 040)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
-    <materials materialId="material_30" name="Expanded polystyrene (EPS 035)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.035 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+    <materials materialId="material_29" name="Expanded polystyrene (EPS 040)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.04 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kgCO₂eq/kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kgCO₂eq/kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+    <materials materialId="material_30" name="Expanded polystyrene (EPS 035)" density="25 kg/m³" heatCapacity="1014 J/K" conductivity="0.035 W/(m·K)" embodiedEnergy="27.2 kW·h/kg" embodiedCarbon="3.83 kgCO₂eq/kg" constructionDescription="polystyrene, CO2 blown, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.13 kgCO₂eq/kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
     <materials materialId="material_31" name="Expanded PVC" density="55 kg/m³" heatCapacity="1014 J/K" conductivity="0.04 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_32" name="Silicon" density="700 kg/m³" heatCapacity="1004 J/K" conductivity="0.18 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_33" name="Wool felt underlay" density="160 kg/m³" heatCapacity="1360 J/K" conductivity="0.04 W/(m·K)" constructionDescription="" disposalDescription=""/>
@@ -62,33 +62,33 @@
   <materialCategories name="Plaster">
     <materials materialId="material_39" name="Dense plaster" density="1300 kg/m³" heatCapacity="1000 J/K" conductivity="0.5 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_40" name="Light plaster" density="600 kg/m³" heatCapacity="1000 J/K" conductivity="0.16 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_41" name="Gypsum plasterboard" density="950 kg/m³" heatCapacity="833 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.61 kW·h/kg" embodiedCarbon="0.43 kg" constructionDescription="produced from 100% natural gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_41" name="Gypsum plasterboard" density="950 kg/m³" heatCapacity="833 J/K" conductivity="0.16 W/(m·K)" embodiedEnergy="1.61 kW·h/kg" embodiedCarbon="0.43 kgCO₂eq/kg" constructionDescription="produced from 100% natural gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_42" name="Perlite plasterboard" density="800 kg/m³" heatCapacity="833 J/K" conductivity="0.18 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_43" name="Gypsum plastering" density="1200 kg/m³" heatCapacity="833 J/K" conductivity="0.42 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.07 kg" constructionDescription="gypsum plastering made of gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_43" name="Gypsum plastering" density="1200 kg/m³" heatCapacity="833 J/K" conductivity="0.42 W/(m·K)" embodiedEnergy="0.3 kW·h/kg" embodiedCarbon="0.07 kgCO₂eq/kg" constructionDescription="gypsum plastering made of gypsum, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_44" name="Perlite plastering" density="400 kg/m³" heatCapacity="833 J/K" conductivity="0.08 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_45" name="Vermiculite plastering" density="720 kg/m³" heatCapacity="833 J/K" conductivity="0.2 W/(m·K)" constructionDescription="" disposalDescription=""/>
   </materialCategories>
   <materialCategories name="Stone">
-    <materials materialId="material_46" name="Sandstone" density="2000 kg/m³" heatCapacity="724 J/K" conductivity="1.3 W/(m·K)" embodiedEnergy="0.45 kW·h/kg" embodiedCarbon="0.17 kg" constructionDescription="sand-lime brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_46" name="Sandstone" density="2000 kg/m³" heatCapacity="724 J/K" conductivity="1.3 W/(m·K)" embodiedEnergy="0.45 kW·h/kg" embodiedCarbon="0.17 kgCO₂eq/kg" constructionDescription="sand-lime brick, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_47" name="Granite" density="2600 kg/m³" heatCapacity="905 J/K" conductivity="2.5 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_48" name="Marble" density="2500 kg/m³" heatCapacity="796 J/K" conductivity="2 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_49" name="Limestone" density="2180 kg/m³" heatCapacity="724 J/K" conductivity="1.5 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_50" name="Slate" density="2700 kg/m³" heatCapacity="760 J/K" conductivity="2 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_51" name="Gravel" density="1840 kg/m³" heatCapacity="833 J/K" conductivity="0.36 W/(m·K)" embodiedEnergy="0.08 kW·h/kg" embodiedCarbon="0.02 kg" constructionDescription="gravel, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_51" name="Gravel" density="1840 kg/m³" heatCapacity="833 J/K" conductivity="0.36 W/(m·K)" embodiedEnergy="0.08 kW·h/kg" embodiedCarbon="0.02 kgCO₂eq/kg" constructionDescription="gravel, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_52" name="Chippings" density="1800 kg/m³" heatCapacity="1000 J/K" conductivity="0.96 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_53" name="Pumice stone" density="1280 kg/m³" heatCapacity="840 J/K" conductivity="0.53 W/(m·K)" embodiedEnergy="0.44 kW·h/kg" embodiedCarbon="0.24 kg" constructionDescription="light weight concrete block - pumice, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_54" name="Sand" density="1500 kg/m³" heatCapacity="830 J/K" conductivity="0.2 W/(m·K)" embodiedEnergy="0.05 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="sand, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_55" name="Cinder aggregate" density="1000 kg/m³" heatCapacity="800 J/K" conductivity="0.4 W/(m·K)" embodiedEnergy="0.04 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="ground granulated plast furnace slag, produced in Germany, transportation 50 km" disposalEnergy="0.07 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_53" name="Pumice stone" density="1280 kg/m³" heatCapacity="840 J/K" conductivity="0.53 W/(m·K)" embodiedEnergy="0.44 kW·h/kg" embodiedCarbon="0.24 kgCO₂eq/kg" constructionDescription="light weight concrete block - pumice, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_54" name="Sand" density="1500 kg/m³" heatCapacity="830 J/K" conductivity="0.2 W/(m·K)" embodiedEnergy="0.05 kW·h/kg" embodiedCarbon="0.01 kgCO₂eq/kg" constructionDescription="sand, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_55" name="Cinder aggregate" density="1000 kg/m³" heatCapacity="800 J/K" conductivity="0.4 W/(m·K)" embodiedEnergy="0.04 kW·h/kg" embodiedCarbon="0.01 kgCO₂eq/kg" constructionDescription="ground granulated plast furnace slag, produced in Germany, transportation 50 km" disposalEnergy="0.07 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
   </materialCategories>
   <materialCategories name="Tile">
     <materials materialId="material_56" name="Concrete lightweight screed" density="1200 kg/m³" heatCapacity="833 J/K" conductivity="0.41 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_57" name="Concrete screed" density="2100 kg/m³" heatCapacity="1014 J/K" conductivity="1.28 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_58" name="Granolithic screed" density="2085 kg/m³" heatCapacity="833 J/K" conductivity="0.87 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_59" name="Cement screed" density="2100 kg/m³" heatCapacity="650 J/K" conductivity="1.4 W/(m·K)" embodiedEnergy="0.36 kW·h/kg" embodiedCarbon="0.2 kg" constructionDescription=" cement is portland cement, strength class Z 42.5, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to material landfill, transportation 50 km"/>
+    <materials materialId="material_59" name="Cement screed" density="2100 kg/m³" heatCapacity="650 J/K" conductivity="1.4 W/(m·K)" embodiedEnergy="0.36 kW·h/kg" embodiedCarbon="0.2 kgCO₂eq/kg" constructionDescription=" cement is portland cement, strength class Z 42.5, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to material landfill, transportation 50 km"/>
     <materials materialId="material_60" name="Rendering dry" density="1300 kg/m³" heatCapacity="1014 J/K" conductivity="0.5 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_61" name="Rendering (1% mc)" density="1431 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_62" name="Rendering (8% mc)" density="1329 kg/m³" heatCapacity="1014 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
-    <materials materialId="material_63" name="Aged rendering" density="1329 kg/m³" heatCapacity="1000 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_61" name="Rendering (1% mc)" density="1431 kg/m³" heatCapacity="1014 J/K" conductivity="1.13 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kgCO₂eq/kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_62" name="Rendering (8% mc)" density="1329 kg/m³" heatCapacity="1014 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kgCO₂eq/kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_63" name="Aged rendering" density="1329 kg/m³" heatCapacity="1000 J/K" conductivity="0.79 W/(m·K)" embodiedEnergy="0.21 kW·h/kg" embodiedCarbon="0.06 kgCO₂eq/kg" constructionDescription="clay plaster (sand: 0.55kg, clay: 0.25kg, water: 0.2kg), produced in Germany, transportation 50 km" disposalEnergy="0.1 kW·h/kg" disposalCarbon="0.02 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_64" name="Clay tile" density="1900 kg/m³" heatCapacity="837 J/K" conductivity="0.85 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_65" name="Concrete tile" density="2100 kg/m³" heatCapacity="837 J/K" conductivity="1.1 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_66" name="Slate tile" density="2700 kg/m³" heatCapacity="760 J/K" conductivity="2 W/(m·K)" constructionDescription="" disposalDescription=""/>
@@ -101,7 +101,7 @@
     <materials materialId="material_73" name="Ceiling (mineral)" density="290 kg/m³" heatCapacity="2000 J/K" conductivity="0.03 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_74" name="Ceiling (plaster)" density="1120 kg/m³" heatCapacity="840 J/K" conductivity="0.38 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_75" name="Bitumen felt" density="1700 kg/m³" heatCapacity="1000 J/K" conductivity="0.5 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_76" name="Roofing felt" density="960 kg/m³" heatCapacity="837 J/K" conductivity="0.19 W/(m·K)" embodiedEnergy="12.41 kW·h/kg" embodiedCarbon="0.85 kg" constructionDescription="plastic liner consisting of polymer EP4 flame retardant and bitumen seal, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.11 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+    <materials materialId="material_76" name="Roofing felt" density="960 kg/m³" heatCapacity="837 J/K" conductivity="0.19 W/(m·K)" embodiedEnergy="12.41 kW·h/kg" embodiedCarbon="0.85 kgCO₂eq/kg" constructionDescription="plastic liner consisting of polymer EP4 flame retardant and bitumen seal, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.11 kgCO₂eq/kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
     <materials materialId="material_77" name="Asphalt mastic roofing" density="2325 kg/m³" heatCapacity="837 J/K" conductivity="1.15 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_78" name="Asphalt" density="1907 kg/m³" heatCapacity="833 J/K" conductivity="0.62 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_79" name="Asbestos cement" density="1500 kg/m³" heatCapacity="1000 J/K" conductivity="0.36 W/(m·K)" constructionDescription="" disposalDescription=""/>
@@ -109,23 +109,23 @@
   </materialCategories>
   <materialCategories name="Wood">
     <materials materialId="material_81" name="Wood block" density="800 kg/m³" heatCapacity="2093 J/K" conductivity="0.16 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_82" name="Hardboard medium" density="600 kg/m³" heatCapacity="2027 J/K" conductivity="0.08 W/(m·K)" embodiedEnergy="13.13 kW·h/kg" embodiedCarbon="1.3 kg" constructionDescription="fibreboard hard, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
+    <materials materialId="material_82" name="Hardboard medium" density="600 kg/m³" heatCapacity="2027 J/K" conductivity="0.08 W/(m·K)" embodiedEnergy="13.13 kW·h/kg" embodiedCarbon="1.3 kgCO₂eq/kg" constructionDescription="fibreboard hard, produced in Germany, transportation 50 km" disposalEnergy="0.12 kW·h/kg" disposalCarbon="0.08 kgCO₂eq/kg" disposalDescription="100% sent to sanitary landfill, transportation 50 km"/>
     <materials materialId="material_83" name="Hardboard standard" density="900 kg/m³" heatCapacity="2027 J/K" conductivity="0.13 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_84" name="Timber flooring" density="650 kg/m³" heatCapacity="1195 J/K" conductivity="0.14 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_85" name="Corkboard" density="160 kg/m³" heatCapacity="1888 J/K" conductivity="0.04 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_86" name="Chipboard" density="800 kg/m³" heatCapacity="2093 J/K" conductivity="0.15 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_87" name="Softboard" density="350 kg/m³" heatCapacity="1000 J/K" conductivity="0.56 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_88" name="Weatherboard" density="650 kg/m³" heatCapacity="2000 J/K" conductivity="0.14 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_89" name="Hardwood (oak, mapple, walnut...)" density="700 kg/m³" heatCapacity="1412 J/K" conductivity="0.15 W/(m·K)" embodiedEnergy="1.59 kW·h/kg" embodiedCarbon="0.03 kg" constructionDescription="sawing of hardwood, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_89" name="Hardwood (oak, mapple, walnut...)" density="700 kg/m³" heatCapacity="1412 J/K" conductivity="0.15 W/(m·K)" embodiedEnergy="1.59 kW·h/kg" embodiedCarbon="0.03 kgCO₂eq/kg" constructionDescription="sawing of hardwood, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_90" name="Softwood (pine, spruce...)" density="630 kg/m³" heatCapacity="2760 J/K" conductivity="0.13 W/(m·K)" constructionDescription="" disposalDescription=""/>
     <materials materialId="material_91" name="Plywood" density="560 kg/m³" heatCapacity="2500 J/K" conductivity="0.15 W/(m·K)" constructionDescription="" disposalDescription=""/>
-    <materials materialId="material_92" name="Fibreboard" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.06 W/(m·K)" embodiedEnergy="5.23 kW·h/kg" embodiedCarbon="1.2 kg" constructionDescription="fibreboard soft without adhesives, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_92" name="Fibreboard" density="300 kg/m³" heatCapacity="1000 J/K" conductivity="0.06 W/(m·K)" embodiedEnergy="5.23 kW·h/kg" embodiedCarbon="1.2 kgCO₂eq/kg" constructionDescription="fibreboard soft without adhesives, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.08 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
   </materialCategories>
   <materialCategories name="Others">
-    <materials materialId="material_93" name="Loam" density="1280 kg/m³" heatCapacity="1000 J/K" conductivity="0.55 W/(m·K)" embodiedEnergy="0.06 kW·h/kg" embodiedCarbon="0.01 kg" constructionDescription="market for clay, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_93" name="Loam" density="1280 kg/m³" heatCapacity="1000 J/K" conductivity="0.55 W/(m·K)" embodiedEnergy="0.06 kW·h/kg" embodiedCarbon="0.01 kgCO₂eq/kg" constructionDescription="market for clay, produced in Germany, transportation 50 km" disposalEnergy="0.08 kW·h/kg" disposalCarbon="0.01 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
     <materials materialId="material_94" name="Air layer (horizontal 10cm)" density="1.2 kg/m³" heatCapacity="1400 J/K" conductivity="0.45 W/(m·K)" constructionDescription="air layer inbetween different construction types" disposalDescription="no disposal for air layer"/>
     <materials materialId="material_95" name="Air layer (vertical 10cm)" density="1.2 kg/m³" heatCapacity="1400 J/K" conductivity="0.55 W/(m·K)" constructionDescription="air layer inbetween different construction types" disposalDescription="no disposal for air layer"/>
-    <materials materialId="material_96" name="Rafters with glasswool insulation" density="288 kg/m³" heatCapacity="1032 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="15.18 kW·h/kg" embodiedCarbon="0.71 kg" constructionDescription="ratio 80/20 Vol.-% (glasswool/rafters), glued laminated timber used as rafters, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.06 kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
+    <materials materialId="material_96" name="Rafters with glasswool insulation" density="288 kg/m³" heatCapacity="1032 J/K" conductivity="0.05 W/(m·K)" embodiedEnergy="15.18 kW·h/kg" embodiedCarbon="0.71 kgCO₂eq/kg" constructionDescription="ratio 80/20 Vol.-% (glasswool/rafters), glued laminated timber used as rafters, produced in Germany, transportation 50 km" disposalEnergy="0.11 kW·h/kg" disposalCarbon="0.06 kgCO₂eq/kg" disposalDescription="100% sent to landfill, transportation 50 km"/>
   </materialCategories>
   <constructionCategories name="outWall">
     <constructions constructionId="construction_0" name="Aerated concrete-25cm">
diff --git a/de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl b/de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl
index 63b6c28e0b83c826d8e1c2ff3f007ed011cc8bc6..8ffbbbdd4078b8a615f677253259e41762c7db20 100644
--- a/de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl
+++ b/de.hftstuttgart.buildingphysics/catalogs/migrateFromSimStadt.xsl
@@ -29,12 +29,12 @@
 					<xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" />
 						<xsl:value-of select="' kW·h/m²'" /></xsl:attribute>
 					<xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" />
-						<xsl:value-of select="' kg'" /></xsl:attribute>
+						<xsl:value-of select="' kgCO₂eq/m²'" /></xsl:attribute>
 					<xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute>
 					<xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" />
 						<xsl:value-of select="' kW·h/m²'" /></xsl:attribute>
 					<xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" />
-						<xsl:value-of select="' kg'" /></xsl:attribute>
+						<xsl:value-of select="' kgCO₂eq/m²'" /></xsl:attribute>
 					<xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute>
 				</xsl:element>
 			</xsl:for-each>
@@ -63,12 +63,12 @@
 			<xsl:attribute name="embodiedEnergy"><xsl:value-of select="embodiedEnergy" />
 				<xsl:value-of select="' kW·h/kg'" /></xsl:attribute>
 			<xsl:attribute name="embodiedCarbon"><xsl:value-of select="embodiedCarbon" />
-				<xsl:value-of select="' kg'" /></xsl:attribute>
+				<xsl:value-of select="' kgCOâ‚‚eq/kg'" /></xsl:attribute>
 			<xsl:attribute name="constructionDescription"><xsl:value-of select="constructionDescription" /></xsl:attribute>
 			<xsl:attribute name="disposalEnergy"><xsl:value-of select="disposalEnergy" />
 				<xsl:value-of select="' kW·h/kg'" /></xsl:attribute>
 			<xsl:attribute name="disposalCarbon"><xsl:value-of select="disposalCarbon" />
-				<xsl:value-of select="' kg'" /></xsl:attribute>
+				<xsl:value-of select="' kgCOâ‚‚eq/kg'" /></xsl:attribute>
 			<xsl:attribute name="disposalDescription"><xsl:value-of select="disposalDescription" /></xsl:attribute>
 		</xsl:element>
 	</xsl:template>
diff --git a/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore b/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
index f720a93326376e0a3b29625ec8748254dc7aa955..a811b1503a53062da644a72781e9d997c1b249a4 100644
--- a/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
+++ b/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore
@@ -39,7 +39,7 @@
         defaultValueLiteral="kW*h/m²"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
-        defaultValueLiteral="kg"/>
+        defaultValueLiteral="kgCO₂eq/m²"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1"
@@ -47,7 +47,7 @@
         defaultValueLiteral="kW*h/m²"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
-        defaultValueLiteral="kg"/>
+        defaultValueLiteral="kgCO₂eq/m²"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
@@ -78,7 +78,7 @@
         defaultValueLiteral="kW*h/kg"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="embodiedCarbon" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
-        defaultValueLiteral="kg"/>
+        defaultValueLiteral="kgCOâ‚‚eq/kg"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="constructionDescription"
         lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalEnergy" lowerBound="1"
@@ -86,7 +86,7 @@
         defaultValueLiteral="kW*h/kg"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalCarbon" lowerBound="1"
         eType="ecore:EDataType ../../de.hftstuttgart.cityunits.model/model/Quantities.ecore#//QuantityDouble"
-        defaultValueLiteral="kg"/>
+        defaultValueLiteral="kgCOâ‚‚eq/kg"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="disposalDescription" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="category" ordered="false"
diff --git a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
index df7035d4a01f7261535664b221d32e96bc631e1c..a18d46ea2d04abfa49142e9641a6f412eb255c7e 100644
--- a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/Material.java
@@ -172,13 +172,13 @@ public interface Material extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
+	 * The default value is <code>"kgCO\u2082eq/kg"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Embodied Carbon</em>' attribute.
 	 * @see #setEmbodiedCarbon(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_EmbodiedCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kgCO\u2082eq/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getEmbodiedCarbon();
@@ -240,13 +240,13 @@ public interface Material extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
+	 * The default value is <code>"kgCO\u2082eq/kg"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Disposal Carbon</em>' attribute.
 	 * @see #setDisposalCarbon(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getMaterial_DisposalCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kgCO\u2082eq/kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getDisposalCarbon();
diff --git a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
index ab1408c1beeca51290481d4c8425ddaefd8764bd..f227c717772fd150ddb03db5a8678f4a07e16ed8 100644
--- a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/WindowType.java
@@ -199,13 +199,13 @@ public interface WindowType extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Embodied Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
+	 * The default value is <code>"kgCO\u2082eq/m\u00b2"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Embodied Carbon</em>' attribute.
 	 * @see #setEmbodiedCarbon(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_EmbodiedCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kgCO\u2082eq/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getEmbodiedCarbon();
@@ -267,13 +267,13 @@ public interface WindowType extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Disposal Carbon</b></em>' attribute.
-	 * The default value is <code>"kg"</code>.
+	 * The default value is <code>"kgCO\u2082eq/m\u00b2"</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Disposal Carbon</em>' attribute.
 	 * @see #setDisposalCarbon(NullableQuantity)
 	 * @see de.hftstuttgart.buildingphysics.BuildingPhysicsPackage#getWindowType_DisposalCarbon()
-	 * @model default="kg" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
+	 * @model default="kgCO\u2082eq/m\u00b2" dataType="de.hftstuttgart.cityunits.model.quantities.QuantityDouble" required="true"
 	 * @generated
 	 */
 	NullableQuantity getDisposalCarbon();
diff --git a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
index e62b95fe82a638031d60c3825f17e88effb18420..70d5e93c549c7cce57bbd18bb5af3dacf3d1e06f 100644
--- a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/BuildingPhysicsPackageImpl.java
@@ -796,18 +796,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEAttribute(getWindowType_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
 				"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
 				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWindowType_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg",
-				1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon",
+				"kgCO\u2082eq/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
 				null, 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
 				"kW*h/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
 				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getWindowType_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg",
-				1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getWindowType_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon",
+				"kgCO\u2082eq/m\u00b2", 1, 1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getWindowType_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1,
 				1, WindowType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
@@ -845,18 +845,18 @@ public class BuildingPhysicsPackageImpl extends EPackageImpl implements Building
 		initEAttribute(getMaterial_EmbodiedEnergy(), theQuantitiesPackage.getQuantityDouble(), "embodiedEnergy",
 				"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMaterial_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon", "kg",
-				1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMaterial_EmbodiedCarbon(), theQuantitiesPackage.getQuantityDouble(), "embodiedCarbon",
+				"kgCO\u2082eq/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterial_ConstructionDescription(), ecorePackage.getEString(), "constructionDescription",
 				null, 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterial_DisposalEnergy(), theQuantitiesPackage.getQuantityDouble(), "disposalEnergy",
 				"kW*h/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMaterial_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon", "kg",
-				1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMaterial_DisposalCarbon(), theQuantitiesPackage.getQuantityDouble(), "disposalCarbon",
+				"kgCO\u2082eq/kg", 1, 1, Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getMaterial_DisposalDescription(), ecorePackage.getEString(), "disposalDescription", null, 1, 1,
 				Material.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 				!IS_DERIVED, IS_ORDERED);
diff --git a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
index d746ccb1d24cc36fc597baf9d3ad10f579cdc284..9a9812b86dbf8ed2652ee54005b6186feb3499b1 100644
--- a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/MaterialImpl.java
@@ -180,7 +180,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @ordered
 	 */
 	protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/kg");
 
 	/**
 	 * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
@@ -242,7 +242,7 @@ public class MaterialImpl extends MinimalEObjectImpl.Container implements Materi
 	 * @ordered
 	 */
 	protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/kg");
 
 	/**
 	 * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.
diff --git a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
index 256382b5c685173554bcbbbe26846479904f6358..ab9b236e6209d68d019edf05c626fcb4edc80f7c 100644
--- a/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
+++ b/de.hftstuttgart.buildingphysics/src/de/hftstuttgart/buildingphysics/impl/WindowTypeImpl.java
@@ -193,7 +193,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @ordered
 	 */
 	protected static final NullableQuantity EMBODIED_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/m\u00b2");
 
 	/**
 	 * The cached value of the '{@link #getEmbodiedCarbon() <em>Embodied Carbon</em>}' attribute.
@@ -255,7 +255,7 @@ public class WindowTypeImpl extends MinimalEObjectImpl.Container implements Wind
 	 * @ordered
 	 */
 	protected static final NullableQuantity DISPOSAL_CARBON_EDEFAULT = (NullableQuantity) QuantitiesFactory.eINSTANCE
-			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kg");
+			.createFromString(QuantitiesPackage.eINSTANCE.getQuantityDouble(), "kgCO\u2082eq/m\u00b2");
 
 	/**
 	 * The cached value of the '{@link #getDisposalCarbon() <em>Disposal Carbon</em>}' attribute.