diff --git a/benchmark/EU/assets-data.csv b/benchmark/EU/assets-data.csv
index a95da4c4..66f37ce6 100644
--- a/benchmark/EU/assets-data.csv
+++ b/benchmark/EU/assets-data.csv
@@ -1,317 +1,317 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-NL_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_E_Demand,true,2030,2030,false,false,0,20,,0,21291.22,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,7976,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,22940,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_Solar,true,2030,2030,false,false,34.342980275384924,20,54528,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,5800,1,,3,false,0,,false,,,,false,,,false,,false,,
-NL_Gas,true,2030,2030,false,false,64.42708635516841,20,12738,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NL_OCGT,true,2030,2030,false,false,43.36438504674798,20,753.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_E_Demand,true,2030,2030,false,false,0,20,,0,14380.34,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,4669,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11600,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_Solar,true,2030,2030,false,false,34.342980275384924,20,20800,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,767,1,,3,false,0,,false,,,,false,,,false,,false,,
-BE_Gas,true,2030,2030,false,false,64.42708635516841,20,10477.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BE_OCGT,true,2030,2030,false,false,43.36438504674798,20,352.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_E_Demand,true,2030,2030,false,false,0,20,,0,90152,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,75372,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,46592,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Solar,true,2030,2030,false,false,34.342980275384924,20,192280,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1297,1,129300,0,false,0,,false,,,,false,,,false,,false,,
-DE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,4941,1,,3,false,0,,false,,,,false,,,false,,false,,
-DE_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,7382,1,141100,0,false,0,,false,,,,false,,,false,,false,,
-DE_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,1644,1,208350,0,false,0,,false,,,,false,,,false,,false,,
-DE_Coal,true,2030,2030,false,false,145.5541153,20,20450.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_Gas,true,2030,2030,false,false,64.42708635516841,20,31077.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DE_OCGT,true,2030,2030,false,false,43.36438504674798,20,3135.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_E_Demand,true,2030,2030,false,false,0,20,,0,85861,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,35929,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Solar,true,2030,2030,false,false,34.342980275384924,20,86882,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,8785,1,5000000,0,false,0,,false,,,,false,,,false,,false,,
-FR_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1950,1,5000,0,false,0,,false,,,,false,,,false,,false,,
-FR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,1850,1,45000,0,false,0,,false,,,,false,,,false,,false,,
-FR_Gas,true,2030,2030,false,false,64.42708635516841,20,8626.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FR_OCGT,true,2030,2030,false,false,43.36438504674798,20,3135.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_E_Demand,true,2030,2030,false,false,0,20,,0,9633,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6157,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,13660,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_Solar,true,2030,2030,false,false,34.342980275384924,20,12934,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_Gas,true,2030,2030,false,false,64.42708635516841,20,1588.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-DK_OCGT,true,2030,2030,false,false,43.36438504674798,20,184.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_E_Demand,true,2030,2030,false,false,0,20,,0,61936,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,26590,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,69500,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Solar,true,2030,2030,false,false,34.342980275384924,20,46816,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,9059,1,,3,false,0,,false,,,,false,,,false,,false,,
-UK_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,2744,1,13200,0,false,0,,false,,,,false,,,false,,false,,
-UK_Gas,true,2030,2030,false,false,64.42708635516841,20,23762.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-UK_OCGT,true,2030,2030,false,false,43.36438504674798,20,980.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_E_Demand,true,2030,2030,false,false,0,20,,0,6280,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,5800,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,7000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_Solar,true,2030,2030,false,false,34.342980275384924,20,1200,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,450,1,,3,false,0,,false,,,,false,,,false,,false,,
-IE_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,292,1,850,0,false,0,,false,,,,false,,,false,,false,,
-IE_Gas,true,2030,2030,false,false,64.42708635516841,20,4930.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IE_OCGT,true,2030,2030,false,false,43.36438504674798,20,535.1999999999999,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_E_Demand,true,2030,2030,false,false,0,20,,0,10383,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,300,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_Solar,true,2030,2030,false,false,34.342980275384924,20,19600,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CH_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,656,1,,3,false,0,,false,,,,false,,,false,,false,,
-CH_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,2170,1,35000,0,false,0,,false,,,,false,,,false,,false,,
-CH_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,10732,1,4400000,0,false,0,,false,,,,false,,,false,,false,,
-AT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_E_Demand,true,2030,2030,false,false,0,20,,0,13428,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,9000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_Solar,true,2030,2030,false,false,34.342980275384924,20,24000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-AT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2489,1,378500,0,false,0,,false,,,,false,,,false,,false,,
-AT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,2469,1,,3,false,0,,false,,,,false,,,false,,false,,
-AT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,300,1,900,0,false,0,,false,,,,false,,,false,,false,,
-AT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,5793,1,866300,0,false,0,,false,,,,false,,,false,,false,,
-AT_Gas,true,2030,2030,false,false,64.42708635516841,20,3754.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_E_Demand,true,2030,2030,false,false,0,20,,0,1272,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,400,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_Solar,true,2030,2030,false,false,34.342980275384924,20,1216,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LU_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1310,1,2500,0,false,0,,false,,,,false,,,false,,false,,
-CZ_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_E_Demand,true,2030,2030,false,false,0,20,,0,11417,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,742,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Solar,true,2030,2030,false,false,34.342980275384924,20,16318,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,698,1,1250,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1220,1,,3,false,0,,false,,,,false,,,false,,false,,
-CZ_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,688,1,1850,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,470,1,1150,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Coal,true,2030,2030,false,false,145.5541153,20,3420,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CZ_Gas,true,2030,2030,false,false,64.42708635516841,20,4843.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_E_Demand,true,2030,2030,false,false,0,20,,0,27889,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,8663,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11800,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Solar,true,2030,2030,false,false,34.342980275384924,20,10228,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,272,1,400,0,false,0,,false,,,,false,,,false,,false,,
-PL_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1323,1,3150,0,false,0,,false,,,,false,,,false,,false,,
-PL_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,216,1,750,0,false,0,,false,,,,false,,,false,,false,,
-PL_Coal,true,2030,2030,false,false,145.5541153,20,22867.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PL_Gas,true,2030,2030,false,false,64.42708635516841,20,5626.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_E_Demand,true,2030,2030,false,false,0,20,,0,24623,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,16901,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,10000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_Solar,true,2030,2030,false,false,34.342980275384924,20,14678,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,16447,1,15965663,0,false,0,,false,,,,false,,,false,,false,,
-SE_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,543,1,,3,false,0,,false,,,,false,,,false,,false,,
-SE_Gas,true,2030,2030,false,false,64.42708635516841,20,133.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SE_OCGT,true,2030,2030,false,false,43.36438504674798,20,133.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_E_Demand,true,2030,2030,false,false,0,20,,0,27028,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6060,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_Solar,true,2030,2030,false,false,34.342980275384924,20,1200,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-NO_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,38048,1,44788700,0,false,0,,false,,,,false,,,false,,false,,
-ES_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_E_Demand,true,2030,2030,false,false,0,20,,0,44844,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,48350,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Solar,true,2030,2030,false,false,34.342980275384924,20,91408,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,10972,1,5824250,0,false,0,,false,,,,false,,,false,,false,,
-ES_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ES_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,2500,1,,3,false,0,,false,,,,false,,,false,,false,,
-ES_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,6866,1,49500,0,false,0,,false,,,,false,,,false,,false,,
-ES_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,2683,1,2980950,0,false,0,,false,,,,false,,,false,,false,,
-ES_Gas,true,2030,2030,false,false,64.42708635516841,20,29398.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_E_Demand,true,2030,2030,false,false,0,20,,0,9030,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,8901,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,520,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_Solar,true,2030,2030,false,false,34.342980275384924,20,15522,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-PT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,3766,1,644800,0,false,0,,false,,,,false,,,false,,false,,
-PT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,3832,1,1008950,0,false,0,,false,,,,false,,,false,,false,,
-PT_Gas,true,2030,2030,false,false,64.42708635516841,20,3406.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_E_Demand,true,2030,2030,false,false,0,20,,0,62099,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,18400,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,1800,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_Solar,true,2030,2030,false,false,34.342980275384924,20,104000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,9576,1,2783925,0,false,0,,false,,,,false,,,false,,false,,
-IT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1500,1,,3,false,0,,false,,,,false,,,false,,false,,
-IT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,6200,1,31500,0,false,0,,false,,,,false,,,false,,false,,
-IT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,3254,1,144495,0,false,0,,false,,,,false,,,false,,false,,
-IT_Gas,true,2030,2030,false,false,64.42708635516841,20,48560.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-IT_OCGT,true,2030,2030,false,false,43.36438504674798,20,4114.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-MT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-MT_E_Demand,true,2030,2030,false,false,0,20,,0,552,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-MT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-MT_Solar,true,2030,2030,false,false,34.342980275384924,20,532,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-MT_Gas,true,2030,2030,false,false,64.42708635516841,20,583.1999999999999,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_E_Demand,true,2030,2030,false,false,0,20,,0,2448,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,150,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Solar,true,2030,2030,false,false,34.342980275384924,20,3732,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,65,1,,3,false,0,,false,,,,false,,,false,,false,,
-SI_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,180,1,1300,0,false,0,,false,,,,false,,,false,,false,,
-SI_Coal,true,2030,2030,false,false,145.5541153,20,700.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_Gas,true,2030,2030,false,false,64.42708635516841,20,534,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SI_OCGT,true,2030,2030,false,false,43.36438504674798,20,397.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_E_Demand,true,2030,2030,false,false,0,20,,0,10349,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,326,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_Solar,true,2030,2030,false,false,34.342980275384924,20,12908,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,50,1,,3,false,0,,false,,,,false,,,false,,false,,
-HU_Gas,true,2030,2030,false,false,64.42708635516841,20,2878.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HU_OCGT,true,2030,2030,false,false,43.36438504674798,20,324,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_E_Demand,true,2030,2030,false,false,0,20,,0,1056,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,495,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Solar,true,2030,2030,false,false,34.342980275384924,20,2376,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,21,1,8621,0,false,0,,false,,,,false,,,false,,false,,
-SK_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,650,1,2050,0,false,0,,false,,,,false,,,false,,false,,
-SK_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,276,1,22775,0,false,0,,false,,,,false,,,false,,false,,
-SK_Coal,true,2030,2030,false,false,145.5541153,20,429.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-SK_Gas,true,2030,2030,false,false,64.42708635516841,20,962.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_E_Demand,true,2030,2030,false,false,0,20,,0,2131,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,2000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,2800,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_Solar,true,2030,2030,false,false,34.342980275384924,20,2500,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,20,1,,3,false,0,,false,,,,false,,,false,,false,,
-LT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,930,1,5300,0,false,0,,false,,,,false,,,false,,false,,
-LT_Gas,true,2030,2030,false,false,64.42708635516841,20,483.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_E_Demand,true,2030,2030,false,false,0,20,,0,1409,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,396,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,1000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_Solar,true,2030,2030,false,false,34.342980275384924,20,218,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-LV_Gas,true,2030,2030,false,false,64.42708635516841,20,1273.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_E_Demand,true,2030,2030,false,false,0,20,,0,1551,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,838,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-EE_Solar,true,2030,2030,false,false,34.342980275384924,20,830,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_E_Demand,true,2030,2030,false,false,0,20,,0,16523,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,12369,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,3024,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_Solar,true,2030,2030,false,false,34.342980275384924,20,2996,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,3237,1,2765000,0,false,0,,false,,,,false,,,false,,false,,
-FI_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,125,1,,3,false,0,,false,,,,false,,,false,,false,,
-FI_Gas,true,2030,2030,false,false,64.42708635516841,20,1026,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-FI_OCGT,true,2030,2030,false,false,43.36438504674798,20,258,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_E_Demand,true,2030,2030,false,false,0,20,,0,2955,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,2781,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_Solar,true,2030,2030,false,false,34.342980275384924,20,1500,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1941,1,1022950,0,false,0,,false,,,,false,,,false,,false,,
-HR_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,20,1,,3,false,0,,false,,,,false,,,false,,false,,
-HR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,281,1,9150,0,false,0,,false,,,,false,,,false,,false,,
-HR_Coal,true,2030,2030,false,false,145.5541153,20,348,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-HR_Gas,true,2030,2030,false,false,64.42708635516841,20,836.4,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_E_Demand,true,2030,2030,false,false,0,20,,0,10719,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6544,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,200,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Solar,true,2030,2030,false,false,34.342980275384924,20,14392,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2744,1,1800000,0,false,0,,false,,,,false,,,false,,false,,
-GR_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1100,1,,3,false,0,,false,,,,false,,,false,,false,,
-GR_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,680,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,699,1,2250,0,false,0,,false,,,,false,,,false,,false,,
-GR_Gas,true,2030,2030,false,false,64.42708635516841,20,9025.2,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-GR_OCGT,true,2030,2030,false,false,43.36438504674798,20,177.6,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_E_Demand,true,2030,2030,false,false,0,20,,0,6994,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,948,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Solar,true,2030,2030,false,false,34.342980275384924,20,6432,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1281,1,421500,0,false,0,,false,,,,false,,,false,,false,,
-BG_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,864,1,4700,0,false,0,,false,,,,false,,,false,,false,,
-BG_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,535,1,127650,0,false,0,,false,,,,false,,,false,,false,,
-BG_Coal,true,2030,2030,false,false,145.5541153,20,3022.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_Gas,true,2030,2030,false,false,64.42708635516841,20,2406,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-BG_OCGT,true,2030,2030,false,false,43.36438504674798,20,24,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_E_Demand,true,2030,2030,false,false,0,20,,0,10352,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,5255,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Solar,true,2030,2030,false,false,34.342980275384924,20,10108,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2579,1,1212650,0,false,0,,false,,,,false,,,false,,false,,
-RO_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,100,1,,3,false,0,,false,,,,false,,,false,,false,,
-RO_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,839,1,753200,0,false,0,,false,,,,false,,,false,,false,,
-RO_Coal,true,2030,2030,false,false,145.5541153,20,2716.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_Gas,true,2030,2030,false,false,64.42708635516841,20,6826.8,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-RO_OCGT,true,2030,2030,false,false,43.36438504674798,20,1218,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_E_Demand,true,2030,2030,false,false,0,20,,0,1331,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,198,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_Solar,true,2030,2030,false,false,34.342980275384924,20,1600,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-CY_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,41,1,,3,false,0,,false,,,,false,,,false,,false,,
-CY_Gas,true,2030,2030,false,false,64.42708635516841,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+NL_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_E_Demand,true,2030,2030,false,false,0,20,,0,21291.22,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,7976,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,22940,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_Solar,true,2030,2030,false,false,34.342980275384924,20,54528,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,5800,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+NL_Gas,true,2030,2030,false,false,64.42708635516841,20,12738,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NL_OCGT,true,2030,2030,false,false,43.36438504674798,20,753.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_E_Demand,true,2030,2030,false,false,0,20,,0,14380.34,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,4669,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11600,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_Solar,true,2030,2030,false,false,34.342980275384924,20,20800,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,767,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+BE_Gas,true,2030,2030,false,false,64.42708635516841,20,10477.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BE_OCGT,true,2030,2030,false,false,43.36438504674798,20,352.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_E_Demand,true,2030,2030,false,false,0,20,,0,90152,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,75372,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,46592,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Solar,true,2030,2030,false,false,34.342980275384924,20,192280,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1297,1,129300,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,4941,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+DE_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,7382,1,141100,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,1644,1,208350,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Coal,true,2030,2030,false,false,145.5541153,20,20450.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_Gas,true,2030,2030,false,false,64.42708635516841,20,31077.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DE_OCGT,true,2030,2030,false,false,43.36438504674798,20,3135.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_E_Demand,true,2030,2030,false,false,0,20,,0,85861,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,35929,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Solar,true,2030,2030,false,false,34.342980275384924,20,86882,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,8785,1,5000000,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1950,1,5000,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,1850,1,45000,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_Gas,true,2030,2030,false,false,64.42708635516841,20,8626.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FR_OCGT,true,2030,2030,false,false,43.36438504674798,20,3135.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_E_Demand,true,2030,2030,false,false,0,20,,0,9633,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6157,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,13660,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_Solar,true,2030,2030,false,false,34.342980275384924,20,12934,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_Gas,true,2030,2030,false,false,64.42708635516841,20,1588.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+DK_OCGT,true,2030,2030,false,false,43.36438504674798,20,184.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_E_Demand,true,2030,2030,false,false,0,20,,0,61936,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,26590,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,69500,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Solar,true,2030,2030,false,false,34.342980275384924,20,46816,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,9059,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+UK_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,2744,1,13200,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_Gas,true,2030,2030,false,false,64.42708635516841,20,23762.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+UK_OCGT,true,2030,2030,false,false,43.36438504674798,20,980.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_E_Demand,true,2030,2030,false,false,0,20,,0,6280,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,5800,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,7000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Solar,true,2030,2030,false,false,34.342980275384924,20,1200,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,450,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+IE_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,292,1,850,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_Gas,true,2030,2030,false,false,64.42708635516841,20,4930.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IE_OCGT,true,2030,2030,false,false,43.36438504674798,20,535.1999999999999,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_E_Demand,true,2030,2030,false,false,0,20,,0,10383,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,300,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Solar,true,2030,2030,false,false,34.342980275384924,20,19600,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,656,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+CH_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,2170,1,35000,0,false,0,5,,false,,,,false,,,false,,false,,
+CH_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,10732,1,4400000,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_E_Demand,true,2030,2030,false,false,0,20,,0,13428,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,9000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Solar,true,2030,2030,false,false,34.342980275384924,20,24000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2489,1,378500,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,2469,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+AT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,300,1,900,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,5793,1,866300,0,false,0,5,,false,,,,false,,,false,,false,,
+AT_Gas,true,2030,2030,false,false,64.42708635516841,20,3754.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_E_Demand,true,2030,2030,false,false,0,20,,0,1272,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,400,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_Solar,true,2030,2030,false,false,34.342980275384924,20,1216,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LU_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1310,1,2500,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_E_Demand,true,2030,2030,false,false,0,20,,0,11417,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,742,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Solar,true,2030,2030,false,false,34.342980275384924,20,16318,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,698,1,1250,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1220,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,688,1,1850,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,470,1,1150,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Coal,true,2030,2030,false,false,145.5541153,20,3420,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CZ_Gas,true,2030,2030,false,false,64.42708635516841,20,4843.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_E_Demand,true,2030,2030,false,false,0,20,,0,27889,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,8663,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,11800,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Solar,true,2030,2030,false,false,34.342980275384924,20,10228,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,272,1,400,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,1323,1,3150,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,216,1,750,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Coal,true,2030,2030,false,false,145.5541153,20,22867.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PL_Gas,true,2030,2030,false,false,64.42708635516841,20,5626.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_E_Demand,true,2030,2030,false,false,0,20,,0,24623,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,16901,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Solar,true,2030,2030,false,false,34.342980275384924,20,14678,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,16447,1,15965663,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,543,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+SE_Gas,true,2030,2030,false,false,64.42708635516841,20,133.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SE_OCGT,true,2030,2030,false,false,43.36438504674798,20,133.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_E_Demand,true,2030,2030,false,false,0,20,,0,27028,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6060,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_Solar,true,2030,2030,false,false,34.342980275384924,20,1200,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+NO_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,38048,1,44788700,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_E_Demand,true,2030,2030,false,false,0,20,,0,44844,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,48350,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Solar,true,2030,2030,false,false,34.342980275384924,20,91408,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,10972,1,5824250,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,2500,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+ES_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,6866,1,49500,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,2683,1,2980950,0,false,0,5,,false,,,,false,,,false,,false,,
+ES_Gas,true,2030,2030,false,false,64.42708635516841,20,29398.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_E_Demand,true,2030,2030,false,false,0,20,,0,9030,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,8901,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,520,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Solar,true,2030,2030,false,false,34.342980275384924,20,15522,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,3766,1,644800,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,3832,1,1008950,0,false,0,5,,false,,,,false,,,false,,false,,
+PT_Gas,true,2030,2030,false,false,64.42708635516841,20,3406.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_E_Demand,true,2030,2030,false,false,0,20,,0,62099,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,18400,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,1800,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Solar,true,2030,2030,false,false,34.342980275384924,20,104000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,9576,1,2783925,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1500,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+IT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,6200,1,31500,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,3254,1,144495,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_Gas,true,2030,2030,false,false,64.42708635516841,20,48560.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+IT_OCGT,true,2030,2030,false,false,43.36438504674798,20,4114.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+MT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+MT_E_Demand,true,2030,2030,false,false,0,20,,0,552,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+MT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+MT_Solar,true,2030,2030,false,false,34.342980275384924,20,532,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+MT_Gas,true,2030,2030,false,false,64.42708635516841,20,583.1999999999999,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_E_Demand,true,2030,2030,false,false,0,20,,0,2448,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,150,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Solar,true,2030,2030,false,false,34.342980275384924,20,3732,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,65,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+SI_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,180,1,1300,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Coal,true,2030,2030,false,false,145.5541153,20,700.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_Gas,true,2030,2030,false,false,64.42708635516841,20,534,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SI_OCGT,true,2030,2030,false,false,43.36438504674798,20,397.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_E_Demand,true,2030,2030,false,false,0,20,,0,10349,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,326,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_Solar,true,2030,2030,false,false,34.342980275384924,20,12908,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,50,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+HU_Gas,true,2030,2030,false,false,64.42708635516841,20,2878.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HU_OCGT,true,2030,2030,false,false,43.36438504674798,20,324,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_E_Demand,true,2030,2030,false,false,0,20,,0,1056,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,495,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Solar,true,2030,2030,false,false,34.342980275384924,20,2376,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,21,1,8621,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,650,1,2050,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,276,1,22775,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Coal,true,2030,2030,false,false,145.5541153,20,429.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+SK_Gas,true,2030,2030,false,false,64.42708635516841,20,962.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_E_Demand,true,2030,2030,false,false,0,20,,0,2131,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,2000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,2800,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Solar,true,2030,2030,false,false,34.342980275384924,20,2500,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,20,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+LT_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,930,1,5300,0,false,0,5,,false,,,,false,,,false,,false,,
+LT_Gas,true,2030,2030,false,false,64.42708635516841,20,483.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_E_Demand,true,2030,2030,false,false,0,20,,0,1409,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,396,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,1000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_Solar,true,2030,2030,false,false,34.342980275384924,20,218,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+LV_Gas,true,2030,2030,false,false,64.42708635516841,20,1273.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_E_Demand,true,2030,2030,false,false,0,20,,0,1551,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,838,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,400,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+EE_Solar,true,2030,2030,false,false,34.342980275384924,20,830,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_E_Demand,true,2030,2030,false,false,0,20,,0,16523,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,12369,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,3024,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Solar,true,2030,2030,false,false,34.342980275384924,20,2996,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,3237,1,2765000,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,125,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+FI_Gas,true,2030,2030,false,false,64.42708635516841,20,1026,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+FI_OCGT,true,2030,2030,false,false,43.36438504674798,20,258,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_E_Demand,true,2030,2030,false,false,0,20,,0,2955,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,2781,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Solar,true,2030,2030,false,false,34.342980275384924,20,1500,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1941,1,1022950,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,20,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+HR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,281,1,9150,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Coal,true,2030,2030,false,false,145.5541153,20,348,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+HR_Gas,true,2030,2030,false,false,64.42708635516841,20,836.4,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_E_Demand,true,2030,2030,false,false,0,20,,0,10719,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,6544,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Wind_Offshore,true,2030,2030,false,false,119.73261777406992,20,200,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Solar,true,2030,2030,false,false,34.342980275384924,20,14392,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2744,1,1800000,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,1100,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+GR_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,680,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,699,1,2250,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_Gas,true,2030,2030,false,false,64.42708635516841,20,9025.2,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+GR_OCGT,true,2030,2030,false,false,43.36438504674798,20,177.6,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_E_Demand,true,2030,2030,false,false,0,20,,0,6994,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,948,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Solar,true,2030,2030,false,false,34.342980275384924,20,6432,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,1281,1,421500,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Pump_Hydro_Closed,true,2030,2030,false,false,0,20,,1,0,,false,864,1,4700,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,535,1,127650,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Coal,true,2030,2030,false,false,145.5541153,20,3022.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_Gas,true,2030,2030,false,false,64.42708635516841,20,2406,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+BG_OCGT,true,2030,2030,false,false,43.36438504674798,20,24,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_E_Demand,true,2030,2030,false,false,0,20,,0,10352,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,5255,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Solar,true,2030,2030,false,false,34.342980275384924,20,10108,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Hydro,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Hydro_Reservoir,true,2030,2030,false,false,0,20,,1,0,,false,2579,1,1212650,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Nuclear,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,100,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+RO_Pump_Hydro_Open,true,2030,2030,false,false,0,20,,1,0,,false,839,1,753200,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Coal,true,2030,2030,false,false,145.5541153,20,2716.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_Gas,true,2030,2030,false,false,64.42708635516841,20,6826.8,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+RO_OCGT,true,2030,2030,false,false,43.36438504674798,20,1218,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_E_Balance,true,2030,2030,false,false,0,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_E_Demand,true,2030,2030,false,false,0,20,,0,1331,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_E_ENS,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_Wind_Onshore,true,2030,2030,false,false,77.35632865703155,20,198,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_Solar,true,2030,2030,false,false,34.342980275384924,20,1600,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+CY_Battery,true,2030,2030,false,false,77.57785031,20,,1,0,,false,41,1,,3,false,0,5,,false,,,,false,,,false,,false,,
+CY_Gas,true,2030,2030,false,false,64.42708635516841,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/benchmark/EU/vintage-assets-data.csv b/benchmark/EU/vintage-assets-data.csv
index 0fac6766..62549559 100644
--- a/benchmark/EU/vintage-assets-data.csv
+++ b/benchmark/EU/vintage-assets-data.csv
@@ -1,317 +1,317 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-NL_E_Balance,2030,20,0
-NL_E_Demand,2030,20,0
-NL_E_ENS,2030,20,0
-NL_Wind_Onshore,2030,20,77.35632865703155
-NL_Wind_Offshore,2030,20,119.73261777406992
-NL_Solar,2030,20,34.342980275384924
-NL_Battery,2030,20,77.57785031
-NL_Gas,2030,20,64.42708635516841
-NL_OCGT,2030,20,43.36438504674798
-BE_E_Balance,2030,20,0
-BE_E_Demand,2030,20,0
-BE_E_ENS,2030,20,0
-BE_Wind_Onshore,2030,20,77.35632865703155
-BE_Wind_Offshore,2030,20,119.73261777406992
-BE_Solar,2030,20,34.342980275384924
-BE_Hydro,2030,20,0
-BE_Battery,2030,20,77.57785031
-BE_Gas,2030,20,64.42708635516841
-BE_OCGT,2030,20,43.36438504674798
-DE_E_Balance,2030,20,0
-DE_E_Demand,2030,20,0
-DE_E_ENS,2030,20,0
-DE_Wind_Onshore,2030,20,77.35632865703155
-DE_Wind_Offshore,2030,20,119.73261777406992
-DE_Solar,2030,20,34.342980275384924
-DE_Hydro,2030,20,0
-DE_Hydro_Reservoir,2030,20,0
-DE_Battery,2030,20,77.57785031
-DE_Pump_Hydro_Closed,2030,20,0
-DE_Pump_Hydro_Open,2030,20,0
-DE_Coal,2030,20,145.5541153
-DE_Gas,2030,20,64.42708635516841
-DE_OCGT,2030,20,43.36438504674798
-FR_E_Balance,2030,20,0
-FR_E_Demand,2030,20,0
-FR_E_ENS,2030,20,0
-FR_Wind_Onshore,2030,20,77.35632865703155
-FR_Wind_Offshore,2030,20,119.73261777406992
-FR_Solar,2030,20,34.342980275384924
-FR_Hydro,2030,20,0
-FR_Hydro_Reservoir,2030,20,0
-FR_Nuclear,2030,20,0
-FR_Pump_Hydro_Closed,2030,20,0
-FR_Pump_Hydro_Open,2030,20,0
-FR_Gas,2030,20,64.42708635516841
-FR_OCGT,2030,20,43.36438504674798
-DK_E_Balance,2030,20,0
-DK_E_Demand,2030,20,0
-DK_E_ENS,2030,20,0
-DK_Wind_Onshore,2030,20,77.35632865703155
-DK_Wind_Offshore,2030,20,119.73261777406992
-DK_Solar,2030,20,34.342980275384924
-DK_Gas,2030,20,64.42708635516841
-DK_OCGT,2030,20,43.36438504674798
-UK_E_Balance,2030,20,0
-UK_E_Demand,2030,20,0
-UK_E_ENS,2030,20,0
-UK_Wind_Onshore,2030,20,77.35632865703155
-UK_Wind_Offshore,2030,20,119.73261777406992
-UK_Solar,2030,20,34.342980275384924
-UK_Hydro,2030,20,0
-UK_Nuclear,2030,20,0
-UK_Battery,2030,20,77.57785031
-UK_Pump_Hydro_Closed,2030,20,0
-UK_Gas,2030,20,64.42708635516841
-UK_OCGT,2030,20,43.36438504674798
-IE_E_Balance,2030,20,0
-IE_E_Demand,2030,20,0
-IE_E_ENS,2030,20,0
-IE_Wind_Onshore,2030,20,77.35632865703155
-IE_Wind_Offshore,2030,20,119.73261777406992
-IE_Solar,2030,20,34.342980275384924
-IE_Hydro,2030,20,0
-IE_Battery,2030,20,77.57785031
-IE_Pump_Hydro_Closed,2030,20,0
-IE_Gas,2030,20,64.42708635516841
-IE_OCGT,2030,20,43.36438504674798
-CH_E_Balance,2030,20,0
-CH_E_Demand,2030,20,0
-CH_E_ENS,2030,20,0
-CH_Wind_Onshore,2030,20,77.35632865703155
-CH_Solar,2030,20,34.342980275384924
-CH_Hydro,2030,20,0
-CH_Nuclear,2030,20,0
-CH_Battery,2030,20,77.57785031
-CH_Pump_Hydro_Closed,2030,20,0
-CH_Pump_Hydro_Open,2030,20,0
-AT_E_Balance,2030,20,0
-AT_E_Demand,2030,20,0
-AT_E_ENS,2030,20,0
-AT_Wind_Onshore,2030,20,77.35632865703155
-AT_Solar,2030,20,34.342980275384924
-AT_Hydro,2030,20,0
-AT_Hydro_Reservoir,2030,20,0
-AT_Battery,2030,20,77.57785031
-AT_Pump_Hydro_Closed,2030,20,0
-AT_Pump_Hydro_Open,2030,20,0
-AT_Gas,2030,20,64.42708635516841
-LU_E_Balance,2030,20,0
-LU_E_Demand,2030,20,0
-LU_E_ENS,2030,20,0
-LU_Wind_Onshore,2030,20,77.35632865703155
-LU_Solar,2030,20,34.342980275384924
-LU_Hydro,2030,20,0
-LU_Pump_Hydro_Closed,2030,20,0
-CZ_E_Balance,2030,20,0
-CZ_E_Demand,2030,20,0
-CZ_E_ENS,2030,20,0
-CZ_Wind_Onshore,2030,20,77.35632865703155
-CZ_Solar,2030,20,34.342980275384924
-CZ_Hydro,2030,20,0
-CZ_Hydro_Reservoir,2030,20,0
-CZ_Nuclear,2030,20,0
-CZ_Battery,2030,20,77.57785031
-CZ_Pump_Hydro_Closed,2030,20,0
-CZ_Pump_Hydro_Open,2030,20,0
-CZ_Coal,2030,20,145.5541153
-CZ_Gas,2030,20,64.42708635516841
-PL_E_Balance,2030,20,0
-PL_E_Demand,2030,20,0
-PL_E_ENS,2030,20,0
-PL_Wind_Onshore,2030,20,77.35632865703155
-PL_Wind_Offshore,2030,20,119.73261777406992
-PL_Solar,2030,20,34.342980275384924
-PL_Hydro,2030,20,0
-PL_Hydro_Reservoir,2030,20,0
-PL_Pump_Hydro_Closed,2030,20,0
-PL_Pump_Hydro_Open,2030,20,0
-PL_Coal,2030,20,145.5541153
-PL_Gas,2030,20,64.42708635516841
-SE_E_Balance,2030,20,0
-SE_E_Demand,2030,20,0
-SE_E_ENS,2030,20,0
-SE_Wind_Onshore,2030,20,77.35632865703155
-SE_Wind_Offshore,2030,20,119.73261777406992
-SE_Solar,2030,20,34.342980275384924
-SE_Hydro_Reservoir,2030,20,0
-SE_Nuclear,2030,20,0
-SE_Battery,2030,20,77.57785031
-SE_Gas,2030,20,64.42708635516841
-SE_OCGT,2030,20,43.36438504674798
-NO_E_Balance,2030,20,0
-NO_E_Demand,2030,20,0
-NO_E_ENS,2030,20,0
-NO_Wind_Onshore,2030,20,77.35632865703155
-NO_Wind_Offshore,2030,20,119.73261777406992
-NO_Solar,2030,20,34.342980275384924
-NO_Pump_Hydro_Open,2030,20,0
-ES_E_Balance,2030,20,0
-ES_E_Demand,2030,20,0
-ES_E_ENS,2030,20,0
-ES_Wind_Onshore,2030,20,77.35632865703155
-ES_Wind_Offshore,2030,20,119.73261777406992
-ES_Solar,2030,20,34.342980275384924
-ES_Hydro,2030,20,0
-ES_Hydro_Reservoir,2030,20,0
-ES_Nuclear,2030,20,0
-ES_Battery,2030,20,77.57785031
-ES_Pump_Hydro_Closed,2030,20,0
-ES_Pump_Hydro_Open,2030,20,0
-ES_Gas,2030,20,64.42708635516841
-PT_E_Balance,2030,20,0
-PT_E_Demand,2030,20,0
-PT_E_ENS,2030,20,0
-PT_Wind_Onshore,2030,20,77.35632865703155
-PT_Wind_Offshore,2030,20,119.73261777406992
-PT_Solar,2030,20,34.342980275384924
-PT_Hydro,2030,20,0
-PT_Hydro_Reservoir,2030,20,0
-PT_Pump_Hydro_Open,2030,20,0
-PT_Gas,2030,20,64.42708635516841
-IT_E_Balance,2030,20,0
-IT_E_Demand,2030,20,0
-IT_E_ENS,2030,20,0
-IT_Wind_Onshore,2030,20,77.35632865703155
-IT_Wind_Offshore,2030,20,119.73261777406992
-IT_Solar,2030,20,34.342980275384924
-IT_Hydro,2030,20,0
-IT_Hydro_Reservoir,2030,20,0
-IT_Battery,2030,20,77.57785031
-IT_Pump_Hydro_Closed,2030,20,0
-IT_Pump_Hydro_Open,2030,20,0
-IT_Gas,2030,20,64.42708635516841
-IT_OCGT,2030,20,43.36438504674798
-MT_E_Balance,2030,20,0
-MT_E_Demand,2030,20,0
-MT_E_ENS,2030,20,0
-MT_Solar,2030,20,34.342980275384924
-MT_Gas,2030,20,64.42708635516841
-SI_E_Balance,2030,20,0
-SI_E_Demand,2030,20,0
-SI_E_ENS,2030,20,0
-SI_Wind_Onshore,2030,20,77.35632865703155
-SI_Solar,2030,20,34.342980275384924
-SI_Hydro,2030,20,0
-SI_Nuclear,2030,20,0
-SI_Battery,2030,20,77.57785031
-SI_Pump_Hydro_Closed,2030,20,0
-SI_Coal,2030,20,145.5541153
-SI_Gas,2030,20,64.42708635516841
-SI_OCGT,2030,20,43.36438504674798
-HU_E_Balance,2030,20,0
-HU_E_Demand,2030,20,0
-HU_E_ENS,2030,20,0
-HU_Wind_Onshore,2030,20,77.35632865703155
-HU_Solar,2030,20,34.342980275384924
-HU_Hydro,2030,20,0
-HU_Nuclear,2030,20,0
-HU_Battery,2030,20,77.57785031
-HU_Gas,2030,20,64.42708635516841
-HU_OCGT,2030,20,43.36438504674798
-SK_E_Balance,2030,20,0
-SK_E_Demand,2030,20,0
-SK_E_ENS,2030,20,0
-SK_Wind_Onshore,2030,20,77.35632865703155
-SK_Solar,2030,20,34.342980275384924
-SK_Hydro,2030,20,0
-SK_Hydro_Reservoir,2030,20,0
-SK_Nuclear,2030,20,0
-SK_Pump_Hydro_Closed,2030,20,0
-SK_Pump_Hydro_Open,2030,20,0
-SK_Coal,2030,20,145.5541153
-SK_Gas,2030,20,64.42708635516841
-LT_E_Balance,2030,20,0
-LT_E_Demand,2030,20,0
-LT_E_ENS,2030,20,0
-LT_Wind_Onshore,2030,20,77.35632865703155
-LT_Wind_Offshore,2030,20,119.73261777406992
-LT_Solar,2030,20,34.342980275384924
-LT_Hydro,2030,20,0
-LT_Battery,2030,20,77.57785031
-LT_Pump_Hydro_Closed,2030,20,0
-LT_Gas,2030,20,64.42708635516841
-LV_E_Balance,2030,20,0
-LV_E_Demand,2030,20,0
-LV_E_ENS,2030,20,0
-LV_Wind_Onshore,2030,20,77.35632865703155
-LV_Wind_Offshore,2030,20,119.73261777406992
-LV_Solar,2030,20,34.342980275384924
-LV_Hydro,2030,20,0
-LV_Gas,2030,20,64.42708635516841
-EE_E_Balance,2030,20,0
-EE_E_Demand,2030,20,0
-EE_E_ENS,2030,20,0
-EE_Wind_Onshore,2030,20,77.35632865703155
-EE_Wind_Offshore,2030,20,119.73261777406992
-EE_Solar,2030,20,34.342980275384924
-FI_E_Balance,2030,20,0
-FI_E_Demand,2030,20,0
-FI_E_ENS,2030,20,0
-FI_Wind_Onshore,2030,20,77.35632865703155
-FI_Wind_Offshore,2030,20,119.73261777406992
-FI_Solar,2030,20,34.342980275384924
-FI_Hydro_Reservoir,2030,20,0
-FI_Nuclear,2030,20,0
-FI_Battery,2030,20,77.57785031
-FI_Gas,2030,20,64.42708635516841
-FI_OCGT,2030,20,43.36438504674798
-HR_E_Balance,2030,20,0
-HR_E_Demand,2030,20,0
-HR_E_ENS,2030,20,0
-HR_Wind_Onshore,2030,20,77.35632865703155
-HR_Solar,2030,20,34.342980275384924
-HR_Hydro,2030,20,0
-HR_Hydro_Reservoir,2030,20,0
-HR_Battery,2030,20,77.57785031
-HR_Pump_Hydro_Open,2030,20,0
-HR_Coal,2030,20,145.5541153
-HR_Gas,2030,20,64.42708635516841
-GR_E_Balance,2030,20,0
-GR_E_Demand,2030,20,0
-GR_E_ENS,2030,20,0
-GR_Wind_Onshore,2030,20,77.35632865703155
-GR_Wind_Offshore,2030,20,119.73261777406992
-GR_Solar,2030,20,34.342980275384924
-GR_Hydro,2030,20,0
-GR_Hydro_Reservoir,2030,20,0
-GR_Battery,2030,20,77.57785031
-GR_Pump_Hydro_Closed,2030,20,0
-GR_Pump_Hydro_Open,2030,20,0
-GR_Gas,2030,20,64.42708635516841
-GR_OCGT,2030,20,43.36438504674798
-BG_E_Balance,2030,20,0
-BG_E_Demand,2030,20,0
-BG_E_ENS,2030,20,0
-BG_Wind_Onshore,2030,20,77.35632865703155
-BG_Solar,2030,20,34.342980275384924
-BG_Hydro,2030,20,0
-BG_Hydro_Reservoir,2030,20,0
-BG_Nuclear,2030,20,0
-BG_Pump_Hydro_Closed,2030,20,0
-BG_Pump_Hydro_Open,2030,20,0
-BG_Coal,2030,20,145.5541153
-BG_Gas,2030,20,64.42708635516841
-BG_OCGT,2030,20,43.36438504674798
-RO_E_Balance,2030,20,0
-RO_E_Demand,2030,20,0
-RO_E_ENS,2030,20,0
-RO_Wind_Onshore,2030,20,77.35632865703155
-RO_Solar,2030,20,34.342980275384924
-RO_Hydro,2030,20,0
-RO_Hydro_Reservoir,2030,20,0
-RO_Nuclear,2030,20,0
-RO_Battery,2030,20,77.57785031
-RO_Pump_Hydro_Open,2030,20,0
-RO_Coal,2030,20,145.5541153
-RO_Gas,2030,20,64.42708635516841
-RO_OCGT,2030,20,43.36438504674798
-CY_E_Balance,2030,20,0
-CY_E_Demand,2030,20,0
-CY_E_ENS,2030,20,0
-CY_Wind_Onshore,2030,20,77.35632865703155
-CY_Solar,2030,20,34.342980275384924
-CY_Battery,2030,20,77.57785031
-CY_Gas,2030,20,64.42708635516841
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+NL_E_Balance,2030,20,0,5,0
+NL_E_Demand,2030,20,0,5,0
+NL_E_ENS,2030,20,0,5,0
+NL_Wind_Onshore,2030,20,77.35632865703155,5,0
+NL_Wind_Offshore,2030,20,119.73261777406992,5,0
+NL_Solar,2030,20,34.342980275384924,5,0
+NL_Battery,2030,20,77.57785031,5,0
+NL_Gas,2030,20,64.42708635516841,5,0
+NL_OCGT,2030,20,43.36438504674798,5,0
+BE_E_Balance,2030,20,0,5,0
+BE_E_Demand,2030,20,0,5,0
+BE_E_ENS,2030,20,0,5,0
+BE_Wind_Onshore,2030,20,77.35632865703155,5,0
+BE_Wind_Offshore,2030,20,119.73261777406992,5,0
+BE_Solar,2030,20,34.342980275384924,5,0
+BE_Hydro,2030,20,0,5,0
+BE_Battery,2030,20,77.57785031,5,0
+BE_Gas,2030,20,64.42708635516841,5,0
+BE_OCGT,2030,20,43.36438504674798,5,0
+DE_E_Balance,2030,20,0,5,0
+DE_E_Demand,2030,20,0,5,0
+DE_E_ENS,2030,20,0,5,0
+DE_Wind_Onshore,2030,20,77.35632865703155,5,0
+DE_Wind_Offshore,2030,20,119.73261777406992,5,0
+DE_Solar,2030,20,34.342980275384924,5,0
+DE_Hydro,2030,20,0,5,0
+DE_Hydro_Reservoir,2030,20,0,5,0
+DE_Battery,2030,20,77.57785031,5,0
+DE_Pump_Hydro_Closed,2030,20,0,5,0
+DE_Pump_Hydro_Open,2030,20,0,5,0
+DE_Coal,2030,20,145.5541153,5,0
+DE_Gas,2030,20,64.42708635516841,5,0
+DE_OCGT,2030,20,43.36438504674798,5,0
+FR_E_Balance,2030,20,0,5,0
+FR_E_Demand,2030,20,0,5,0
+FR_E_ENS,2030,20,0,5,0
+FR_Wind_Onshore,2030,20,77.35632865703155,5,0
+FR_Wind_Offshore,2030,20,119.73261777406992,5,0
+FR_Solar,2030,20,34.342980275384924,5,0
+FR_Hydro,2030,20,0,5,0
+FR_Hydro_Reservoir,2030,20,0,5,0
+FR_Nuclear,2030,20,0,5,0
+FR_Pump_Hydro_Closed,2030,20,0,5,0
+FR_Pump_Hydro_Open,2030,20,0,5,0
+FR_Gas,2030,20,64.42708635516841,5,0
+FR_OCGT,2030,20,43.36438504674798,5,0
+DK_E_Balance,2030,20,0,5,0
+DK_E_Demand,2030,20,0,5,0
+DK_E_ENS,2030,20,0,5,0
+DK_Wind_Onshore,2030,20,77.35632865703155,5,0
+DK_Wind_Offshore,2030,20,119.73261777406992,5,0
+DK_Solar,2030,20,34.342980275384924,5,0
+DK_Gas,2030,20,64.42708635516841,5,0
+DK_OCGT,2030,20,43.36438504674798,5,0
+UK_E_Balance,2030,20,0,5,0
+UK_E_Demand,2030,20,0,5,0
+UK_E_ENS,2030,20,0,5,0
+UK_Wind_Onshore,2030,20,77.35632865703155,5,0
+UK_Wind_Offshore,2030,20,119.73261777406992,5,0
+UK_Solar,2030,20,34.342980275384924,5,0
+UK_Hydro,2030,20,0,5,0
+UK_Nuclear,2030,20,0,5,0
+UK_Battery,2030,20,77.57785031,5,0
+UK_Pump_Hydro_Closed,2030,20,0,5,0
+UK_Gas,2030,20,64.42708635516841,5,0
+UK_OCGT,2030,20,43.36438504674798,5,0
+IE_E_Balance,2030,20,0,5,0
+IE_E_Demand,2030,20,0,5,0
+IE_E_ENS,2030,20,0,5,0
+IE_Wind_Onshore,2030,20,77.35632865703155,5,0
+IE_Wind_Offshore,2030,20,119.73261777406992,5,0
+IE_Solar,2030,20,34.342980275384924,5,0
+IE_Hydro,2030,20,0,5,0
+IE_Battery,2030,20,77.57785031,5,0
+IE_Pump_Hydro_Closed,2030,20,0,5,0
+IE_Gas,2030,20,64.42708635516841,5,0
+IE_OCGT,2030,20,43.36438504674798,5,0
+CH_E_Balance,2030,20,0,5,0
+CH_E_Demand,2030,20,0,5,0
+CH_E_ENS,2030,20,0,5,0
+CH_Wind_Onshore,2030,20,77.35632865703155,5,0
+CH_Solar,2030,20,34.342980275384924,5,0
+CH_Hydro,2030,20,0,5,0
+CH_Nuclear,2030,20,0,5,0
+CH_Battery,2030,20,77.57785031,5,0
+CH_Pump_Hydro_Closed,2030,20,0,5,0
+CH_Pump_Hydro_Open,2030,20,0,5,0
+AT_E_Balance,2030,20,0,5,0
+AT_E_Demand,2030,20,0,5,0
+AT_E_ENS,2030,20,0,5,0
+AT_Wind_Onshore,2030,20,77.35632865703155,5,0
+AT_Solar,2030,20,34.342980275384924,5,0
+AT_Hydro,2030,20,0,5,0
+AT_Hydro_Reservoir,2030,20,0,5,0
+AT_Battery,2030,20,77.57785031,5,0
+AT_Pump_Hydro_Closed,2030,20,0,5,0
+AT_Pump_Hydro_Open,2030,20,0,5,0
+AT_Gas,2030,20,64.42708635516841,5,0
+LU_E_Balance,2030,20,0,5,0
+LU_E_Demand,2030,20,0,5,0
+LU_E_ENS,2030,20,0,5,0
+LU_Wind_Onshore,2030,20,77.35632865703155,5,0
+LU_Solar,2030,20,34.342980275384924,5,0
+LU_Hydro,2030,20,0,5,0
+LU_Pump_Hydro_Closed,2030,20,0,5,0
+CZ_E_Balance,2030,20,0,5,0
+CZ_E_Demand,2030,20,0,5,0
+CZ_E_ENS,2030,20,0,5,0
+CZ_Wind_Onshore,2030,20,77.35632865703155,5,0
+CZ_Solar,2030,20,34.342980275384924,5,0
+CZ_Hydro,2030,20,0,5,0
+CZ_Hydro_Reservoir,2030,20,0,5,0
+CZ_Nuclear,2030,20,0,5,0
+CZ_Battery,2030,20,77.57785031,5,0
+CZ_Pump_Hydro_Closed,2030,20,0,5,0
+CZ_Pump_Hydro_Open,2030,20,0,5,0
+CZ_Coal,2030,20,145.5541153,5,0
+CZ_Gas,2030,20,64.42708635516841,5,0
+PL_E_Balance,2030,20,0,5,0
+PL_E_Demand,2030,20,0,5,0
+PL_E_ENS,2030,20,0,5,0
+PL_Wind_Onshore,2030,20,77.35632865703155,5,0
+PL_Wind_Offshore,2030,20,119.73261777406992,5,0
+PL_Solar,2030,20,34.342980275384924,5,0
+PL_Hydro,2030,20,0,5,0
+PL_Hydro_Reservoir,2030,20,0,5,0
+PL_Pump_Hydro_Closed,2030,20,0,5,0
+PL_Pump_Hydro_Open,2030,20,0,5,0
+PL_Coal,2030,20,145.5541153,5,0
+PL_Gas,2030,20,64.42708635516841,5,0
+SE_E_Balance,2030,20,0,5,0
+SE_E_Demand,2030,20,0,5,0
+SE_E_ENS,2030,20,0,5,0
+SE_Wind_Onshore,2030,20,77.35632865703155,5,0
+SE_Wind_Offshore,2030,20,119.73261777406992,5,0
+SE_Solar,2030,20,34.342980275384924,5,0
+SE_Hydro_Reservoir,2030,20,0,5,0
+SE_Nuclear,2030,20,0,5,0
+SE_Battery,2030,20,77.57785031,5,0
+SE_Gas,2030,20,64.42708635516841,5,0
+SE_OCGT,2030,20,43.36438504674798,5,0
+NO_E_Balance,2030,20,0,5,0
+NO_E_Demand,2030,20,0,5,0
+NO_E_ENS,2030,20,0,5,0
+NO_Wind_Onshore,2030,20,77.35632865703155,5,0
+NO_Wind_Offshore,2030,20,119.73261777406992,5,0
+NO_Solar,2030,20,34.342980275384924,5,0
+NO_Pump_Hydro_Open,2030,20,0,5,0
+ES_E_Balance,2030,20,0,5,0
+ES_E_Demand,2030,20,0,5,0
+ES_E_ENS,2030,20,0,5,0
+ES_Wind_Onshore,2030,20,77.35632865703155,5,0
+ES_Wind_Offshore,2030,20,119.73261777406992,5,0
+ES_Solar,2030,20,34.342980275384924,5,0
+ES_Hydro,2030,20,0,5,0
+ES_Hydro_Reservoir,2030,20,0,5,0
+ES_Nuclear,2030,20,0,5,0
+ES_Battery,2030,20,77.57785031,5,0
+ES_Pump_Hydro_Closed,2030,20,0,5,0
+ES_Pump_Hydro_Open,2030,20,0,5,0
+ES_Gas,2030,20,64.42708635516841,5,0
+PT_E_Balance,2030,20,0,5,0
+PT_E_Demand,2030,20,0,5,0
+PT_E_ENS,2030,20,0,5,0
+PT_Wind_Onshore,2030,20,77.35632865703155,5,0
+PT_Wind_Offshore,2030,20,119.73261777406992,5,0
+PT_Solar,2030,20,34.342980275384924,5,0
+PT_Hydro,2030,20,0,5,0
+PT_Hydro_Reservoir,2030,20,0,5,0
+PT_Pump_Hydro_Open,2030,20,0,5,0
+PT_Gas,2030,20,64.42708635516841,5,0
+IT_E_Balance,2030,20,0,5,0
+IT_E_Demand,2030,20,0,5,0
+IT_E_ENS,2030,20,0,5,0
+IT_Wind_Onshore,2030,20,77.35632865703155,5,0
+IT_Wind_Offshore,2030,20,119.73261777406992,5,0
+IT_Solar,2030,20,34.342980275384924,5,0
+IT_Hydro,2030,20,0,5,0
+IT_Hydro_Reservoir,2030,20,0,5,0
+IT_Battery,2030,20,77.57785031,5,0
+IT_Pump_Hydro_Closed,2030,20,0,5,0
+IT_Pump_Hydro_Open,2030,20,0,5,0
+IT_Gas,2030,20,64.42708635516841,5,0
+IT_OCGT,2030,20,43.36438504674798,5,0
+MT_E_Balance,2030,20,0,5,0
+MT_E_Demand,2030,20,0,5,0
+MT_E_ENS,2030,20,0,5,0
+MT_Solar,2030,20,34.342980275384924,5,0
+MT_Gas,2030,20,64.42708635516841,5,0
+SI_E_Balance,2030,20,0,5,0
+SI_E_Demand,2030,20,0,5,0
+SI_E_ENS,2030,20,0,5,0
+SI_Wind_Onshore,2030,20,77.35632865703155,5,0
+SI_Solar,2030,20,34.342980275384924,5,0
+SI_Hydro,2030,20,0,5,0
+SI_Nuclear,2030,20,0,5,0
+SI_Battery,2030,20,77.57785031,5,0
+SI_Pump_Hydro_Closed,2030,20,0,5,0
+SI_Coal,2030,20,145.5541153,5,0
+SI_Gas,2030,20,64.42708635516841,5,0
+SI_OCGT,2030,20,43.36438504674798,5,0
+HU_E_Balance,2030,20,0,5,0
+HU_E_Demand,2030,20,0,5,0
+HU_E_ENS,2030,20,0,5,0
+HU_Wind_Onshore,2030,20,77.35632865703155,5,0
+HU_Solar,2030,20,34.342980275384924,5,0
+HU_Hydro,2030,20,0,5,0
+HU_Nuclear,2030,20,0,5,0
+HU_Battery,2030,20,77.57785031,5,0
+HU_Gas,2030,20,64.42708635516841,5,0
+HU_OCGT,2030,20,43.36438504674798,5,0
+SK_E_Balance,2030,20,0,5,0
+SK_E_Demand,2030,20,0,5,0
+SK_E_ENS,2030,20,0,5,0
+SK_Wind_Onshore,2030,20,77.35632865703155,5,0
+SK_Solar,2030,20,34.342980275384924,5,0
+SK_Hydro,2030,20,0,5,0
+SK_Hydro_Reservoir,2030,20,0,5,0
+SK_Nuclear,2030,20,0,5,0
+SK_Pump_Hydro_Closed,2030,20,0,5,0
+SK_Pump_Hydro_Open,2030,20,0,5,0
+SK_Coal,2030,20,145.5541153,5,0
+SK_Gas,2030,20,64.42708635516841,5,0
+LT_E_Balance,2030,20,0,5,0
+LT_E_Demand,2030,20,0,5,0
+LT_E_ENS,2030,20,0,5,0
+LT_Wind_Onshore,2030,20,77.35632865703155,5,0
+LT_Wind_Offshore,2030,20,119.73261777406992,5,0
+LT_Solar,2030,20,34.342980275384924,5,0
+LT_Hydro,2030,20,0,5,0
+LT_Battery,2030,20,77.57785031,5,0
+LT_Pump_Hydro_Closed,2030,20,0,5,0
+LT_Gas,2030,20,64.42708635516841,5,0
+LV_E_Balance,2030,20,0,5,0
+LV_E_Demand,2030,20,0,5,0
+LV_E_ENS,2030,20,0,5,0
+LV_Wind_Onshore,2030,20,77.35632865703155,5,0
+LV_Wind_Offshore,2030,20,119.73261777406992,5,0
+LV_Solar,2030,20,34.342980275384924,5,0
+LV_Hydro,2030,20,0,5,0
+LV_Gas,2030,20,64.42708635516841,5,0
+EE_E_Balance,2030,20,0,5,0
+EE_E_Demand,2030,20,0,5,0
+EE_E_ENS,2030,20,0,5,0
+EE_Wind_Onshore,2030,20,77.35632865703155,5,0
+EE_Wind_Offshore,2030,20,119.73261777406992,5,0
+EE_Solar,2030,20,34.342980275384924,5,0
+FI_E_Balance,2030,20,0,5,0
+FI_E_Demand,2030,20,0,5,0
+FI_E_ENS,2030,20,0,5,0
+FI_Wind_Onshore,2030,20,77.35632865703155,5,0
+FI_Wind_Offshore,2030,20,119.73261777406992,5,0
+FI_Solar,2030,20,34.342980275384924,5,0
+FI_Hydro_Reservoir,2030,20,0,5,0
+FI_Nuclear,2030,20,0,5,0
+FI_Battery,2030,20,77.57785031,5,0
+FI_Gas,2030,20,64.42708635516841,5,0
+FI_OCGT,2030,20,43.36438504674798,5,0
+HR_E_Balance,2030,20,0,5,0
+HR_E_Demand,2030,20,0,5,0
+HR_E_ENS,2030,20,0,5,0
+HR_Wind_Onshore,2030,20,77.35632865703155,5,0
+HR_Solar,2030,20,34.342980275384924,5,0
+HR_Hydro,2030,20,0,5,0
+HR_Hydro_Reservoir,2030,20,0,5,0
+HR_Battery,2030,20,77.57785031,5,0
+HR_Pump_Hydro_Open,2030,20,0,5,0
+HR_Coal,2030,20,145.5541153,5,0
+HR_Gas,2030,20,64.42708635516841,5,0
+GR_E_Balance,2030,20,0,5,0
+GR_E_Demand,2030,20,0,5,0
+GR_E_ENS,2030,20,0,5,0
+GR_Wind_Onshore,2030,20,77.35632865703155,5,0
+GR_Wind_Offshore,2030,20,119.73261777406992,5,0
+GR_Solar,2030,20,34.342980275384924,5,0
+GR_Hydro,2030,20,0,5,0
+GR_Hydro_Reservoir,2030,20,0,5,0
+GR_Battery,2030,20,77.57785031,5,0
+GR_Pump_Hydro_Closed,2030,20,0,5,0
+GR_Pump_Hydro_Open,2030,20,0,5,0
+GR_Gas,2030,20,64.42708635516841,5,0
+GR_OCGT,2030,20,43.36438504674798,5,0
+BG_E_Balance,2030,20,0,5,0
+BG_E_Demand,2030,20,0,5,0
+BG_E_ENS,2030,20,0,5,0
+BG_Wind_Onshore,2030,20,77.35632865703155,5,0
+BG_Solar,2030,20,34.342980275384924,5,0
+BG_Hydro,2030,20,0,5,0
+BG_Hydro_Reservoir,2030,20,0,5,0
+BG_Nuclear,2030,20,0,5,0
+BG_Pump_Hydro_Closed,2030,20,0,5,0
+BG_Pump_Hydro_Open,2030,20,0,5,0
+BG_Coal,2030,20,145.5541153,5,0
+BG_Gas,2030,20,64.42708635516841,5,0
+BG_OCGT,2030,20,43.36438504674798,5,0
+RO_E_Balance,2030,20,0,5,0
+RO_E_Demand,2030,20,0,5,0
+RO_E_ENS,2030,20,0,5,0
+RO_Wind_Onshore,2030,20,77.35632865703155,5,0
+RO_Solar,2030,20,34.342980275384924,5,0
+RO_Hydro,2030,20,0,5,0
+RO_Hydro_Reservoir,2030,20,0,5,0
+RO_Nuclear,2030,20,0,5,0
+RO_Battery,2030,20,77.57785031,5,0
+RO_Pump_Hydro_Open,2030,20,0,5,0
+RO_Coal,2030,20,145.5541153,5,0
+RO_Gas,2030,20,64.42708635516841,5,0
+RO_OCGT,2030,20,43.36438504674798,5,0
+CY_E_Balance,2030,20,0,5,0
+CY_E_Demand,2030,20,0,5,0
+CY_E_ENS,2030,20,0,5,0
+CY_Wind_Onshore,2030,20,77.35632865703155,5,0
+CY_Solar,2030,20,34.342980275384924,5,0
+CY_Battery,2030,20,77.57785031,5,0
+CY_Gas,2030,20,64.42708635516841,5,0
diff --git a/docs/src/how-to-use.md b/docs/src/how-to-use.md
index 69d96c3c..961d164e 100644
--- a/docs/src/how-to-use.md
+++ b/docs/src/how-to-use.md
@@ -344,6 +344,7 @@ Energy storage assets have a unique characteristic wherein the investment is bas
 -   _Investment energy method_: To use this method, set the parameter `storage_method_energy` to `true`. In addition, it is necessary to define:
 
     -   `investment_cost_storage_energy`: To establish the cost of investing in the storage capacity (e.g., kEUR/MWh/unit).
+    -   `fixed_cost_storage_energy`: To establish the fixed cost of energy storage capacity (e.g., kEUR/MWh/unit).
     -   `investment_limit_storage_energy`: To define the potential of the energy capacity investment (e.g., MWh). `Missing` values mean that there is no limit.
     -   `investment_integer_storage_energy`: To determine whether the investment variables of storage capacity are integers of continuous.
 
diff --git a/src/input-schemas.jl b/src/input-schemas.jl
index 2f441b0d..e1c56f89 100644
--- a/src/input-schemas.jl
+++ b/src/input-schemas.jl
@@ -42,7 +42,6 @@ const schemas = (
             :initial_storage_level => "DOUBLE",              # MWh (Missing -> free initial level)
             :energy_to_power_ratio => "DOUBLE",              # Hours
             :storage_method_energy => "BOOLEAN",             # Whether storage method is energy or not (i.e., fixed_ratio)
-            :investment_cost_storage_energy => "DOUBLE",     # kEUR/MWh/year
             :investment_limit_storage_energy => "DOUBLE",    # MWh (Missing -> no limit)
             :investment_integer_storage_energy => "BOOLEAN", # Whether investment for storage energy is integer or continuous
             :use_binary_storage_method => "VARCHAR",         # Whether to use an extra binary variable for the storage assets to avoid charging and discharging simultaneously (missing;binary;relaxed_binary)
@@ -62,8 +61,10 @@ const schemas = (
         vintage_assets_data = OrderedDict(
             :name => "VARCHAR",
             :commission_year => "INTEGER",                   # Year of commissioning
-            :fixed_cost => "DOUBLE",
-            :investment_cost => "DOUBLE",                    # kEUR/MW/year
+            :fixed_cost => "DOUBLE",                         # kEUR/MW/year
+            :investment_cost => "DOUBLE",                    # kEUR/MW
+            :fixed_cost_storage_energy => "DOUBLE",          # kEUR/MWh/year
+            :investment_cost_storage_energy => "DOUBLE",     # kEUR/MWh
         ),
 
         # Schema for the vintage-flows-data.csv
@@ -71,8 +72,8 @@ const schemas = (
             :from_asset => "VARCHAR",                        # Name of Asset
             :to_asset => "VARCHAR",                          # Name of Asset
             :commission_year => "INTEGER",                   # Year of commissioning
-            :fixed_cost => "DOUBLE",
-            :investment_cost => "DOUBLE",                    # kEUR/MW/year
+            :fixed_cost => "DOUBLE",                         # kEUR/MWh/year
+            :investment_cost => "DOUBLE",                    # kEUR/MW
         ),
 
         # Schema for the assets-profiles.csv and assets-timeframe-profiles.csv file.
diff --git a/src/io.jl b/src/io.jl
index 344d61f9..891cd330 100644
--- a/src/io.jl
+++ b/src/io.jl
@@ -162,7 +162,12 @@ function create_internal_structures(connection)
             _get_stuff_year("assets_data", "initial_storage_level"; name = row.name),
             _get_stuff_year("assets_data", "energy_to_power_ratio"; name = row.name),
             _get_stuff_year("assets_data", "storage_method_energy"; name = row.name),
-            _get_stuff_year("assets_data", "investment_cost_storage_energy"; name = row.name),
+            _get_stuff_vintage_year(
+                "assets_data",
+                "investment_cost_storage_energy";
+                name = row.name,
+            ),
+            _get_stuff_vintage_year("assets_data", "fixed_cost_storage_energy"; name = row.name),
             _get_stuff_year("assets_data", "investment_limit_storage_energy"; name = row.name),
             row.capacity_storage_energy,
             _get_stuff_year("assets_data", "investment_integer_storage_energy"; name = row.name),
diff --git a/src/structures.jl b/src/structures.jl
index 46eb2a40..595bd7ae 100644
--- a/src/structures.jl
+++ b/src/structures.jl
@@ -71,6 +71,7 @@ mutable struct GraphAssetData
     energy_to_power_ratio::Dict{Int,Float64}
     storage_method_energy::Dict{Int,Bool}
     investment_cost_storage_energy::Dict{Int,Float64}
+    fixed_cost_storage_energy::Dict{Int,Float64}
     investment_limit_storage_energy::Dict{Int,Union{Missing,Float64}}
     capacity_storage_energy::Float64
     investment_integer_storage_energy::Dict{Int,Bool}
@@ -122,6 +123,7 @@ mutable struct GraphAssetData
         energy_to_power_ratio,
         storage_method_energy,
         investment_cost_storage_energy,
+        fixed_cost_storage_energy,
         investment_limit_storage_energy,
         capacity_storage_energy,
         investment_integer_storage_energy,
@@ -165,6 +167,7 @@ mutable struct GraphAssetData
             energy_to_power_ratio,
             storage_method_energy,
             investment_cost_storage_energy,
+            fixed_cost_storage_energy,
             investment_limit_storage_energy,
             capacity_storage_energy,
             investment_integer_storage_energy,
diff --git a/test/inputs/Multi-year Investments/assets-data.csv b/test/inputs/Multi-year Investments/assets-data.csv
index 0d1a38fa..bdd855d4 100644
--- a/test/inputs/Multi-year Investments/assets-data.csv	
+++ b/test/inputs/Multi-year Investments/assets-data.csv	
@@ -1,22 +1,22 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-ocgt,true,2030,2030,true,true,25,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2030,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2030,2030,true,true,40,20,10000,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-battery,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-battery,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-solar,true,2030,2030,true,true,50,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ens,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-demand,true,2030,2030,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ocgt,true,2050,2050,true,true,25,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2050,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2050,2050,false,false,40,20,10000,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-battery,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-battery,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-solar,true,2050,2050,true,true,50,20,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ens,true,2050,2050,false,false,0,20,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-demand,false,2050,2050,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+ocgt,true,2030,2030,true,true,25,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2030,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2030,2030,true,true,40,20,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+battery,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+battery,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2030,2020,false,false,70,20,,0.07,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2030,2030,true,true,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+solar,true,2030,2030,true,true,50,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ens,true,2030,2030,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+demand,true,2030,2030,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ocgt,true,2050,2050,true,true,25,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2050,2028,false,false,40,20,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2050,2050,false,false,40,20,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+battery,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+battery,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2050,2030,false,false,70,20,,0.02,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2050,2050,true,true,70,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+solar,true,2050,2050,true,true,50,20,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ens,true,2050,2050,false,false,0,20,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+demand,false,2050,2050,false,false,0,20,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/Multi-year Investments/vintage-assets-data.csv b/test/inputs/Multi-year Investments/vintage-assets-data.csv
index 13e2fc29..046b4451 100644
--- a/test/inputs/Multi-year Investments/vintage-assets-data.csv	
+++ b/test/inputs/Multi-year Investments/vintage-assets-data.csv	
@@ -1,19 +1,19 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-ocgt,2030,20,25
-ccgt,2028,20,40
-ccgt,2030,20,40
-battery,2020,20,70
-battery,2030,20,70
-wind,2020,20,70
-wind,2030,20,70
-solar,2030,20,50
-ens,2030,20,0
-demand,2030,20,0
-ocgt,2050,20,25
-ccgt,2050,20,40
-battery,2050,20,70
-wind,2050,20,70
-solar,2050,20,50
-ens,2050,20,0
-demand,2050,20,0
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+ocgt,2030,20,25,5,0
+ccgt,2028,20,40,5,0
+ccgt,2030,20,40,5,0
+battery,2020,20,70,5,0
+battery,2030,20,70,5,0
+wind,2020,20,70,5,0
+wind,2030,20,70,5,0
+solar,2030,20,50,5,0
+ens,2030,20,0,5,0
+demand,2030,20,0,5,0
+ocgt,2050,20,25,5,0
+ccgt,2050,20,40,5,0
+battery,2050,20,70,5,0
+wind,2050,20,70,5,0
+solar,2050,20,50,5,0
+ens,2050,20,0,5,0
+demand,2050,20,0,5,0
diff --git a/test/inputs/Norse/assets-data.csv b/test/inputs/Norse/assets-data.csv
index eb79c5ca..a08e27de 100644
--- a/test/inputs/Norse/assets-data.csv
+++ b/test/inputs/Norse/assets-data.csv
@@ -1,25 +1,25 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-Asgard_Battery,true,2030,2030,true,true,300,0,25000,7.25,0,,false,0,0,,100,true,30,1000,true,binary,,,false,,,false,,false,,
-Asgard_Solar,true,2030,2030,true,true,350,0,50000,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Asgard_E_demand,true,2030,2030,false,false,0,0,0,0,65787.17792,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Asgard_CCGT,true,2030,2030,true,true,650,0,,0,0,,false,0,0,0,0,false,0,,false,,,,true,basic,0.97,false,0.25,true,0.5,0.3
-G_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Midgard_Wind,true,2030,2030,true,true,1300,0,80000,0,0,,true,0,0,0,0,false,0,,false,,4.5e6,,false,,,false,,false,,
-Midgard_Hydro,true,2030,2030,false,false,1600,0,0,1,0,,true,10000,1,25000,0,false,0,,false,relaxed_binary,,,false,,,false,,false,,
-Midgard_PHS,true,2030,2030,true,true,800,0,5000,1.75,0,,false,0,0,,1,true,500,1000,false,,,,false,,,false,,false,,
-Midgard_Nuclear_SMR,true,2030,2030,true,false,6000,0,,6.6666667,0,,true,0,0,0,0,false,0,,false,,,4.5e3,false,,,false,,true,0.75,0.65
-Midgard_E_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Midgard_CCGT,true,2030,2030,false,false,650,0,,5,0,,false,0,0,0,0,false,0,,false,,,,true,basic,,true,0.4,false,,
-Midgard_E_demand,true,2030,2030,false,false,0,0,0,0,19604.76443,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_H2_generator,true,2030,2030,true,true,479,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_H2_storage,true,2030,2030,true,true,0.1,0,,0,0,,true,0,0,,10000,false,10,,true,,,,false,,,false,,false,,
-Valhalla_H2_demand,true,2030,2030,false,false,0,0,0,0,745.735,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_Electrolyser,true,2030,2030,true,true,1260,0,,5,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_E_balance,true,2030,2030,false,false,0,0,0,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_E_exports,true,2030,2030,false,false,0,0,0,0,50,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_Fuel_cell,true,2030,2030,true,true,800,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_Heat_pump,true,2030,2030,true,true,300,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_Waste_heat,true,2030,2030,false,false,1450,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_Heat_demand,true,2030,2030,false,false,0,0,0,0,3548.42445,>=,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-Valhalla_GT,true,2030,2030,true,true,400,0,100000,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+Asgard_Battery,true,2030,2030,true,true,300,0,25000,7.25,0,,false,0,0,,100,true,30,5,1000,true,binary,,,false,,,false,,false,,
+Asgard_Solar,true,2030,2030,true,true,350,0,50000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Asgard_E_demand,true,2030,2030,false,false,0,0,0,0,65787.17792,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Asgard_CCGT,true,2030,2030,true,true,650,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,0.97,false,0.25,true,0.5,0.3
+G_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Midgard_Wind,true,2030,2030,true,true,1300,0,80000,0,0,,true,0,0,0,0,false,0,5,,false,,4.5e6,,false,,,false,,false,,
+Midgard_Hydro,true,2030,2030,false,false,1600,0,0,1,0,,true,10000,1,25000,0,false,0,5,,false,relaxed_binary,,,false,,,false,,false,,
+Midgard_PHS,true,2030,2030,true,true,800,0,5000,1.75,0,,false,0,0,,1,true,500,5,1000,false,,,,false,,,false,,false,,
+Midgard_Nuclear_SMR,true,2030,2030,true,false,6000,0,,6.6666667,0,,true,0,0,0,0,false,0,5,,false,,,4.5e3,false,,,false,,true,0.75,0.65
+Midgard_E_imports,true,2030,2030,false,false,0,0,0,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Midgard_CCGT,true,2030,2030,false,false,650,0,,5,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,,true,0.4,false,,
+Midgard_E_demand,true,2030,2030,false,false,0,0,0,0,19604.76443,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_H2_generator,true,2030,2030,true,true,479,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_H2_storage,true,2030,2030,true,true,0.1,0,,0,0,,true,0,0,,10000,false,10,5,,true,,,,false,,,false,,false,,
+Valhalla_H2_demand,true,2030,2030,false,false,0,0,0,0,745.735,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_Electrolyser,true,2030,2030,true,true,1260,0,,5,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_E_balance,true,2030,2030,false,false,0,0,0,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_E_exports,true,2030,2030,false,false,0,0,0,0,50,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_Fuel_cell,true,2030,2030,true,true,800,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_Heat_pump,true,2030,2030,true,true,300,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_Waste_heat,true,2030,2030,false,false,1450,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_Heat_demand,true,2030,2030,false,false,0,0,0,0,3548.42445,>=,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+Valhalla_GT,true,2030,2030,true,true,400,0,100000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/Norse/vintage-assets-data.csv b/test/inputs/Norse/vintage-assets-data.csv
index 42decda6..9720e4d4 100644
--- a/test/inputs/Norse/vintage-assets-data.csv
+++ b/test/inputs/Norse/vintage-assets-data.csv
@@ -1,25 +1,25 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-Asgard_Battery,2030,0,300
-Asgard_Solar,2030,0,350
-Asgard_E_demand,2030,0,0
-Asgard_CCGT,2030,0,650
-G_imports,2030,0,0
-Midgard_Wind,2030,0,1300
-Midgard_Hydro,2030,0,1600
-Midgard_PHS,2030,0,800
-Midgard_Nuclear_SMR,2030,0,6000
-Midgard_E_imports,2030,0,0
-Midgard_CCGT,2030,0,650
-Midgard_E_demand,2030,0,0
-Valhalla_H2_generator,2030,0,479
-Valhalla_H2_storage,2030,0,0.1
-Valhalla_H2_demand,2030,0,0
-Valhalla_Electrolyser,2030,0,1260
-Valhalla_E_balance,2030,0,0
-Valhalla_E_exports,2030,0,0
-Valhalla_Fuel_cell,2030,0,800
-Valhalla_Heat_pump,2030,0,300
-Valhalla_Waste_heat,2030,0,1450
-Valhalla_Heat_demand,2030,0,0
-Valhalla_GT,2030,0,400
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+Asgard_Battery,2030,0,300,5,30
+Asgard_Solar,2030,0,350,5,0
+Asgard_E_demand,2030,0,0,5,0
+Asgard_CCGT,2030,0,650,5,0
+G_imports,2030,0,0,5,0
+Midgard_Wind,2030,0,1300,5,0
+Midgard_Hydro,2030,0,1600,5,0
+Midgard_PHS,2030,0,800,5,500
+Midgard_Nuclear_SMR,2030,0,6000,5,0
+Midgard_E_imports,2030,0,0,5,0
+Midgard_CCGT,2030,0,650,5,0
+Midgard_E_demand,2030,0,0,5,0
+Valhalla_H2_generator,2030,0,479,5,0
+Valhalla_H2_storage,2030,0,0.1,5,10
+Valhalla_H2_demand,2030,0,0,5,0
+Valhalla_Electrolyser,2030,0,1260,5,0
+Valhalla_E_balance,2030,0,0,5,0
+Valhalla_E_exports,2030,0,0,5,0
+Valhalla_Fuel_cell,2030,0,800,5,0
+Valhalla_Heat_pump,2030,0,300,5,0
+Valhalla_Waste_heat,2030,0,1450,5,0
+Valhalla_Heat_demand,2030,0,0,5,0
+Valhalla_GT,2030,0,400,5,0
diff --git a/test/inputs/Storage/assets-data.csv b/test/inputs/Storage/assets-data.csv
index a3a73e9b..6aadb44b 100644
--- a/test/inputs/Storage/assets-data.csv
+++ b/test/inputs/Storage/assets-data.csv
@@ -1,10 +1,10 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-ocgt,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2030,2030,false,false,0,0,,2,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2030,2030,false,false,0,0,,35,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-solar,true,2030,2030,false,false,0,0,,45,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-battery,true,2030,2030,false,false,0,0,,1,0,,false,0,1,0,0,false,0,,false,,,,false,,,false,,false,,
-phs,true,2030,2030,false,false,0,0,,1,0,,true,0,1,2400,0,false,0,,false,,,,false,,,false,,false,,
-demand,true,2030,2030,false,false,0,0,,0,1240,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+ocgt,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2030,2030,false,false,0,0,,2,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2030,2030,false,false,0,0,,35,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+solar,true,2030,2030,false,false,0,0,,45,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+battery,true,2030,2030,false,false,0,0,,1,0,,false,0,1,0,0,false,0,5,,false,,,,false,,,false,,false,,
+phs,true,2030,2030,false,false,0,0,,1,0,,true,0,1,2400,0,false,0,5,,false,,,,false,,,false,,false,,
+demand,true,2030,2030,false,false,0,0,,0,1240,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/Storage/vintage-assets-data.csv b/test/inputs/Storage/vintage-assets-data.csv
index 1cd63a5c..dd3e0d80 100644
--- a/test/inputs/Storage/vintage-assets-data.csv
+++ b/test/inputs/Storage/vintage-assets-data.csv
@@ -1,10 +1,10 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-ocgt,2030,0,0
-ccgt,2030,0,0
-wind,2030,0,0
-solar,2030,0,0
-ens,2030,0,0
-battery,2030,0,0
-phs,2030,0,0
-demand,2030,0,0
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+ocgt,2030,0,0,5,0
+ccgt,2030,0,0,5,0
+wind,2030,0,0,5,0
+solar,2030,0,0,5,0
+ens,2030,0,0,5,0
+battery,2030,0,0,5,0
+phs,2030,0,0,5,0
+demand,2030,0,0,5,0
diff --git a/test/inputs/Tiny/assets-data.csv b/test/inputs/Tiny/assets-data.csv
index 528d03d8..6e7b9db5 100644
--- a/test/inputs/Tiny/assets-data.csv
+++ b/test/inputs/Tiny/assets-data.csv
@@ -1,8 +1,8 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-ocgt,true,2030,2030,true,true,25,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2030,2030,true,true,40,0,10000,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2030,2030,true,true,70,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-solar,true,2030,2030,true,true,50,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-demand,true,2030,2030,false,false,0,0,,0,1115,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+ocgt,true,2030,2030,true,true,25,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2030,2030,true,true,40,0,10000,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2030,2030,true,true,70,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+solar,true,2030,2030,true,true,50,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+demand,true,2030,2030,false,false,0,0,,0,1115,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/Tiny/vintage-assets-data.csv b/test/inputs/Tiny/vintage-assets-data.csv
index 5c89eb1c..afb90338 100644
--- a/test/inputs/Tiny/vintage-assets-data.csv
+++ b/test/inputs/Tiny/vintage-assets-data.csv
@@ -1,8 +1,8 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-ocgt,2030,0,25
-ccgt,2030,0,40
-wind,2030,0,70
-solar,2030,0,50
-ens,2030,0,0
-demand,2030,0,0
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+ocgt,2030,0,25,5,0
+ccgt,2030,0,40,5,0
+wind,2030,0,70,5,0
+solar,2030,0,50,5,0
+ens,2030,0,0,5,0
+demand,2030,0,0,5,0
diff --git a/test/inputs/UC-ramping/assets-data.csv b/test/inputs/UC-ramping/assets-data.csv
index 0120c19c..5da9ec80 100644
--- a/test/inputs/UC-ramping/assets-data.csv
+++ b/test/inputs/UC-ramping/assets-data.csv
@@ -1,10 +1,10 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-gas,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,true,0.83,0.83
-ocgt,true,2030,2030,true,true,25,0,,0,0,,false,0,0,0,0,false,0,,false,,,,true,basic,0.68,true,0.10,false,,
-ccgt,true,2030,2030,true,true,40,0,10000,1,0,,false,0,0,0,0,false,0,,false,,,,true,basic,0.45,true,0.25,true,0.30,0.40
-smr,true,2030,2030,false,true,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,true,basic,2.95,true,0.75,true,0.10,0.10
-wind,true,2030,2030,true,true,100,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-solar,true,2030,2030,true,true,15,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-demand,true,2030,2030,false,false,0,0,,0,1150,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+gas,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,true,0.83,0.83
+ocgt,true,2030,2030,true,true,25,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,0.68,true,0.10,false,,
+ccgt,true,2030,2030,true,true,40,0,10000,1,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,0.45,true,0.25,true,0.30,0.40
+smr,true,2030,2030,false,true,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,true,basic,2.95,true,0.75,true,0.10,0.10
+wind,true,2030,2030,true,true,100,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+solar,true,2030,2030,true,true,15,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ens,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+demand,true,2030,2030,false,false,0,0,,0,1150,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/UC-ramping/vintage-assets-data.csv b/test/inputs/UC-ramping/vintage-assets-data.csv
index 55440669..0bce72e9 100644
--- a/test/inputs/UC-ramping/vintage-assets-data.csv
+++ b/test/inputs/UC-ramping/vintage-assets-data.csv
@@ -1,10 +1,10 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-gas,2030,0,0
-ocgt,2030,0,25
-ccgt,2030,0,40
-smr,2030,0,0
-wind,2030,0,100
-solar,2030,0,15
-ens,2030,0,0
-demand,2030,0,0
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+gas,2030,0,0,5,0
+ocgt,2030,0,25,5,0
+ccgt,2030,0,40,5,0
+smr,2030,0,0,5,0
+wind,2030,0,100,5,0
+solar,2030,0,15,5,0
+ens,2030,0,0,5,0
+demand,2030,0,0,5,0
diff --git a/test/inputs/Variable Resolution/assets-data.csv b/test/inputs/Variable Resolution/assets-data.csv
index cf5d44e6..a556afc8 100644
--- a/test/inputs/Variable Resolution/assets-data.csv	
+++ b/test/inputs/Variable Resolution/assets-data.csv	
@@ -1,8 +1,8 @@
-,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
-name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
-H2,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-ccgt,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-wind,true,2030,2030,false,false,0,0,,2,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-phs,true,2030,2030,false,false,0,0,,1,0,,false,0,1,0,6,false,0,,false,,,,false,,,false,,false,,
-demand,true,2030,2030,false,false,0,0,,0,100,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
-balance,true,2030,2030,false,false,0,0,,0,0,,false,0,0,0,0,false,0,,false,,,,false,,,false,,false,,
+,{true;false},,,{true;false},{true;false},kEUR/MW/year,kEUR/MW/year,MW,units,MW,{empty;==;>=},{true;false},MWh/year,units,MWh,h,{true;false},kEUR/MWh/year,kEUR/MWh/year,MWh,{true;false},{missing;binary;relaxed_binary},MWh,MWh,{true;false},{missing;basic},kEUR/h/unit_on,{true;false},[p.u.],{true;false},[p.u.],[p.u.]
+name,active,year,commission_year,investable,investment_integer,investment_cost,fixed_cost,investment_limit,initial_units,peak_demand,consumer_balance_sense,is_seasonal,storage_inflows,initial_storage_units,initial_storage_level,energy_to_power_ratio,storage_method_energy,investment_cost_storage_energy,fixed_cost_storage_energy,investment_limit_storage_energy,investment_integer_storage_energy,use_binary_storage_method,max_energy_timeframe_partition,min_energy_timeframe_partition,unit_commitment,unit_commitment_method,units_on_cost,unit_commitment_integer,min_operating_point,ramping,max_ramp_up,max_ramp_down
+H2,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+ccgt,true,2030,2030,false,false,0,0,,1,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+wind,true,2030,2030,false,false,0,0,,2,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+phs,true,2030,2030,false,false,0,0,,1,0,,false,0,1,0,6,false,0,5,,false,,,,false,,,false,,false,,
+demand,true,2030,2030,false,false,0,0,,0,100,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
+balance,true,2030,2030,false,false,0,0,,0,0,,false,0,0,0,0,false,0,5,,false,,,,false,,,false,,false,,
diff --git a/test/inputs/Variable Resolution/vintage-assets-data.csv b/test/inputs/Variable Resolution/vintage-assets-data.csv
index 08757e45..5f362d15 100644
--- a/test/inputs/Variable Resolution/vintage-assets-data.csv	
+++ b/test/inputs/Variable Resolution/vintage-assets-data.csv	
@@ -1,8 +1,8 @@
-,,kEUR/MW/year,kEUR/MW/year
-name,commission_year,fixed_cost,investment_cost
-H2,2030,0,0
-ccgt,2030,0,0
-wind,2030,0,0
-phs,2030,0,0
-demand,2030,0,0
-balance,2030,0,0
+,,kEUR/MW/year,kEUR/MW/year,kEUR/MWh/year,kEUR/MWh
+name,commission_year,fixed_cost,investment_cost,fixed_cost_storage_energy,investment_cost_storage_energy
+H2,2030,0,0,5,0
+ccgt,2030,0,0,5,0
+wind,2030,0,0,5,0
+phs,2030,0,0,5,0
+demand,2030,0,0,5,0
+balance,2030,0,0,5,0