diff --git a/esdl/model/EsdlXML.xsd b/esdl/model/EsdlXML.xsd
index f52fac5..726170f 100755
--- a/esdl/model/EsdlXML.xsd
+++ b/esdl/model/EsdlXML.xsd
@@ -2544,19 +2544,12 @@ When a model queries for a value from a certain date (and to a certain date), th
       <xsd:documentation>Defines a distribution in terms of 'from' and 'to'</xsd:documentation>
     </xsd:annotation>
   </xsd:element>
-  <xsd:complexType name="FromToPerc">
+  <xsd:complexType abstract="true" name="FromToPerc">
     <xsd:annotation>
       <xsd:documentation>Defines a range and a percentage, used in the FromToDistribution class</xsd:documentation>
     </xsd:annotation>
-    <xsd:attribute name="from" type="xsd:double"/>
-    <xsd:attribute name="to" type="xsd:double"/>
     <xsd:attribute name="percentage" type="xsd:double"/>
   </xsd:complexType>
-  <xsd:element name="FromToPerc" type="esdl:FromToPerc">
-    <xsd:annotation>
-      <xsd:documentation>Defines a range and a percentage, used in the FromToDistribution class</xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
   <xsd:complexType name="PItemStat">
     <xsd:annotation>
       <xsd:documentation>(experimental) Used to define statistical information</xsd:documentation>
@@ -3081,15 +3074,13 @@ When a model queries for a value from a certain date (and to a certain date), th
     <xsd:attribute name="description" type="xsd:string"/>
   </xsd:complexType>
   <xsd:element name="KPIs" type="esdl:KPIs"/>
-  <xsd:complexType name="KPI">
+  <xsd:complexType abstract="true" name="KPI">
     <xsd:sequence>
       <xsd:element maxOccurs="1" minOccurs="0" name="quantityAndUnit" type="esdl:AbstractQuantityAndUnit"/>
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:string"/>
     <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="value" type="xsd:double"/>
   </xsd:complexType>
-  <xsd:element name="KPI" type="esdl:KPI"/>
   <xsd:complexType name="QuantityAndUnits">
     <xsd:sequence>
       <xsd:element maxOccurs="unbounded" minOccurs="0" name="quantityAndUnit" type="esdl:QuantityAndUnitType"/>
@@ -3501,8 +3492,6 @@ When a model queries for a value from a certain date (and to a certain date), th
     </xsd:complexContent>
   </xsd:complexType>
   <xsd:element name="BuildingUsageReference" type="esdl:BuildingUsageReference"/>
-  <xsd:complexType name="NewEClass198"/>
-  <xsd:element name="NewEClass198" type="esdl:NewEClass198"/>
   <xsd:complexType name="BuildingUsageInformation">
     <xsd:sequence>
       <xsd:element maxOccurs="unbounded" minOccurs="0" name="buildingUsage" type="esdl:BuildingUsage"/>
@@ -3555,4 +3544,46 @@ When a model queries for a value from a certain date (and to a certain date), th
     <xsd:attribute name="percentage" type="xsd:double"/>
   </xsd:complexType>
   <xsd:element name="HousingTypePercentage" type="esdl:HousingTypePercentage"/>
+  <xsd:complexType name="DoubleKPI">
+    <xsd:complexContent>
+      <xsd:extension base="esdl:KPI">
+        <xsd:attribute name="value" type="xsd:double"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="DoubleKPI" type="esdl:DoubleKPI"/>
+  <xsd:complexType name="StringKPI">
+    <xsd:complexContent>
+      <xsd:extension base="esdl:KPI">
+        <xsd:attribute name="value" type="xsd:string"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="StringKPI" type="esdl:StringKPI"/>
+  <xsd:complexType name="IntKPI">
+    <xsd:complexContent>
+      <xsd:extension base="esdl:KPI">
+        <xsd:attribute name="value" type="xsd:int"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="IntKPI" type="esdl:IntKPI"/>
+  <xsd:complexType name="FromToIntPerc">
+    <xsd:complexContent>
+      <xsd:extension base="esdl:FromToPerc">
+        <xsd:attribute name="from" type="xsd:int"/>
+        <xsd:attribute name="to" type="xsd:int"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="FromToIntPerc" type="esdl:FromToIntPerc"/>
+  <xsd:complexType name="FromToDoublePerc">
+    <xsd:complexContent>
+      <xsd:extension base="esdl:FromToPerc">
+        <xsd:attribute name="from" type="xsd:double"/>
+        <xsd:attribute name="to" type="xsd:double"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:element name="FromToDoublePerc" type="esdl:FromToDoublePerc"/>
 </xsd:schema>
diff --git a/esdl/model/esdl.aird b/esdl/model/esdl.aird
index 2a86c1f..c8f5a9f 100755
--- a/esdl/model/esdl.aird
+++ b/esdl/model/esdl.aird
@@ -2625,7 +2625,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Xexrpj8NEei9rvcHqHEJ0Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_XexroT8NEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xexroj8NEei9rvcHqHEJ0Q" x="4260" y="732" width="147" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xexroj8NEei9rvcHqHEJ0Q" x="4106" y="732" width="147" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_ciO-cD8NEei9rvcHqHEJ0Q" type="2003" element="_chjB8D8NEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_ciO-cz8NEei9rvcHqHEJ0Q" type="5007"/>
@@ -2634,7 +2634,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_ciO-dj8NEei9rvcHqHEJ0Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_ciO-cT8NEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ciO-cj8NEei9rvcHqHEJ0Q" x="4420" y="732" width="149" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ciO-cj8NEei9rvcHqHEJ0Q" x="4266" y="732" width="149" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_hfKygD8NEei9rvcHqHEJ0Q" type="2003" element="_heCxID8NEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_hfKygz8NEei9rvcHqHEJ0Q" type="5007"/>
@@ -2651,7 +2651,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_hfKyhj8NEei9rvcHqHEJ0Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_hfKygT8NEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hfKygj8NEei9rvcHqHEJ0Q" x="4274" y="865" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hfKygj8NEei9rvcHqHEJ0Q" x="4120" y="865" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_li4fkD8NEei9rvcHqHEJ0Q" type="2003" element="_liF1YD8NEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_li4fkz8NEei9rvcHqHEJ0Q" type="5007"/>
@@ -2668,7 +2668,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_li4flj8NEei9rvcHqHEJ0Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_li4fkT8NEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li4fkj8NEei9rvcHqHEJ0Q" x="4416" y="865" width="150" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_li4fkj8NEei9rvcHqHEJ0Q" x="4262" y="865" width="150" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_AxPuUD8OEei9rvcHqHEJ0Q" type="2003" element="_AwSsED8OEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_AxPuUz8OEei9rvcHqHEJ0Q" type="5007"/>
@@ -2697,14 +2697,6 @@
         <children xmi:type="notation:Node" xmi:id="_i0QEMD8PEei9rvcHqHEJ0Q" type="2003" element="_izTB8D8PEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_i0QEMz8PEei9rvcHqHEJ0Q" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_i0QEND8PEei9rvcHqHEJ0Q" type="7004">
-            <children xmi:type="notation:Node" xmi:id="_ulVsoD8PEei9rvcHqHEJ0Q" type="3010" element="_ukYDUD8PEei9rvcHqHEJ0Q">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ulVsoT8PEei9rvcHqHEJ0Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ulVsoj8PEei9rvcHqHEJ0Q"/>
-            </children>
-            <children xmi:type="notation:Node" xmi:id="_ve3VoD8PEei9rvcHqHEJ0Q" type="3010" element="_vd66cD8PEei9rvcHqHEJ0Q">
-              <styles xmi:type="notation:FontStyle" xmi:id="_ve3VoT8PEei9rvcHqHEJ0Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_ve3Voj8PEei9rvcHqHEJ0Q"/>
-            </children>
             <children xmi:type="notation:Node" xmi:id="_wGc6ED8PEei9rvcHqHEJ0Q" type="3010" element="_wFqP4D8PEei9rvcHqHEJ0Q">
               <styles xmi:type="notation:FontStyle" xmi:id="_wGc6ET8PEei9rvcHqHEJ0Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_wGc6Ej8PEei9rvcHqHEJ0Q"/>
@@ -2713,7 +2705,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_i0QENj8PEei9rvcHqHEJ0Q"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_i0QEMT8PEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i0QEMj8PEei9rvcHqHEJ0Q" x="4584" y="865" width="145" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_i0QEMj8PEei9rvcHqHEJ0Q" x="4428" y="768" width="145" height="62"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_vvo-wD8eEei9rvcHqHEJ0Q" type="2003" element="_vuw1AD8eEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_vvo-wz8eEei9rvcHqHEJ0Q" type="5007"/>
@@ -4251,7 +4243,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_JMCO8r_nEeiAH9yqHyGq3A"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JL66Mb_nEeiAH9yqHyGq3A" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JL66Mr_nEeiAH9yqHyGq3A" x="3839" y="-12" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JL66Mr_nEeiAH9yqHyGq3A" x="3839" y="-59" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_McvxwL_nEeiAH9yqHyGq3A" type="2003" element="_MaKX0L_nEeiAH9yqHyGq3A">
           <children xmi:type="notation:Node" xmi:id="_Mcw_4L_nEeiAH9yqHyGq3A" type="5007"/>
@@ -4264,15 +4256,11 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_ReTnIb_nEeiAH9yqHyGq3A" fontName="Segoe UI" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_ReTnIr_nEeiAH9yqHyGq3A"/>
             </children>
-            <children xmi:type="notation:Node" xmi:id="_4zWAQEGuEem98ftVcWRouw" type="3010" element="_4u_rwEGuEem98ftVcWRouw">
-              <styles xmi:type="notation:FontStyle" xmi:id="_4zWAQUGuEem98ftVcWRouw" fontName="Segoe UI" fontHeight="8"/>
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_4zWAQkGuEem98ftVcWRouw"/>
-            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_Mcw_4r_nEeiAH9yqHyGq3A"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Mcw_47_nEeiAH9yqHyGq3A"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Mcvxwb_nEeiAH9yqHyGq3A" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mcvxwr_nEeiAH9yqHyGq3A" x="3605" y="-12" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mcvxwr_nEeiAH9yqHyGq3A" x="3605" y="-59" width="120" height="74"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_G0kZkL_tEeiAH9yqHyGq3A" type="2003" element="_GypG8L_tEeiAH9yqHyGq3A">
           <children xmi:type="notation:Node" xmi:id="_G0lAoL_tEeiAH9yqHyGq3A" type="5007"/>
@@ -5003,7 +4991,7 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_-NPBMdkjEeiAiP44lhTokg" fontName="Segoe UI" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-NPBMtkjEeiAiP44lhTokg" x="1971" y="2514" width="120" height="126"/>
         </children>
-        <children xmi:type="notation:Shape" xmi:id="_n6pPkOP9Eei-rO52rQ5FJw" type="Note" fontName="Segoe UI" description="Changes since last commit: &#xD;&#xA;- corrected UTES (potential) type&#xD;&#xA;- added APPARTMENT in ResidentialBuildingEnum&#xD;&#xA;- changed BEJAARD_ECHTPAAR naar SENIOREN&#xD;&#xA;- added CRS to Geometry&#xD;&#xA;- copied some parameters from Building to BuildingUnit and AggregatedBuilding&#xD;&#xA;- added three new distributions for AggregatedBuilding" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+        <children xmi:type="notation:Shape" xmi:id="_n6pPkOP9Eei-rO52rQ5FJw" type="Note" fontName="Segoe UI" description="Changes since last commit: &#xD;&#xA;- added subtypes for KPIs&#xD;&#xA;- added subtypes for FromToPerc" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
           <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_n6pPkeP9Eei-rO52rQ5FJw" source="specificStyles">
             <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_n6pPkuP9Eei-rO52rQ5FJw" key="verticalAlignment" value="8"/>
           </eAnnotations>
@@ -5016,7 +5004,7 @@
           <styles xmi:type="notation:TextStyle" xmi:id="_n6pPk-P9Eei-rO52rQ5FJw" textAlignment="Center"/>
           <styles xmi:type="notation:LineTypeStyle" xmi:id="_n6pPlOP9Eei-rO52rQ5FJw"/>
           <element xsi:nil="true"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n6pPleP9Eei-rO52rQ5FJw" x="129" y="-1048" width="308" height="316"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_n6pPleP9Eei-rO52rQ5FJw" x="113" y="-1044" width="308" height="316"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_Ebw7QOdiEeifBNzYXDcFjw" type="2003" element="_EZiGoOdiEeifBNzYXDcFjw">
           <children xmi:type="notation:Node" xmi:id="_Ebw7Q-diEeifBNzYXDcFjw" type="5007"/>
@@ -5365,15 +5353,6 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_2sk9wVSWEem-bdM7RNgzGw" fontName="Segoe UI" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2sk9wlSWEem-bdM7RNgzGw" x="4957" y="240" width="154" height="38"/>
         </children>
-        <children xmi:type="notation:Node" xmi:id="_OUjUoFSXEem-bdM7RNgzGw" type="2003" element="_OSAW8FSXEem-bdM7RNgzGw">
-          <children xmi:type="notation:Node" xmi:id="_OUjUo1SXEem-bdM7RNgzGw" type="5007"/>
-          <children xmi:type="notation:Node" xmi:id="_OUjUpFSXEem-bdM7RNgzGw" type="7004">
-            <styles xmi:type="notation:SortingStyle" xmi:id="_OUjUpVSXEem-bdM7RNgzGw"/>
-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OUjUplSXEem-bdM7RNgzGw"/>
-          </children>
-          <styles xmi:type="notation:ShapeStyle" xmi:id="_OUjUoVSXEem-bdM7RNgzGw" fontName="Segoe UI" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OUjUolSXEem-bdM7RNgzGw" x="5532" y="-564" width="120" height="100"/>
-        </children>
         <children xmi:type="notation:Node" xmi:id="_QjbnAFSXEem-bdM7RNgzGw" type="2003" element="_Qgzw0FSXEem-bdM7RNgzGw">
           <children xmi:type="notation:Node" xmi:id="_QjbnA1SXEem-bdM7RNgzGw" type="5007"/>
           <children xmi:type="notation:Node" xmi:id="_QjbnBFSXEem-bdM7RNgzGw" type="7004">
@@ -5465,6 +5444,79 @@
           <styles xmi:type="notation:ShapeStyle" xmi:id="_IooOcWgxEemrq79eHTNoiA" fontName="Segoe UI" fontHeight="8"/>
           <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IooOcmgxEemrq79eHTNoiA" x="5143" y="865" width="157" height="100"/>
         </children>
+        <children xmi:type="notation:Node" xmi:id="_5k7yEG2cEemDJde0nU6h9A" type="2003" element="_5ekEUG2cEemDJde0nU6h9A">
+          <children xmi:type="notation:Node" xmi:id="_5lADgG2cEemDJde0nU6h9A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_5lBRoG2cEemDJde0nU6h9A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_78am0G2cEemDJde0nU6h9A" type="3010" element="_72JmwG2cEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_78am0W2cEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_78am0m2cEemDJde0nU6h9A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_5lBRoW2cEemDJde0nU6h9A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_5lBRom2cEemDJde0nU6h9A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_5k7yEW2cEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5k7yEm2cEemDJde0nU6h9A" x="3696" y="34" width="120" height="63"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_AHITwG2dEemDJde0nU6h9A" type="2003" element="_AB_8IG2dEemDJde0nU6h9A">
+          <children xmi:type="notation:Node" xmi:id="_AHITw22dEemDJde0nU6h9A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_AHITxG2dEemDJde0nU6h9A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_Ba6P0G2dEemDJde0nU6h9A" type="3010" element="_BViAkG2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_Ba6P0W2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Ba6P0m2dEemDJde0nU6h9A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_AHITxW2dEemDJde0nU6h9A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_AHITxm2dEemDJde0nU6h9A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_AHITwW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHITwm2dEemDJde0nU6h9A" x="3547" y="36" width="120" height="60"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_GD50MG2dEemDJde0nU6h9A" type="2003" element="_F_8hQG2dEemDJde0nU6h9A">
+          <children xmi:type="notation:Node" xmi:id="_GD50M22dEemDJde0nU6h9A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_GD50NG2dEemDJde0nU6h9A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_G7QS8G2dEemDJde0nU6h9A" type="3010" element="_G3ChUG2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_G7QS8W2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_G7QS8m2dEemDJde0nU6h9A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_GD50NW2dEemDJde0nU6h9A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_GD50Nm2dEemDJde0nU6h9A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_GD50MW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GD50Mm2dEemDJde0nU6h9A" x="3620" y="101" width="120" height="54"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_iWDbMG2dEemDJde0nU6h9A" type="2003" element="_iSvogG2dEemDJde0nU6h9A">
+          <children xmi:type="notation:Node" xmi:id="_iWDbM22dEemDJde0nU6h9A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_iWDbNG2dEemDJde0nU6h9A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_0pYooG2dEemDJde0nU6h9A" type="3010" element="_0lWdMG2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_0pYooW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_0pYoom2dEemDJde0nU6h9A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_4A5-EG2dEemDJde0nU6h9A" type="3010" element="_39y_sG2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_4A5-EW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_4A5-Em2dEemDJde0nU6h9A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_iWDbNW2dEemDJde0nU6h9A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_iWDbNm2dEemDJde0nU6h9A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_iWDbMW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iWDbMm2dEemDJde0nU6h9A" x="4441" y="865" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_u2rqMG2dEemDJde0nU6h9A" type="2003" element="_uzU0MG2dEemDJde0nU6h9A">
+          <children xmi:type="notation:Node" xmi:id="_u2sRQG2dEemDJde0nU6h9A" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_u2sRQW2dEemDJde0nU6h9A" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_yZWfsG2dEemDJde0nU6h9A" type="3010" element="_yVQp4G2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_yZWfsW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_yZWfsm2dEemDJde0nU6h9A"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_zmpZQG2dEemDJde0nU6h9A" type="3010" element="_zi8lAG2dEemDJde0nU6h9A">
+              <styles xmi:type="notation:FontStyle" xmi:id="_zmpZQW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_zmpZQm2dEemDJde0nU6h9A"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_u2sRQm2dEemDJde0nU6h9A"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_u2sRQ22dEemDJde0nU6h9A"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_u2rqMW2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u2rqMm2dEemDJde0nU6h9A" x="4577" y="864" width="143" height="100"/>
+        </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_Mvo1wrryEeeIKeRLj9tspA"/>
         <edges xmi:type="notation:Edge" xmi:id="_3HsngrryEeeIKeRLj9tspA" type="4001" element="_A84mUP0SEeeeKZnzyFWydQ" source="_3GNZwLryEeeIKeRLj9tspA" target="_3Gr65LryEeeIKeRLj9tspA">
           <children xmi:type="notation:Node" xmi:id="_3HtOkLryEeeIKeRLj9tspA" type="6001">
@@ -6823,7 +6875,7 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_gTMHkT8NEei9rvcHqHEJ0Q" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_gTMHkj8NEei9rvcHqHEJ0Q" fontName="Segoe UI" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gTMHkz8NEei9rvcHqHEJ0Q" points="[0, 0, -1, 93]$[0, -43, -1, 50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gTMHmj8NEei9rvcHqHEJ0Q" id="(0.4068965517241379,0.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gTMHmj8NEei9rvcHqHEJ0Q" id="(0.7482993197278912,0.04)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gTMHmz8NEei9rvcHqHEJ0Q" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_oF9gUD8NEei9rvcHqHEJ0Q" type="4001" element="_oEh88D8NEei9rvcHqHEJ0Q" source="_XexroD8NEei9rvcHqHEJ0Q" target="_hfKygD8NEei9rvcHqHEJ0Q">
@@ -6876,33 +6928,33 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_mgE1sD8PEei9rvcHqHEJ0Q" type="4001" element="_me0RcD8PEei9rvcHqHEJ0Q" source="_AxPuUD8OEei9rvcHqHEJ0Q" target="_i0QEMD8PEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_mgE1tD8PEei9rvcHqHEJ0Q" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgE1tT8PEei9rvcHqHEJ0Q" y="-1"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgE1tT8PEei9rvcHqHEJ0Q" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mgFcwD8PEei9rvcHqHEJ0Q" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgFcwT8PEei9rvcHqHEJ0Q" x="2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgFcwT8PEei9rvcHqHEJ0Q" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mgFcwj8PEei9rvcHqHEJ0Q" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgFcwz8PEei9rvcHqHEJ0Q" x="-2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mgFcwz8PEei9rvcHqHEJ0Q" x="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_mgE1sT8PEei9rvcHqHEJ0Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_mgE1sj8PEei9rvcHqHEJ0Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mgE1sz8PEei9rvcHqHEJ0Q" points="[0, 0, 13, -33]$[0, 16, 13, -17]$[-13, 16, 0, -17]$[-13, 33, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mgE1sz8PEei9rvcHqHEJ0Q" points="[-70, -86, 100, -24]$[-177, -86, -7, -24]$[-177, -62, -7, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mgFcxD8PEei9rvcHqHEJ0Q" id="(0.4861111111111111,1.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mgFcxT8PEei9rvcHqHEJ0Q" id="(0.3969359331476323,0.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_P4mdED8QEei9rvcHqHEJ0Q" type="4001" element="_P3qB4D8QEei9rvcHqHEJ0Q" source="_-IoyIB70EeiL86HAPKdWlg" target="_ciO-cD8NEei9rvcHqHEJ0Q">
           <children xmi:type="notation:Node" xmi:id="_P4mdFD8QEei9rvcHqHEJ0Q" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdFT8QEei9rvcHqHEJ0Q" x="-210" y="-9"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdFT8QEei9rvcHqHEJ0Q" x="-133" y="-9"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_P4mdFj8QEei9rvcHqHEJ0Q" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdFz8QEei9rvcHqHEJ0Q" x="-16" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdFz8QEei9rvcHqHEJ0Q" x="7" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_P4mdGD8QEei9rvcHqHEJ0Q" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdGT8QEei9rvcHqHEJ0Q" x="-130" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_P4mdGT8QEei9rvcHqHEJ0Q" x="1" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_P4mdET8QEei9rvcHqHEJ0Q" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_P4mdEj8QEei9rvcHqHEJ0Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P4mdEz8QEei9rvcHqHEJ0Q" points="[41, 71, -562, -32]$[592, 71, -11, -32]$[592, 103, -11, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_P4mdEz8QEei9rvcHqHEJ0Q" points="[41, 71, -408, -32]$[438, 71, -11, -32]$[438, 103, -11, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4mdGj8QEei9rvcHqHEJ0Q" id="(0.7960199004975125,0.25793650793650796)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_P4mdGz8QEei9rvcHqHEJ0Q" id="(0.54421768707483,0.0)"/>
         </edges>
@@ -7996,7 +8048,7 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_eB-jEL_nEeiAH9yqHyGq3A" type="4001" element="_eAOPkL_nEeiAH9yqHyGq3A" source="_3GnCYLryEeeIKeRLj9tspA" target="_JL66ML_nEeiAH9yqHyGq3A">
           <children xmi:type="notation:Node" xmi:id="_eB_KIL_nEeiAH9yqHyGq3A" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eB_KIb_nEeiAH9yqHyGq3A" x="-129" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eB_KIb_nEeiAH9yqHyGq3A" x="-60" y="9"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_eB_KIr_nEeiAH9yqHyGq3A" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eB_KI7_nEeiAH9yqHyGq3A" x="15" y="-10"/>
@@ -8006,7 +8058,7 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_eB-jEb_nEeiAH9yqHyGq3A" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_eB-jEr_nEeiAH9yqHyGq3A" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eB-jE7_nEeiAH9yqHyGq3A" points="[-97, -58, 288, 50]$[-300, -58, 85, 50]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eB-jE7_nEeiAH9yqHyGq3A" points="[-97, -105, 288, 50]$[-300, -105, 85, 50]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eB_xML_nEeiAH9yqHyGq3A" id="(0.4298245614035088,0.9023778959594108)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eB_xMb_nEeiAH9yqHyGq3A" id="(0.2796610169491525,0.0)"/>
         </edges>
@@ -8140,18 +8192,18 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_engTMMABEeivt_YVVSPqcQ" type="4001" element="_ekk7AMABEeivt_YVVSPqcQ" source="_McvxwL_nEeiAH9yqHyGq3A" target="_JqpO0L_tEeiAH9yqHyGq3A">
           <children xmi:type="notation:Node" xmi:id="_eng6QMABEeivt_YVVSPqcQ" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6QcABEeivt_YVVSPqcQ" x="-45" y="738"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6QcABEeivt_YVVSPqcQ" x="-754" y="-11"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_eng6QsABEeivt_YVVSPqcQ" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6Q8ABEeivt_YVVSPqcQ" x="25" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6Q8ABEeivt_YVVSPqcQ" x="31" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_eng6RMABEeivt_YVVSPqcQ" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6RcABEeivt_YVVSPqcQ" x="-271" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eng6RcABEeivt_YVVSPqcQ" x="-276" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_engTMcABEeivt_YVVSPqcQ" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_engTMsABEeivt_YVVSPqcQ" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_engTM8ABEeivt_YVVSPqcQ" points="[0, -36, 1674, 34]$[-809, -36, 865, 34]$[-809, -96, 865, -26]$[-1674, -96, 0, -26]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eng6RsABEeivt_YVVSPqcQ" id="(0.0,0.8571428571428571)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_engTM8ABEeivt_YVVSPqcQ" points="[0, -3, 1674, -3]$[-809, -3, 865, -3]$[-809, -27, 865, -27]$[-1674, -27, 0, -27]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eng6RsABEeivt_YVVSPqcQ" id="(0.008333333333333333,0.8513513513513513)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eng6R8ABEeivt_YVVSPqcQ" id="(1.0,0.6224489795918368)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_eCbOUNIXEeiAat7H2LjUYw" type="4001" element="_d-d7YNIXEeiAat7H2LjUYw" source="_cQD40NIXEeiAat7H2LjUYw" target="_SniPAN5ZEeebdO1tBIjb0w">
@@ -9508,17 +9560,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Q37i8D_0EemA-eLmXK1uKA" type="4001" element="_Qz-3ED_0EemA-eLmXK1uKA" source="_3Gr65LryEeeIKeRLj9tspA" target="_JL66ML_nEeiAH9yqHyGq3A">
           <children xmi:type="notation:Node" xmi:id="_Q4DewD_0EemA-eLmXK1uKA" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4DewT_0EemA-eLmXK1uKA" x="-267" y="-9"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4DewT_0EemA-eLmXK1uKA" x="-243" y="-9"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Q4Es4D_0EemA-eLmXK1uKA" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4Es4T_0EemA-eLmXK1uKA" x="219" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4Es4T_0EemA-eLmXK1uKA" x="226" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Q5Q_sD_0EemA-eLmXK1uKA" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q5Q_sT_0EemA-eLmXK1uKA" x="-143" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q5Q_sT_0EemA-eLmXK1uKA" x="-103" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Q37i8T_0EemA-eLmXK1uKA" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Q37i8j_0EemA-eLmXK1uKA" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q37i8z_0EemA-eLmXK1uKA" points="[5, 5, -562, -62]$[566, 5, -1, -62]$[566, 67, -1, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q37i8z_0EemA-eLmXK1uKA" points="[5, 5, -562, -15]$[566, 5, -1, -15]$[566, 20, -1, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q5WfQD_0EemA-eLmXK1uKA" id="(0.9769585253456221,0.7543859649122807)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q5WfQT_0EemA-eLmXK1uKA" id="(0.5,0.0)"/>
         </edges>
@@ -10001,6 +10053,86 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-3VeFmgxEemrq79eHTNoiA" id="(0.9802955665024631,0.3126635269492412)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-3VeF2gxEemrq79eHTNoiA" id="(0.0,0.16326530612244897)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_LXHaQG2dEemDJde0nU6h9A" type="4001" element="_LSZ5im2dEemDJde0nU6h9A" source="_AHITwG2dEemDJde0nU6h9A" target="_McvxwL_nEeiAH9yqHyGq3A">
+          <children xmi:type="notation:Node" xmi:id="_LXIBUG2dEemDJde0nU6h9A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LXIBUW2dEemDJde0nU6h9A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LXIBUm2dEemDJde0nU6h9A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LXIBU22dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_LXIBVG2dEemDJde0nU6h9A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LXIBVW2dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_LXHaQW2dEemDJde0nU6h9A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_LXHaQm2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LXHaQ22dEemDJde0nU6h9A" points="[0, 0, -67, 23]$[67, -23, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LXIoYG2dEemDJde0nU6h9A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LXIoYW2dEemDJde0nU6h9A" id="(0.576271186440678,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_L67R8G2dEemDJde0nU6h9A" type="4001" element="_L2rELm2dEemDJde0nU6h9A" source="_GD50MG2dEemDJde0nU6h9A" target="_McvxwL_nEeiAH9yqHyGq3A">
+          <children xmi:type="notation:Node" xmi:id="_L67R9G2dEemDJde0nU6h9A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L67R9W2dEemDJde0nU6h9A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L67R9m2dEemDJde0nU6h9A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L67R922dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_L67R-G2dEemDJde0nU6h9A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_L67R-W2dEemDJde0nU6h9A" x="-10" y="4"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_L67R8W2dEemDJde0nU6h9A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_L67R8m2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_L67R822dEemDJde0nU6h9A" points="[-1, 0, 5, 160]$[-1, -73, 5, 87]$[-14, -73, -8, 87]$[-14, -88, -8, 72]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L67R-m2dEemDJde0nU6h9A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_L67R-22dEemDJde0nU6h9A" id="(0.576271186440678,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Q9l6kG2dEemDJde0nU6h9A" type="4001" element="_Q5xK5m2dEemDJde0nU6h9A" source="_5k7yEG2cEemDJde0nU6h9A" target="_McvxwL_nEeiAH9yqHyGq3A">
+          <children xmi:type="notation:Node" xmi:id="_Q9l6lG2dEemDJde0nU6h9A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q9l6lW2dEemDJde0nU6h9A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Q9mhoG2dEemDJde0nU6h9A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q9mhoW2dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Q9mhom2dEemDJde0nU6h9A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q9mho22dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Q9l6kW2dEemDJde0nU6h9A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Q9l6km2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Q9l6k22dEemDJde0nU6h9A" points="[0, 0, 91, 21]$[-91, -21, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9mhpG2dEemDJde0nU6h9A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Q9mhpW2dEemDJde0nU6h9A" id="(0.576271186440678,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_wynycG2dEemDJde0nU6h9A" type="4001" element="_wvdxDm2dEemDJde0nU6h9A" source="_u2rqMG2dEemDJde0nU6h9A" target="_i0QEMD8PEei9rvcHqHEJ0Q">
+          <children xmi:type="notation:Node" xmi:id="_wynydG2dEemDJde0nU6h9A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wynydW2dEemDJde0nU6h9A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_wynydm2dEemDJde0nU6h9A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wynyd22dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_wynyeG2dEemDJde0nU6h9A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wynyeW2dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_wynycW2dEemDJde0nU6h9A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_wynycm2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wynyc22dEemDJde0nU6h9A" points="[0, 0, 136, 36]$[-136, -36, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyoZgG2dEemDJde0nU6h9A" id="(0.41843971631205673,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wyoZgW2dEemDJde0nU6h9A" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_xZxSAG2dEemDJde0nU6h9A" type="4001" element="_xWzdrm2dEemDJde0nU6h9A" source="_iWDbMG2dEemDJde0nU6h9A" target="_i0QEMD8PEei9rvcHqHEJ0Q">
+          <children xmi:type="notation:Node" xmi:id="_xZxSBG2dEemDJde0nU6h9A" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZxSBW2dEemDJde0nU6h9A" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_xZxSBm2dEemDJde0nU6h9A" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZxSB22dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_xZxSCG2dEemDJde0nU6h9A" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xZxSCW2dEemDJde0nU6h9A" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_xZxSAW2dEemDJde0nU6h9A" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_xZxSAm2dEemDJde0nU6h9A" fontName="Segoe UI" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xZxSA22dEemDJde0nU6h9A" points="[0, 0, -12, 37]$[12, -37, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xZxSCm2dEemDJde0nU6h9A" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xZxSC22dEemDJde0nU6h9A" id="(0.3969359331476323,0.0)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_2jH60LryEeeIKeRLj9tspA" name="EnergyAsset" tooltipText="" outgoingEdges="_A84mUP0SEeeeKZnzyFWydQ _A9HP0_0SEeeeKZnzyFWydQ _5V2SkOdoEeifBNzYXDcFjw" incomingEdges="_A850c_0SEeeeKZnzyFWydQ _A86bgP0SEeeeKZnzyFWydQ _A86bhP0SEeeeKZnzyFWydQ _A86biP0SEeeeKZnzyFWydQ _A87Ck_0SEeeeKZnzyFWydQ" width="12" height="10">
@@ -15281,32 +15413,17 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_izTB8D8PEei9rvcHqHEJ0Q" name="FromToPerc" tooltipText="" incomingEdges="_me0RcD8PEei9rvcHqHEJ0Q" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_izTB8D8PEei9rvcHqHEJ0Q" name="FromToPerc" tooltipText="" incomingEdges="_me0RcD8PEei9rvcHqHEJ0Q _wvdxDm2dEemDJde0nU6h9A _xWzdrm2dEemDJde0nU6h9A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToPerc"/>
       <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//FromToPerc"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_xBu2kD8PEei9rvcHqHEJ0Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_f6kQWm2dEemDJde0nU6h9A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_ukYDUD8PEei9rvcHqHEJ0Q" name="from : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/from"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/from"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_vIn_4D8PEei9rvcHqHEJ0Q" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_vd66cD8PEei9rvcHqHEJ0Q" name="to : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/to"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/to"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_v4c6UD8PEei9rvcHqHEJ0Q" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="_wFqP4D8PEei9rvcHqHEJ0Q" name="percentage : EDouble = 0.0" tooltipText="">
         <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/percentage"/>
         <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/percentage"/>
@@ -18634,14 +18751,15 @@
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MaKX0L_nEeiAH9yqHyGq3A" name="KPI" tooltipText="" outgoingEdges="_ekk7AMABEeivt_YVVSPqcQ" incomingEdges="_Ns0SgL_nEeiAH9yqHyGq3A" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MaKX0L_nEeiAH9yqHyGq3A" name="KPI" tooltipText="" outgoingEdges="_ekk7AMABEeivt_YVVSPqcQ" incomingEdges="_Ns0SgL_nEeiAH9yqHyGq3A _LSZ5im2dEemDJde0nU6h9A _L2rELm2dEemDJde0nU6h9A _Q5xK5m2dEemDJde0nU6h9A" width="12" height="10">
       <target xmi:type="ecore:EClass" href="esdl.ecore#//KPI"/>
       <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//KPI"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_MaK-4L_nEeiAH9yqHyGq3A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_wsbgZG2cEemDJde0nU6h9A" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="_O9UREL_nEeiAH9yqHyGq3A" name="id : EString" tooltipText="">
@@ -18660,14 +18778,6 @@
         </ownedStyle>
         <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
       </ownedElements>
-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_4u_rwEGuEem98ftVcWRouw" name="value : EDouble = 0.0" tooltipText="">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//KPI/value"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//KPI/value"/>
-        <ownedStyle xmi:type="diagram:BundledImage" uid="_4vAS0EGuEem98ftVcWRouw" labelAlignment="LEFT">
-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
-        </ownedStyle>
-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
-      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Ns0SgL_nEeiAH9yqHyGq3A" name="[0..*] kpi" sourceNode="_JHUHAL_nEeiAH9yqHyGq3A" targetNode="_MaKX0L_nEeiAH9yqHyGq3A">
       <target xmi:type="ecore:EReference" href="esdl.ecore#//KPIs/kpi"/>
@@ -21483,14 +21593,6 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_OSAW8FSXEem-bdM7RNgzGw" name="NewEClass198" tooltipText="" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="esdl.ecore#//NewEClass198"/>
-      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//NewEClass198"/>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_OSAW8VSXEem-bdM7RNgzGw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
-    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Qgzw0FSXEem-bdM7RNgzGw" name="BuildingUsageInformation" tooltipText="" outgoingEdges="_cgLGIVSXEem-bdM7RNgzGw" incomingEdges="_n0TFlFSXEem-bdM7RNgzGw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="esdl.ecore#//BuildingUsageInformation"/>
       <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//BuildingUsageInformation"/>
@@ -21764,6 +21866,174 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_5ekEUG2cEemDJde0nU6h9A" name="DoubleKPI" tooltipText="" outgoingEdges="_Q5xK5m2dEemDJde0nU6h9A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//DoubleKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//DoubleKPI"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_5elScG2cEemDJde0nU6h9A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_72JmwG2cEemDJde0nU6h9A" name="value : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//DoubleKPI/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//DoubleKPI/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_72JmwW2cEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_AB_8IG2dEemDJde0nU6h9A" name="StringKPI" tooltipText="" outgoingEdges="_LSZ5im2dEemDJde0nU6h9A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//StringKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//StringKPI"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ACAjMG2dEemDJde0nU6h9A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_BViAkG2dEemDJde0nU6h9A" name="value : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//StringKPI/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//StringKPI/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_BVinoG2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_F_8hQG2dEemDJde0nU6h9A" name="IntKPI" tooltipText="" outgoingEdges="_L2rELm2dEemDJde0nU6h9A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//IntKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//IntKPI"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_F_8hQW2dEemDJde0nU6h9A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_G3ChUG2dEemDJde0nU6h9A" name="value : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//IntKPI/value"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//IntKPI/value"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_G3ChUW2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_LSZ5im2dEemDJde0nU6h9A" sourceNode="_AB_8IG2dEemDJde0nU6h9A" targetNode="_MaKX0L_nEeiAH9yqHyGq3A">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//StringKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//StringKPI"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_LSZ5i22dEemDJde0nU6h9A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_LSZ5jG2dEemDJde0nU6h9A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_LSZ5jW2dEemDJde0nU6h9A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_L2rELm2dEemDJde0nU6h9A" sourceNode="_F_8hQG2dEemDJde0nU6h9A" targetNode="_MaKX0L_nEeiAH9yqHyGq3A">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//IntKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//IntKPI"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_L2rEL22dEemDJde0nU6h9A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_L2rEMG2dEemDJde0nU6h9A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_L2rEMW2dEemDJde0nU6h9A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Q5xK5m2dEemDJde0nU6h9A" sourceNode="_5ekEUG2cEemDJde0nU6h9A" targetNode="_MaKX0L_nEeiAH9yqHyGq3A">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//DoubleKPI"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//DoubleKPI"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Q5xK522dEemDJde0nU6h9A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Q5xK6G2dEemDJde0nU6h9A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Q5xK6W2dEemDJde0nU6h9A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_iSvogG2dEemDJde0nU6h9A" name="FromToIntPerc" tooltipText="" outgoingEdges="_xWzdrm2dEemDJde0nU6h9A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToIntPerc"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//FromToIntPerc"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_iSwPkG2dEemDJde0nU6h9A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_0lWdMG2dEemDJde0nU6h9A" name="from : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToIntPerc/from"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToIntPerc/from"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_0lWdMW2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_39y_sG2dEemDJde0nU6h9A" name="to : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToIntPerc/to"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToIntPerc/to"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_39y_sW2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_uzU0MG2dEemDJde0nU6h9A" name="FromToDoublePerc" tooltipText="" outgoingEdges="_wvdxDm2dEemDJde0nU6h9A" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToDoublePerc"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//FromToDoublePerc"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_uzU0MW2dEemDJde0nU6h9A" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_yVQp4G2dEemDJde0nU6h9A" name="from : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToDoublePerc/from"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToDoublePerc/from"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_yVQp4W2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_zi8lAG2dEemDJde0nU6h9A" name="to : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToDoublePerc/to"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToDoublePerc/to"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_zi8lAW2dEemDJde0nU6h9A" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wvdxDm2dEemDJde0nU6h9A" sourceNode="_uzU0MG2dEemDJde0nU6h9A" targetNode="_izTB8D8PEei9rvcHqHEJ0Q">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToDoublePerc"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//FromToDoublePerc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_wvdxD22dEemDJde0nU6h9A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_wvdxEG2dEemDJde0nU6h9A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_wvdxEW2dEemDJde0nU6h9A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_xWzdrm2dEemDJde0nU6h9A" sourceNode="_iSvogG2dEemDJde0nU6h9A" targetNode="_izTB8D8PEei9rvcHqHEJ0Q">
+      <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToIntPerc"/>
+      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//FromToIntPerc"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_xWzdr22dEemDJde0nU6h9A" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_xWzdsG2dEemDJde0nU6h9A" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_xWzdsW2dEemDJde0nU6h9A" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_MqZwc7ryEeeIKeRLj9tspA"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
@@ -25325,13 +25595,9 @@
     <lines xmi:type="table:DLine" uid="_-TR8ZVFUEemdwPTMMldKDA" label="EClass : FromToPerc">
       <target xmi:type="ecore:EClass" href="esdl.ecore#//FromToPerc"/>
       <lines xmi:type="table:DLine" uid="_-UNJcFFUEemdwPTMMldKDA" label="EAttribute : from">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/from"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/from"/>
         <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
       </lines>
       <lines xmi:type="table:DLine" uid="_-UNJclFUEemdwPTMMldKDA" label="EAttribute : to">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/to"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//FromToPerc/to"/>
         <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
       </lines>
       <lines xmi:type="table:DLine" uid="_-UNJdFFUEemdwPTMMldKDA" label="EAttribute : percentage">
@@ -26447,8 +26713,6 @@
         <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
       </lines>
       <lines xmi:type="table:DLine" uid="_-UxxO1FUEemdwPTMMldKDA" label="EAttribute : value">
-        <target xmi:type="ecore:EAttribute" href="esdl.ecore#//KPI/value"/>
-        <semanticElements xmi:type="ecore:EAttribute" href="esdl.ecore#//KPI/value"/>
         <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']/@ownedSubLines[name='Doc%20EStructural%20Features']"/>
       </lines>
       <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//KPI"/>
@@ -27194,11 +27458,6 @@
       <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//BuildingUsageReference"/>
       <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
     </lines>
-    <lines xmi:type="table:DLine" uid="_vO_56FuREem-Ctg6fJChmg" label="EClass : NewEClass198">
-      <target xmi:type="ecore:EClass" href="esdl.ecore#//NewEClass198"/>
-      <semanticElements xmi:type="ecore:EClass" href="esdl.ecore#//NewEClass198"/>
-      <originMapping xmi:type="description_2:LineMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']/@ownedRepresentations[name='Documentation']/@ownedLineMappings[name='Doc%20EClassifiers']"/>
-    </lines>
     <lines xmi:type="table:DLine" uid="_vO_56luREem-Ctg6fJChmg" label="EClass : BuildingUsageInformation">
       <target xmi:type="ecore:EClass" href="esdl.ecore#//BuildingUsageInformation"/>
       <lines xmi:type="table:DLine" uid="_vPbXuluREem-Ctg6fJChmg" label="EReference : buildingUsage">
diff --git a/esdl/model/esdl.ecore b/esdl/model/esdl.ecore
index fbefcd1..ca130f1 100755
--- a/esdl/model/esdl.ecore
+++ b/esdl/model/esdl.ecore
@@ -1532,12 +1532,10 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="fromToPerc" upperBound="-1"
         eType="#//FromToPerc" containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FromToPerc">
+  <eClassifiers xsi:type="ecore:EClass" name="FromToPerc" abstract="true">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Defines a range and a percentage, used in the FromToDistribution class"/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="from" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="to" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="PItemStat">
@@ -2045,12 +2043,11 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="KPI">
+  <eClassifiers xsi:type="ecore:EClass" name="KPI" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="quantityAndUnit" eType="#//AbstractQuantityAndUnit"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="QuantityAndUnits">
     <eStructuralFeatures xsi:type="ecore:EReference" name="quantityAndUnit" upperBound="-1"
@@ -2365,7 +2362,6 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="reference" lowerBound="1"
         eType="#//BuildingUsage"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NewEClass198"/>
   <eClassifiers xsi:type="ecore:EClass" name="BuildingUsageInformation">
     <eStructuralFeatures xsi:type="ecore:EReference" name="buildingUsage" upperBound="-1"
         eType="#//BuildingUsage" containment="true"/>
@@ -2398,4 +2394,21 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="housingType" eType="#//HousingTypeEnum"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="percentage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="DoubleKPI" eSuperTypes="#//KPI">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringKPI" eSuperTypes="#//KPI">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="IntKPI" eSuperTypes="#//KPI">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FromToIntPerc" eSuperTypes="#//FromToPerc">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="from" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="to" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="FromToDoublePerc" eSuperTypes="#//FromToPerc">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="from" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="to" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/esdl/model/esdl.genmodel b/esdl/model/esdl.genmodel
index 71cf76f..b248672 100755
--- a/esdl/model/esdl.genmodel
+++ b/esdl/model/esdl.genmodel
@@ -943,8 +943,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference esdl.ecore#//FromToDistribution/fromToPerc"/>
     </genClasses>
     <genClasses ecoreClass="esdl.ecore#//FromToPerc">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToPerc/from"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToPerc/to"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToPerc/percentage"/>
     </genClasses>
     <genClasses ecoreClass="esdl.ecore#//PItemStat">
@@ -1141,7 +1139,6 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//KPI/id"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//KPI/name"/>
       <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference esdl.ecore#//KPI/quantityAndUnit"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//KPI/value"/>
     </genClasses>
     <genClasses ecoreClass="esdl.ecore#//QuantityAndUnits">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference esdl.ecore#//QuantityAndUnits/quantityAndUnit"/>
@@ -1308,7 +1305,6 @@
     <genClasses ecoreClass="esdl.ecore#//BuildingUsageReference">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference esdl.ecore#//BuildingUsageReference/reference"/>
     </genClasses>
-    <genClasses ecoreClass="esdl.ecore#//NewEClass198"/>
     <genClasses ecoreClass="esdl.ecore#//BuildingUsageInformation">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference esdl.ecore#//BuildingUsageInformation/buildingUsage"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//BuildingUsageInformation/id"/>
@@ -1334,5 +1330,22 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//HousingTypePercentage/housingType"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//HousingTypePercentage/percentage"/>
     </genClasses>
+    <genClasses ecoreClass="esdl.ecore#//DoubleKPI">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//DoubleKPI/value"/>
+    </genClasses>
+    <genClasses ecoreClass="esdl.ecore#//StringKPI">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//StringKPI/value"/>
+    </genClasses>
+    <genClasses ecoreClass="esdl.ecore#//IntKPI">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//IntKPI/value"/>
+    </genClasses>
+    <genClasses ecoreClass="esdl.ecore#//FromToIntPerc">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToIntPerc/from"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToIntPerc/to"/>
+    </genClasses>
+    <genClasses ecoreClass="esdl.ecore#//FromToDoublePerc">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToDoublePerc/from"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute esdl.ecore#//FromToDoublePerc/to"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/esdl/model/esdl.png b/esdl/model/esdl.png
index 22655fe..fff5a5f 100755
Binary files a/esdl/model/esdl.png and b/esdl/model/esdl.png differ
diff --git a/esdl/pom.xml b/esdl/pom.xml
index 10f6560..11a5fb8 100644
--- a/esdl/pom.xml
+++ b/esdl/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>nl.tno</groupId>
 	<artifactId>ESDL</artifactId>
-	<version>1902</version>
+	<version>1905</version>
 	<name>ESDL specification</name>
 	<dependencies>
 		<dependency>