diff --git a/examples/data/dataset-1/conversions/conversion-1/conversion.json b/examples/data/dataset-1/conversions/conversion-1/conversion.json
index cf89491..608e675 100644
--- a/examples/data/dataset-1/conversions/conversion-1/conversion.json
+++ b/examples/data/dataset-1/conversions/conversion-1/conversion.json
@@ -14,7 +14,7 @@
         },
         {
             "commodity": "CO2",
-            "conversion_factor": 0.000335
+            "conversion_factor": 0.000001666666
         }
     ],
     "invest_per_capacity":0.65,
diff --git a/examples/data/dataset-1/sinks/sink-1/sink.json b/examples/data/dataset-1/sinks/sink-1/sink.json
index b0bd9fd..48c0ae6 100644
--- a/examples/data/dataset-1/sinks/sink-1/sink.json
+++ b/examples/data/dataset-1/sinks/sink-1/sink.json
@@ -1,5 +1,6 @@
 {
     "name": "Elektrizität-Verbrauch",
     "description": "Stellt den Elektrizität-Verbrauch dar", 
-    "commodity": "Elektrizität"
+    "commodity": "Elektrizität",
+    "capacity_variable": false
 }
\ No newline at end of file
diff --git a/examples/data/dataset-1/sinks/sink-2/sink.json b/examples/data/dataset-1/sinks/sink-2/sink.json
index 66e5b4d..5f0f270 100644
--- a/examples/data/dataset-1/sinks/sink-2/sink.json
+++ b/examples/data/dataset-1/sinks/sink-2/sink.json
@@ -1,5 +1,6 @@
 {
     "name": "Wasserstoff-Verbrauch",
     "description": "Stellt den Wasserstoff-Verbrauch dar", 
-    "commodity": "Wasserstoff"
+    "commodity": "Wasserstoff",
+    "capacity_variable": false
 }
\ No newline at end of file
diff --git a/examples/data/dataset-1/sinks/sink-3/sink.json b/examples/data/dataset-1/sinks/sink-3/sink.json
index fe3f53f..63df39f 100644
--- a/examples/data/dataset-1/sinks/sink-3/sink.json
+++ b/examples/data/dataset-1/sinks/sink-3/sink.json
@@ -2,5 +2,6 @@
     "name": "CO2-Verbrauch",
     "description": "Stellt den CO2-Verbrauch dar", 
     "commodity": "CO2",
-    "yearly_limit": 366
+    "yearly_limit": 366,
+    "capacity_variable": false
 }
\ No newline at end of file
diff --git a/examples/data/dataset-1/storages/storage-2/storage.json b/examples/data/dataset-1/storages/storage-2/storage.json
index 5489acc..24bd9a3 100644
--- a/examples/data/dataset-1/storages/storage-2/storage.json
+++ b/examples/data/dataset-1/storages/storage-2/storage.json
@@ -5,8 +5,8 @@
   "capacity_variable": true,
   "capacity_variable_domain": "CONTINUOUS",
   "capacity_per_plant_unit": 133,
-  "charge_rate": 0.007124,
-  "discharge_rate": 0.007124,
+  "charge_rate": 0.002125985,
+  "discharge_rate": 0.002125985,
   "shared_potential_id": "Existing salt caverns",
   "state_of_charge_min": 0.33,
   "state_of_charge_max": 1,
diff --git a/examples/data/dataset-1/storages/storage-3/storage.json b/examples/data/dataset-1/storages/storage-3/storage.json
index 1958997..5f703d2 100644
--- a/examples/data/dataset-1/storages/storage-3/storage.json
+++ b/examples/data/dataset-1/storages/storage-3/storage.json
@@ -5,8 +5,8 @@
   "capacity_variable": true,
   "capacity_variable_domain": "CONTINUOUS",
   "capacity_per_plant_unit": 443,
-  "charge_rate": 0.007124,
-  "discharge_rate": 0.007124,
+  "charge_rate": 0.002125985,
+  "discharge_rate": 0.002125985,
   "shared_potential_id": "Existing salt caverns",
   "state_of_charge_min": 0.33,
   "state_of_charge_max": 1,
diff --git a/examples/data/dataset-2/conversions/elektrolyseure/conversion.json b/examples/data/dataset-2/conversions/elektrolyseure/conversion.json
index be6776d..2ee395d 100644
--- a/examples/data/dataset-2/conversions/elektrolyseure/conversion.json
+++ b/examples/data/dataset-2/conversions/elektrolyseure/conversion.json
@@ -1,13 +1,13 @@
 {
-    "name": "Elektrolyseure",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0125,
+    "economic_lifetime": 10,
     "description": "Stellt Elektrolyseure dar",
+    "name": "Elektrolyseure",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.5,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0125,
-    "economic_lifetime": 10,
     "commodity_unit": "Wasserstoff",
     "conversion_factors": [
         {
diff --git a/examples/data/dataset-2/conversions/gud-turbine-(biogas)/conversion.json b/examples/data/dataset-2/conversions/gud-turbine-(biogas)/conversion.json
index 1fb23a3..e059a57 100644
--- a/examples/data/dataset-2/conversions/gud-turbine-(biogas)/conversion.json
+++ b/examples/data/dataset-2/conversions/gud-turbine-(biogas)/conversion.json
@@ -1,13 +1,13 @@
 {
-    "name": "GuD-Turbine (Biogas)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.021,
+    "economic_lifetime": 33,
     "description": "Stellt Gas-und Dampfturbinen für Biogas dar",
+    "name": "GuD-Turbine (Biogas)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.7,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.021,
-    "economic_lifetime": 33,
     "commodity_unit": "Biogas",
     "conversion_factors": [
         {
diff --git a/examples/data/dataset-2/conversions/gud-turbine-(methan)/conversion.json b/examples/data/dataset-2/conversions/gud-turbine-(methan)/conversion.json
index aaaf73b..73af621 100644
--- a/examples/data/dataset-2/conversions/gud-turbine-(methan)/conversion.json
+++ b/examples/data/dataset-2/conversions/gud-turbine-(methan)/conversion.json
@@ -1,22 +1,26 @@
 {
-    "name": "GuD-Turbine (Methan)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.021,
+    "economic_lifetime": 33,
     "description": "Stellt Gas-und Dampfturbinen für Methan dar",
+    "name": "GuD-Turbine (Methan)",
     "capacity_variable_domain": "CONTINUOUS",
-    "invest_per_capacity": 0.0,
+    "invest_per_capacity": 0.65,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity_unit": "Methan",
     "conversion_factors": [
         {
-            "conversion_factor": 0.6,
+            "conversion_factor": 1.0,
             "commodity": "Elektrizität"
         },
         {
-            "conversion_factor": 1.0,
+            "conversion_factor": -1.66666667,
             "commodity": "Methan"
+        },
+        {
+            "conversion_factor": 1.666666e-06,
+            "commodity": "CO2"
         }
     ]
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/conversions/gud-turbine-(wasserstoff)/conversion.json b/examples/data/dataset-2/conversions/gud-turbine-(wasserstoff)/conversion.json
index ca9008d..95c7e4a 100644
--- a/examples/data/dataset-2/conversions/gud-turbine-(wasserstoff)/conversion.json
+++ b/examples/data/dataset-2/conversions/gud-turbine-(wasserstoff)/conversion.json
@@ -1,13 +1,13 @@
 {
-    "name": "GuD-Turbine (Wasserstoff)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.021,
+    "economic_lifetime": 33,
     "description": "Stellt Gas-und Dampfturbinen für Wasserstoff dar",
+    "name": "GuD-Turbine (Wasserstoff)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.7,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.021,
-    "economic_lifetime": 33,
     "commodity_unit": "Wasserstoff",
     "conversion_factors": [
         {
diff --git a/examples/data/dataset-2/conversions/rsoec/conversion.json b/examples/data/dataset-2/conversions/rsoec/conversion.json
index b8f8da9..404d3b1 100644
--- a/examples/data/dataset-2/conversions/rsoec/conversion.json
+++ b/examples/data/dataset-2/conversions/rsoec/conversion.json
@@ -1,13 +1,13 @@
 {
-    "name": "rSOEC",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.015,
+    "economic_lifetime": 10,
     "description": "Stellt rSOEC dar",
+    "name": "rSOEC",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.75,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.015,
-    "economic_lifetime": 10,
     "commodity_unit": "Wasserstoff",
     "conversion_factors": [
         {
diff --git a/examples/data/dataset-2/conversions/rsofc/conversion.json b/examples/data/dataset-2/conversions/rsofc/conversion.json
index 91b1fdd..8ce9860 100644
--- a/examples/data/dataset-2/conversions/rsofc/conversion.json
+++ b/examples/data/dataset-2/conversions/rsofc/conversion.json
@@ -1,13 +1,13 @@
 {
-    "name": "rSOFC",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.015,
+    "economic_lifetime": 10,
     "description": "Stellt rSOFC dar",
+    "name": "rSOFC",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.75,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.015,
-    "economic_lifetime": 10,
     "commodity_unit": "Wasserstoff",
     "conversion_factors": [
         {
diff --git a/examples/data/dataset-2/sinks/co2-verbrauch/sink.json b/examples/data/dataset-2/sinks/co2-verbrauch/sink.json
index be16379..f6505f6 100644
--- a/examples/data/dataset-2/sinks/co2-verbrauch/sink.json
+++ b/examples/data/dataset-2/sinks/co2-verbrauch/sink.json
@@ -1,12 +1,13 @@
 {
-    "name": "CO2-Verbrauch",
+    "capacity_variable": false,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt den CO2-Verbrauch dar",
+    "name": "CO2-Verbrauch",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
+    "yearly_limit": 366.0,
     "commodity": "CO2"
 }
\ No newline at end of file
diff --git "a/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/operationRateFix.xlsx" "b/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/operationRateFix.xlsx"
index 2f2fa15..46ac0b2 100644
Binary files "a/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/operationRateFix.xlsx" and "b/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/operationRateFix.xlsx" differ
diff --git "a/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/sink.json" "b/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/sink.json"
index 7e8ed22..13ddfda 100644
--- "a/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/sink.json"
+++ "b/examples/data/dataset-2/sinks/elektrizit\303\244t-verbrauch/sink.json"
@@ -1,12 +1,12 @@
 {
-    "name": "Elektrizität-Verbrauch",
+    "capacity_variable": false,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt den Elektrizität-Verbrauch dar",
+    "name": "Elektrizität-Verbrauch",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sinks/wasserstoff-verbrauch/operationRateFix.xlsx b/examples/data/dataset-2/sinks/wasserstoff-verbrauch/operationRateFix.xlsx
index bac1ab5..b9efa86 100644
Binary files a/examples/data/dataset-2/sinks/wasserstoff-verbrauch/operationRateFix.xlsx and b/examples/data/dataset-2/sinks/wasserstoff-verbrauch/operationRateFix.xlsx differ
diff --git a/examples/data/dataset-2/sinks/wasserstoff-verbrauch/sink.json b/examples/data/dataset-2/sinks/wasserstoff-verbrauch/sink.json
index 3d36153..4f5831a 100644
--- a/examples/data/dataset-2/sinks/wasserstoff-verbrauch/sink.json
+++ b/examples/data/dataset-2/sinks/wasserstoff-verbrauch/sink.json
@@ -1,12 +1,12 @@
 {
-    "name": "Wasserstoff-Verbrauch",
+    "capacity_variable": false,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt den Wasserstoff-Verbrauch dar",
+    "name": "Wasserstoff-Verbrauch",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity": "Wasserstoff"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/biogas-importe/operationRateMax.xlsx b/examples/data/dataset-2/sources/biogas-importe/operationRateMax.xlsx
index f294b38..cffaf79 100644
Binary files a/examples/data/dataset-2/sources/biogas-importe/operationRateMax.xlsx and b/examples/data/dataset-2/sources/biogas-importe/operationRateMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/biogas-importe/source.json b/examples/data/dataset-2/sources/biogas-importe/source.json
index 860fd40..c0541b2 100644
--- a/examples/data/dataset-2/sources/biogas-importe/source.json
+++ b/examples/data/dataset-2/sources/biogas-importe/source.json
@@ -1,13 +1,13 @@
 {
-    "name": "Biogas Importe",
+    "capacity_variable": false,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt die Biogas-Importe dar",
+    "name": "Biogas Importe",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity_cost": 5.409e-05,
     "commodity": "Biogas"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/natural-gas-importe/source.json b/examples/data/dataset-2/sources/natural-gas-importe/source.json
index 2067c45..d03a93a 100644
--- a/examples/data/dataset-2/sources/natural-gas-importe/source.json
+++ b/examples/data/dataset-2/sources/natural-gas-importe/source.json
@@ -1,13 +1,13 @@
 {
-    "name": "Natural Gas Importe",
+    "capacity_variable": false,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt die Natural Gas-Importe dar",
+    "name": "Natural Gas Importe",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity_cost": 3.31e-05,
     "commodity": "Methan"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/pv/capacityMax.xlsx b/examples/data/dataset-2/sources/pv/capacityMax.xlsx
index 6c1ad18..646dc00 100644
Binary files a/examples/data/dataset-2/sources/pv/capacityMax.xlsx and b/examples/data/dataset-2/sources/pv/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/pv/operationRateMax.xlsx b/examples/data/dataset-2/sources/pv/operationRateMax.xlsx
index 6e030ab..57052a9 100644
Binary files a/examples/data/dataset-2/sources/pv/operationRateMax.xlsx and b/examples/data/dataset-2/sources/pv/operationRateMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/pv/source.json b/examples/data/dataset-2/sources/pv/source.json
index 5b776b1..58f25fc 100644
--- a/examples/data/dataset-2/sources/pv/source.json
+++ b/examples/data/dataset-2/sources/pv/source.json
@@ -1,12 +1,12 @@
 {
-    "name": "PV",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.013,
+    "economic_lifetime": 25,
     "description": "Stellt die PV-Anlagen dar",
+    "name": "PV",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.65,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.013,
-    "economic_lifetime": 25,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/run-of-river/capacityFix.xlsx b/examples/data/dataset-2/sources/run-of-river/capacityFix.xlsx
index d4e3b4c..519235e 100644
Binary files a/examples/data/dataset-2/sources/run-of-river/capacityFix.xlsx and b/examples/data/dataset-2/sources/run-of-river/capacityFix.xlsx differ
diff --git a/examples/data/dataset-2/sources/run-of-river/operationRateFix.xlsx b/examples/data/dataset-2/sources/run-of-river/operationRateFix.xlsx
index 2819a83..fabd568 100644
Binary files a/examples/data/dataset-2/sources/run-of-river/operationRateFix.xlsx and b/examples/data/dataset-2/sources/run-of-river/operationRateFix.xlsx differ
diff --git a/examples/data/dataset-2/sources/run-of-river/source.json b/examples/data/dataset-2/sources/run-of-river/source.json
index 0b5d11f..3f2b873 100644
--- a/examples/data/dataset-2/sources/run-of-river/source.json
+++ b/examples/data/dataset-2/sources/run-of-river/source.json
@@ -1,12 +1,12 @@
 {
-    "name": "Run-of-river",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.208,
+    "economic_lifetime": 10,
     "description": "Stellt die Laufwasser-Kraftwerke dar",
+    "name": "Run-of-river",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.208,
-    "economic_lifetime": 10,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/wind-offshore/capacityMax.xlsx b/examples/data/dataset-2/sources/wind-offshore/capacityMax.xlsx
index 2b1a0e4..16015af 100644
Binary files a/examples/data/dataset-2/sources/wind-offshore/capacityMax.xlsx and b/examples/data/dataset-2/sources/wind-offshore/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/wind-offshore/operationRateMax.xlsx b/examples/data/dataset-2/sources/wind-offshore/operationRateMax.xlsx
index 1714893..06224fd 100644
Binary files a/examples/data/dataset-2/sources/wind-offshore/operationRateMax.xlsx and b/examples/data/dataset-2/sources/wind-offshore/operationRateMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/wind-offshore/source.json b/examples/data/dataset-2/sources/wind-offshore/source.json
index bd4b2f7..85d3abd 100644
--- a/examples/data/dataset-2/sources/wind-offshore/source.json
+++ b/examples/data/dataset-2/sources/wind-offshore/source.json
@@ -1,12 +1,12 @@
 {
-    "name": "Wind Offshore",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.046,
+    "economic_lifetime": 20,
     "description": "Stellt die Wind Offshore-Anlagen dar",
+    "name": "Wind Offshore",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 2.3,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.046,
-    "economic_lifetime": 20,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/sources/wind-onshore/capacityMax.xlsx b/examples/data/dataset-2/sources/wind-onshore/capacityMax.xlsx
index 23cb337..2018cfb 100644
Binary files a/examples/data/dataset-2/sources/wind-onshore/capacityMax.xlsx and b/examples/data/dataset-2/sources/wind-onshore/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/wind-onshore/operationRateMax.xlsx b/examples/data/dataset-2/sources/wind-onshore/operationRateMax.xlsx
index 29f666a..ec3fc6e 100644
Binary files a/examples/data/dataset-2/sources/wind-onshore/operationRateMax.xlsx and b/examples/data/dataset-2/sources/wind-onshore/operationRateMax.xlsx differ
diff --git a/examples/data/dataset-2/sources/wind-onshore/source.json b/examples/data/dataset-2/sources/wind-onshore/source.json
index e422f09..dcd6aab 100644
--- a/examples/data/dataset-2/sources/wind-onshore/source.json
+++ b/examples/data/dataset-2/sources/wind-onshore/source.json
@@ -1,12 +1,12 @@
 {
-    "name": "Wind Onshore",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.022,
+    "economic_lifetime": 20,
     "description": "Stellt die Wind Onshore-Anlagen dar",
+    "name": "Wind Onshore",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 1.1,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.022,
-    "economic_lifetime": 20,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/storages/li-ion-batterien/storage.json b/examples/data/dataset-2/storages/li-ion-batterien/storage.json
index 71efabe..60e4918 100644
--- a/examples/data/dataset-2/storages/li-ion-batterien/storage.json
+++ b/examples/data/dataset-2/storages/li-ion-batterien/storage.json
@@ -1,13 +1,13 @@
 {
-    "name": "Li-ion Batterien",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.002,
+    "economic_lifetime": 22,
     "description": "Stellt Batterien dar",
+    "name": "Li-ion Batterien",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.151,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.002,
-    "economic_lifetime": 22,
     "charge_efficiency": 0.95,
     "self_discharge": 4.23036e-05,
     "charge_rate": 1.0,
diff --git a/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/capacityFix.xlsx b/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/capacityFix.xlsx
index 2039634..749ea36 100644
Binary files a/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/capacityFix.xlsx and b/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/capacityFix.xlsx differ
diff --git a/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/storage.json b/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/storage.json
index 1b54c1f..85dd83d 100644
--- a/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/storage.json
+++ b/examples/data/dataset-2/storages/pumpspeicher-kraftwerk/storage.json
@@ -1,15 +1,15 @@
 {
-    "name": "Pumpspeicher-Kraftwerk",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.000153,
+    "economic_lifetime": 10,
     "description": "Stellt Pumpspeicher-Kraftwerk dar",
+    "name": "Pumpspeicher-Kraftwerk",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.000153,
-    "economic_lifetime": 10,
     "charge_efficiency": 0.88,
-    "self_discharge": 5.2181e-06,
+    "self_discharge": 5.21811e-06,
     "charge_rate": 0.16,
     "discharge_efficiency": 0.88,
     "discharge_rate": 0.12,
diff --git a/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/capacityMax.xlsx b/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/capacityMax.xlsx
index 615f753..3be7140 100644
Binary files a/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/capacityMax.xlsx and b/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/storage.json b/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/storage.json
index b6c4382..0281a57 100644
--- a/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/storage.json
+++ b/examples/data/dataset-2/storages/salzkavernen-(bio-gas)/storage.json
@@ -1,17 +1,17 @@
 {
-    "name": "Salzkavernen (Bio Gas)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 443,
+    "opex_per_capacity": 1e-05,
+    "economic_lifetime": 30,
     "description": "Stellt Salzkavernen (Bio Gas) dar",
+    "name": "Salzkavernen (Bio Gas)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 4e-05,
     "interest_rate": 0.08,
     "shared_potential_id": "Existing salt caverns",
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 443.0,
-    "opex_per_capacity": 1e-05,
-    "economic_lifetime": 30,
-    "state_of_charge_max": 1.0,
-    "charge_rate": 0.007124,
+    "charge_rate": 0.002125985,
     "state_of_charge_min": 0.33,
-    "discharge_rate": 0.007124,
+    "discharge_rate": 0.002125985,
+    "state_of_charge_max": 1.0,
     "commodity": "Biogas"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/capacityMax.xlsx b/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/capacityMax.xlsx
index 615f753..3be7140 100644
Binary files a/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/capacityMax.xlsx and b/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/storage.json b/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/storage.json
index aa98058..4609f96 100644
--- a/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/storage.json
+++ b/examples/data/dataset-2/storages/salzkavernen-(wasserstoff)/storage.json
@@ -1,17 +1,17 @@
 {
-    "name": "Salzkavernen (Wasserstoff)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 133,
+    "opex_per_capacity": 0.00057,
+    "economic_lifetime": 30,
     "description": "Stellt Salzkavernen (Wasserstoff) dar",
+    "name": "Salzkavernen (Wasserstoff)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.00011,
     "interest_rate": 0.08,
     "shared_potential_id": "Existing salt caverns",
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 133.0,
-    "opex_per_capacity": 0.00057,
-    "economic_lifetime": 30,
-    "state_of_charge_max": 1.0,
-    "charge_rate": 0.007124,
+    "charge_rate": 0.002125985,
     "state_of_charge_min": 0.33,
-    "discharge_rate": 0.007124,
+    "discharge_rate": 0.002125985,
+    "state_of_charge_max": 1.0,
     "commodity": "Wasserstoff"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/transmissions/ac-leitungen/capacityFix.xlsx b/examples/data/dataset-2/transmissions/ac-leitungen/capacityFix.xlsx
index cfc4b44..d5ae74b 100644
Binary files a/examples/data/dataset-2/transmissions/ac-leitungen/capacityFix.xlsx and b/examples/data/dataset-2/transmissions/ac-leitungen/capacityFix.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/ac-leitungen/distances.xlsx b/examples/data/dataset-2/transmissions/ac-leitungen/distances.xlsx
index 71b1653..a6d61dd 100644
Binary files a/examples/data/dataset-2/transmissions/ac-leitungen/distances.xlsx and b/examples/data/dataset-2/transmissions/ac-leitungen/distances.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/ac-leitungen/transmission.json b/examples/data/dataset-2/transmissions/ac-leitungen/transmission.json
index 9a85dc2..8c92c74 100644
--- a/examples/data/dataset-2/transmissions/ac-leitungen/transmission.json
+++ b/examples/data/dataset-2/transmissions/ac-leitungen/transmission.json
@@ -1,12 +1,12 @@
 {
-    "name": "AC Leitungen",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt die AC-Leitungen dar",
+    "name": "AC Leitungen",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/transmissions/dc-leitungen/capacityFix.xlsx b/examples/data/dataset-2/transmissions/dc-leitungen/capacityFix.xlsx
index 09db48d..6f65cdd 100644
Binary files a/examples/data/dataset-2/transmissions/dc-leitungen/capacityFix.xlsx and b/examples/data/dataset-2/transmissions/dc-leitungen/capacityFix.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/dc-leitungen/distances.xlsx b/examples/data/dataset-2/transmissions/dc-leitungen/distances.xlsx
index c129b61..acc3ff5 100644
Binary files a/examples/data/dataset-2/transmissions/dc-leitungen/distances.xlsx and b/examples/data/dataset-2/transmissions/dc-leitungen/distances.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/dc-leitungen/transmission.json b/examples/data/dataset-2/transmissions/dc-leitungen/transmission.json
index 638b9ad..b3faf39 100644
--- a/examples/data/dataset-2/transmissions/dc-leitungen/transmission.json
+++ b/examples/data/dataset-2/transmissions/dc-leitungen/transmission.json
@@ -1,12 +1,12 @@
 {
-    "name": "DC-Leitungen",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 10,
     "description": "Stellt die DC-Leitungen dar",
+    "name": "DC-Leitungen",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.0,
     "interest_rate": 0.08,
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 10,
     "commodity": "Elektrizität"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/capacityMax.xlsx b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/capacityMax.xlsx
index 8a3457b..e1bd1ad 100644
Binary files a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/capacityMax.xlsx and b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/distances.xlsx b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/distances.xlsx
index 71b1653..a6d61dd 100644
Binary files a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/distances.xlsx and b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/distances.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/transmission.json b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/transmission.json
index 67f1297..ffca52d 100644
--- a/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/transmission.json
+++ b/examples/data/dataset-2/transmissions/pipeline-(bio-gas)/transmission.json
@@ -1,13 +1,13 @@
 {
-    "name": "Pipeline (Bio Gas)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 40,
     "description": "Stellt die Pipeline (Bio Gas) dar",
+    "name": "Pipeline (Bio Gas)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 3.7e-05,
     "interest_rate": 0.08,
     "shared_potential_id": "pipelines",
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 40,
     "commodity": "Biogas"
 }
\ No newline at end of file
diff --git a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/capacityMax.xlsx b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/capacityMax.xlsx
index 8a3457b..e1bd1ad 100644
Binary files a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/capacityMax.xlsx and b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/capacityMax.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/distances.xlsx b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/distances.xlsx
index 9fc0792..65a62e6 100644
Binary files a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/distances.xlsx and b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/distances.xlsx differ
diff --git a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/transmission.json b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/transmission.json
index 6b40318..f62b1ce 100644
--- a/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/transmission.json
+++ b/examples/data/dataset-2/transmissions/pipeline-(wasserstoff)/transmission.json
@@ -1,13 +1,13 @@
 {
-    "name": "Pipeline (Wasserstoff)",
+    "capacity_variable": true,
+    "capacity_per_plant_unit": 1,
+    "opex_per_capacity": 0.0,
+    "economic_lifetime": 40,
     "description": "Stellt die Pipeline (Wasserstoff) dar",
+    "name": "Pipeline (Wasserstoff)",
     "capacity_variable_domain": "CONTINUOUS",
     "invest_per_capacity": 0.000177,
     "interest_rate": 0.08,
     "shared_potential_id": "pipelines",
-    "capacity_variable": false,
-    "capacity_per_plant_unit": 1.0,
-    "opex_per_capacity": 0.0,
-    "economic_lifetime": 40,
     "commodity": "Wasserstoff"
 }
\ No newline at end of file
diff --git a/examples/optimization/dataset-1/dataset1.xlsx b/examples/optimization/dataset-1/dataset1.xlsx
new file mode 100644
index 0000000..21b6144
Binary files /dev/null and b/examples/optimization/dataset-1/dataset1.xlsx differ