diff --git a/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF
index 90968ad6860f34798bede2835cde8925bc05fe42..f3d3336eb8d3771f810459b8b30bf9153f9af0e3 100644
--- a/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.energycomponents.edit/META-INF/MANIFEST.MF
@@ -15,4 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  de.hftstuttgart.cityunits.model;visibility:=reexport,
  de.hftstuttgart.cityunits.model.edit;visibility:=reexport
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/FuelCellItemProvider.java b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/FuelCellItemProvider.java
index a798a77a541de9aa845cec79e218bf77f2ae215d..3c74f506e4255d24708acdf769f4f5b1e2b74514 100644
--- a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/FuelCellItemProvider.java
+++ b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/FuelCellItemProvider.java
@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
diff --git a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/InverterItemProvider.java b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/InverterItemProvider.java
index 8de47792e5716580661429ee32a29ae923eb22f2..72958f5d429132c4e7fb453ec3f5885b86c81e8a 100644
--- a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/InverterItemProvider.java
+++ b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/InverterItemProvider.java
@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
diff --git a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PolynomialCharacteristicItemProvider.java b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PolynomialCharacteristicItemProvider.java
index b2fcabbf60ad43ef23c259409e2ab0f81b88502e..3454962b25e6494d5e8a184af5c94ede707b8731 100644
--- a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PolynomialCharacteristicItemProvider.java
+++ b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PolynomialCharacteristicItemProvider.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
diff --git a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PowerCharacteristicItemProvider.java b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PowerCharacteristicItemProvider.java
index fe51101cbb56500171299392a8320a3e5ddf7caf..b2009bd52129bcf2b9eba424ee87d37ccc359ff3 100644
--- a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PowerCharacteristicItemProvider.java
+++ b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/PowerCharacteristicItemProvider.java
@@ -13,7 +13,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
diff --git a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/WindTurbineItemProvider.java b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/WindTurbineItemProvider.java
index ec66d631dadc468efe2d3168db5a7d4bb6b21958..500e92b50a4ca8e6a5fdfbeb06ee700a8460dc4f 100644
--- a/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/WindTurbineItemProvider.java
+++ b/de.hftstuttgart.energycomponents.edit/src-gen/de/hftstuttgart/energycomponents/provider/WindTurbineItemProvider.java
@@ -9,7 +9,6 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 
 /**
diff --git a/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF b/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF
index e751bda642ab21cc3d596ec695cec60dd839f802..f706b4fd2eead401e691bfdb8742d8471f7219f7 100644
--- a/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.energycomponents.model/META-INF/MANIFEST.MF
@@ -7,10 +7,12 @@ Bundle-Version: 1.0.0
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.hftstuttgart.energycomponents,
  de.hftstuttgart.energycomponents.impl,
  de.hftstuttgart.energycomponents.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  de.hftstuttgart.cityunits.model;bundle-version="0.0.0";visibility:=reexport
+Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
diff --git a/de.hftstuttgart.energycomponents.model/model/EnergyComponents.genmodel b/de.hftstuttgart.energycomponents.model/model/EnergyComponents.genmodel
index be20e63ecfc6a33211f3cbb7fd967298852d5dd4..fb52e61878203426201473d7da790310b20ed68b 100644
--- a/de.hftstuttgart.energycomponents.model/model/EnergyComponents.genmodel
+++ b/de.hftstuttgart.energycomponents.model/model/EnergyComponents.genmodel
@@ -5,8 +5,8 @@
     creationIcons="false" editDirectory="/de.hftstuttgart.energycomponents.edit/src-gen"
     editorDirectory="/de.hftstuttgart.energycomponents.editor/src-gen" modelPluginID="de.hftstuttgart.energycomponents.model"
     modelName="EnergyComponents" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
-    copyrightFields="false" usedGenPackages="../../de.hftstuttgart.cityunits.model/model/Quantities.genmodel#//quantities"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0"
+    copyrightFields="false" editPluginID="de.hftstuttgart.energycomponents.edit" usedGenPackages="../../de.hftstuttgart.cityunits.model/model/Quantities.genmodel#//quantities"
     operationReflection="true" importOrganizing="true">
   <foreignModel>EnergyComponents.ecore</foreignModel>
   <testsDirectory xsi:nil="true"/>
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/BoilerTypes.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/BoilerTypes.java
index c792c7316ae2c6c5cd2970217442d65d77897ce0..a66426361ea6d32b583f5d6fcc88d99529831673 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/BoilerTypes.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/BoilerTypes.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum BoilerTypes implements Enumerator {
 	 * @ordered
 	 */
 	CONDENSING_BOILER(0, "condensingBoiler", "condensingBoiler"),
-
 	/**
 	 * The '<em><b>Lowtemperature Boiler</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -203,5 +201,4 @@ public enum BoilerTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //BoilerTypes
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/CollectorTypes.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/CollectorTypes.java
index b28644892163f92c6efeb7781b2ac9389fa0f144..905fe1c9da5966afe82d12546df2a981ad5ccee5 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/CollectorTypes.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/CollectorTypes.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum CollectorTypes implements Enumerator {
 	 * @ordered
 	 */
 	FLAT_PLANE_COLLECTOR(0, "flatPlaneCollector", "flatPlaneCollector"),
-
 	/**
 	 * The '<em><b>Evacuated Tube Collector</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -204,5 +202,4 @@ public enum CollectorTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //CollectorTypes
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ElectricalStorageTypes.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ElectricalStorageTypes.java
index 9bd4ffd726473aca098aeb3d0e285a009f5fa30b..7efcab3b1305d8e37e6ad55ccac3ad92b212bf16 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ElectricalStorageTypes.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ElectricalStorageTypes.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -30,7 +29,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	LITHIUM_ION(0, "lithiumIon", "lithiumIon"),
-
 	/**
 	 * The '<em><b>Lead Acid</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -40,7 +38,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	LEAD_ACID(1, "leadAcid", "leadAcid"),
-
 	/**
 	 * The '<em><b>Ni MH</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -53,7 +50,6 @@ public enum ElectricalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	NI_MH(2, "niMH", "niMH"),
-
 	/**
 	 * The '<em><b>Lithium Polymer</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -268,5 +264,4 @@ public enum ElectricalStorageTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //ElectricalStorageTypes
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/FuelTypes.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/FuelTypes.java
index 5a26ed0c612f8d2de56aca4152d80c8b0a50ab11..723e61bdae4c0a01bae29759088ccb21c2f18cbd 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/FuelTypes.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/FuelTypes.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	NATURAL_GAS(0, "naturalGas", "naturalGas"),
-
 	/**
 	 * The '<em><b>Oil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	OIL(1, "oil", "oil"),
-
 	/**
 	 * The '<em><b>Diesel</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -47,7 +44,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	DIESEL(2, "diesel", "diesel"),
-
 	/**
 	 * The '<em><b>Bio Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -57,7 +53,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	BIO_GAS(0, "bioGas", "bioGas"),
-
 	/**
 	 * The '<em><b>Synthetic Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -67,7 +62,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	SYNTHETIC_GAS(1, "syntheticGas", "syntheticGas"),
-
 	/**
 	 * The '<em><b>Wood Pellets</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -77,7 +71,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_PELLETS(2, "woodPellets", "woodPellets"),
-
 	/**
 	 * The '<em><b>Wood Chips</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -87,7 +80,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_CHIPS(3, "woodChips", "woodChips"),
-
 	/**
 	 * The '<em><b>Sewage Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -97,7 +89,6 @@ public enum FuelTypes implements Enumerator {
 	 * @ordered
 	 */
 	SEWAGE_GAS(4, "sewageGas", "sewageGas"),
-
 	/**
 	 * The '<em><b>Electricity</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -359,5 +350,4 @@ public enum FuelTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //FuelTypes
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatSources.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatSources.java
index 4989ec958de08d30a4e69c80e1f39689fa2d3cb3..ff22e94391ba63d8d450b229ec924101ce45ffe5 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatSources.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/HeatSources.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum HeatSources implements Enumerator {
 	 * @ordered
 	 */
 	AIR(0, "air", "air"),
-
 	/**
 	 * The '<em><b>Ground</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum HeatSources implements Enumerator {
 	 * @ordered
 	 */
 	GROUND(0, "ground", "ground"),
-
 	/**
 	 * The '<em><b>Water</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -222,5 +219,4 @@ public enum HeatSources implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //HeatSources
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorageTypes.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorageTypes.java
index 0d2a6539afb59d43a51f57e13d99568beabc0275..82da06140a91cfc1cd459595c3d95e2e9e3febfb 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorageTypes.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/ThermalStorageTypes.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum ThermalStorageTypes implements Enumerator {
 	 * @ordered
 	 */
 	SENSIBLE(0, "sensible", "sensible"),
-
 	/**
 	 * The '<em><b>Latent</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -203,5 +201,4 @@ public enum ThermalStorageTypes implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //ThermalStorageTypes
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/TypeOfHeatSource.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/TypeOfHeatSource.java
index 1ee583dc69704fb9de3a54e4a0a1d2fc98820d05..7f7a5e166f5ab5812af763826e55c8584600ec49 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/TypeOfHeatSource.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/TypeOfHeatSource.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -27,7 +26,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	NATURAL_GAS(0, "naturalGas", "naturalGas"),
-
 	/**
 	 * The '<em><b>Biogas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -37,7 +35,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	BIOGAS(1, "biogas", "biogas"),
-
 	/**
 	 * The '<em><b>Oil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -47,7 +44,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	OIL(2, "oil", "oil"),
-
 	/**
 	 * The '<em><b>Diesel</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -57,7 +53,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	DIESEL(3, "diesel", "diesel"),
-
 	/**
 	 * The '<em><b>Synthetic Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -67,7 +62,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SYNTHETIC_GAS(4, "syntheticGas", "syntheticGas"),
-
 	/**
 	 * The '<em><b>Wood Pellets</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -77,7 +71,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_PELLETS(5, "woodPellets", "woodPellets"),
-
 	/**
 	 * The '<em><b>Wood Chips</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -87,7 +80,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WOOD_CHIPS(6, "woodChips", "woodChips"),
-
 	/**
 	 * The '<em><b>Sewage Gas</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -97,7 +89,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SEWAGE_GAS(7, "sewageGas", "sewageGas"),
-
 	/**
 	 * The '<em><b>LNG</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -107,7 +98,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	LNG(8, "LNG", "LNG"),
-
 	/**
 	 * The '<em><b>CNG</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -117,7 +107,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	CNG(9, "CNG", "CNG"),
-
 	/**
 	 * The '<em><b>Water</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -127,7 +116,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	WATER(10, "water", "water"),
-
 	/**
 	 * The '<em><b>Air</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -137,7 +125,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	AIR(11, "air", "air"),
-
 	/**
 	 * The '<em><b>Soil</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -147,7 +134,6 @@ public enum TypeOfHeatSource implements Enumerator {
 	 * @ordered
 	 */
 	SOIL(12, "soil", "soil"),
-
 	/**
 	 * The '<em><b>None</b></em>' literal object.
 	 * <!-- begin-user-doc -->
@@ -480,5 +466,4 @@ public enum TypeOfHeatSource implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //TypeOfHeatSource
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/cellTypesElectrolyzer.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/cellTypesElectrolyzer.java
index 802379986cfcc0c856dbd29b3515f85292624d5e..9416668a3ee044e486b3f926cd49e97c2a06fe72 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/cellTypesElectrolyzer.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/cellTypesElectrolyzer.java
@@ -5,7 +5,6 @@ package de.hftstuttgart.energycomponents;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
@@ -180,5 +179,4 @@ public enum cellTypesElectrolyzer implements Enumerator {
 	public String toString() {
 		return literal;
 	}
-
-} //cellTypesElectrolyzer
+}
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ExponentialFunctionImpl.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ExponentialFunctionImpl.java
index cbe795c6758cad39cc3fe776bfd61bb6f3217c8f..358909a01e9e90f970d496f46bc0c810543c47d7 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ExponentialFunctionImpl.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/ExponentialFunctionImpl.java
@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.ExponentialFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/LinearFunctionImpl.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/LinearFunctionImpl.java
index 455ab969a0c35f4e649d7f04fc42c3bb68b78e37..cffa8b004de86d6dd7c0fe6b1e2e479ff4775e86 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/LinearFunctionImpl.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/LinearFunctionImpl.java
@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.LinearFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PolynomialFunctionImpl.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PolynomialFunctionImpl.java
index 588fac23df9d16b9990d5b9adb01743fc9c21b2e..841a2a2f56cb54e2aaededde9519cdfba854e75d 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PolynomialFunctionImpl.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PolynomialFunctionImpl.java
@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.PolynomialFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PowerFunctionImpl.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PowerFunctionImpl.java
index ec30fa82b043a708c969fa6b63ddc4d5b3ea55ff..4abede71d0940be6b597458d5e367a1bc249ec8f 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PowerFunctionImpl.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/impl/PowerFunctionImpl.java
@@ -4,13 +4,9 @@ package de.hftstuttgart.energycomponents.impl;
 
 import de.hftstuttgart.energycomponents.EnCompPackage;
 import de.hftstuttgart.energycomponents.PowerFunction;
-
 import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
diff --git a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java
index f4d4e802d8e4e0e8f0880deac3c93d8aa0ebbd42..84bbee2d9a26da9ba16e96222c6a04ffa8302730 100644
--- a/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java
+++ b/de.hftstuttgart.energycomponents.model/src-gen/de/hftstuttgart/energycomponents/util/EnCompSwitch.java
@@ -3,10 +3,8 @@
 package de.hftstuttgart.energycomponents.util;
 
 import de.hftstuttgart.energycomponents.*;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-
 import org.eclipse.emf.ecore.util.Switch;
 
 /**