diff --git a/inst/mappings/mapping_ARIADNE.csv b/inst/mappings/mapping_ARIADNE.csv
index 3ba4ddcc0..18a94b225 100644
--- a/inst/mappings/mapping_ARIADNE.csv
+++ b/inst/mappings/mapping_ARIADNE.csv
@@ -1229,46 +1229,46 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 2;energy (supply);Primary Energy|Waste|Electricity;PJ/yr;Non-renewable waste used for electricity generation;;;;;0;;
 2;energy (supply);Primary Energy|Waste|Heat;PJ/yr;Non-renewable waste used for heat generation;;;;;0;;
 1;energy (supply);Secondary Energy;PJ/yr;total secondary energy - the sum of all secondary energy carrier production (for consistency checks);SE;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity;PJ/yr;total net electricity production, incl. electricity for hydrogen storage that is then converted back to electricity  (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Biomass;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste, biogas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Biomass;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Biomass|w/ CCS;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Biomass|+|w/ CC;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Biomass|w/o CCS;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Biomass|+|w/o CC;EJ/yr;1000;;0;;R
+1;energy (electricity);Secondary Energy|Electricity;PJ/yr;total net electricity production, incl. electricity for hydrogen storage that is then converted back to electricity  (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Biomass;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste, biogas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Biomass;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Biomass|w/ CCS;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Biomass|+|w/ CC;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Biomass|w/o CCS;PJ/yr;net electricity production from municipal solid waste, purpose-grown biomass, crop residues, forest industry waste with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Biomass|+|w/o CC;EJ/yr;1000;;0;;Rx
 3;energy (electricity);Secondary Energy|Electricity|Biomass|Solid;PJ/yr;net electricity production from solid biomass and renewable waste (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 3;energy (electricity);Secondary Energy|Electricity|Biomass|Gaseous and Liquid;PJ/yr;net electricity production from biogas and biofuels (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
-1;energy (electricity);Secondary Energy|Electricity|Coal;PJ/yr;net electricity production from coal (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Coal|Other Fossil Adjusted;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Coal|w/ CCS;PJ/yr;net electricity production from coal with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Coal|+|w/ CC;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Coal|w/o CCS;PJ/yr;net electricity production from coal with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Coal|w/o CC|Other Fossil Adjusted;EJ/yr;1000;;0;;R
+1;energy (electricity);Secondary Energy|Electricity|Coal;PJ/yr;net electricity production from coal (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Coal|Other Fossil Adjusted;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Coal|w/ CCS;PJ/yr;net electricity production from coal with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Coal|+|w/ CC;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Coal|w/o CCS;PJ/yr;net electricity production from coal with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Coal|w/o CC|Other Fossil Adjusted;EJ/yr;1000;;0;;Rx
 1;energy (electricity);Secondary Energy|Electricity|Coal|Hard Coal;PJ/yr;Net electricity production from hard coal (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 3;energy (electricity);Secondary Energy|Electricity|Coal|Hard Coal|w/ CCS;PJ/yr;net electricity production from hard coal with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 3;energy (electricity);Secondary Energy|Electricity|Coal|Hard Coal|w/o CCS;PJ/yr;net electricity production from hard coal with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 2;energy (electricity);Secondary Energy|Electricity|Coal|Lignite;PJ/yr;Net electricity production from lignite (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 3;energy (electricity);Secondary Energy|Electricity|Coal|Lignite|w/ CCS;PJ/yr;net electricity production from lignite with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 3;energy (electricity);Secondary Energy|Electricity|Coal|Lignite|w/o CCS;PJ/yr;net electricity production from lignite with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
-1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Coal;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Gas;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Oil;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Fossil|w/ CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil used in combination with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Coal|+|w/ CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Fossil|w/ CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil used in combination with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|+|w/ CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Coal|+|w/o CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Oil|w/o CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|+|w/o CC;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Gas;PJ/yr;net electricity production from gas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Gas;EJ/yr;1000;;0;;R
+1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Coal;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Gas;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Fossil;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Oil;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Fossil|w/ CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil used in combination with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Coal|+|w/ CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Fossil|w/ CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil used in combination with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|+|w/ CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Coal|+|w/o CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Oil|w/o CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Fossil|w/o CCS;PJ/yr;net electricity production from coal, gas, conventional and unconventional oil without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|+|w/o CC;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Gas;PJ/yr;net electricity production from gas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Gas;EJ/yr;1000;;0;;Rx
 2;energy (electricity);Secondary Energy|Electricity|Gas|Efuel;PJ/yr;net electricity production from synthetic gas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 2;energy (electricity);Secondary Energy|Electricity|Gas|Natural Gas;PJ/yr;net electricity production from natural gas (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
-2;energy (electricity);Secondary Energy|Electricity|Gas|w/ CCS;PJ/yr;net electricity production from gas with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|+|w/ CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Gas|w/o CCS;PJ/yr;net electricity production from gas with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|+|w/o CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Gas|CC;PJ/yr;Net electricity production from gas Combined Cycle (CC) units (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|++|Combined Cycle w/ CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Gas|CC;PJ/yr;Net electricity production from gas Combined Cycle (CC) units (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|++|Combined Cycle w/o CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Gas|CC|w/ CCS;PJ/yr;Net electricity production from gas CC with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|++|Combined Cycle w/ CC;EJ/yr;1000;;0;;R
-2;energy (electricity);Secondary Energy|Electricity|Gas|CC|w/o CCS;PJ/yr;Net electricity production from gas CC without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Gas|++|Combined Cycle w/o CC;EJ/yr;1000;;0;;R
+2;energy (electricity);Secondary Energy|Electricity|Gas|w/ CCS;PJ/yr;net electricity production from gas with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|+|w/ CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Gas|w/o CCS;PJ/yr;net electricity production from gas with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|+|w/o CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Gas|CC;PJ/yr;Net electricity production from gas Combined Cycle (CC) units (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|++|Combined Cycle w/ CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Gas|CC;PJ/yr;Net electricity production from gas Combined Cycle (CC) units (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|++|Combined Cycle w/o CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Gas|CC|w/ CCS;PJ/yr;Net electricity production from gas CC with CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|++|Combined Cycle w/ CC;EJ/yr;1000;;0;;Rx
+2;energy (electricity);Secondary Energy|Electricity|Gas|CC|w/o CCS;PJ/yr;Net electricity production from gas CC without CCS (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Gas|++|Combined Cycle w/o CC;EJ/yr;1000;;0;;Rx
 2;energy (electricity);Secondary Energy|Electricity|Gas|OC;PJ/yr;Net electricity production from gas Open Cycle (OC) units. Includes low capital intensity existent technologies (steam turbines, combustion turbines and internal combustion) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 1;energy (electricity);Secondary Energy|Electricity|Geothermal;PJ/yr;net electricity production from all sources of geothermal energy (e.g., hydrothermal, enhanced geothermal systems) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Geothermal;EJ/yr;1000;;0;;R
 1;energy (electricity);Secondary Energy|Electricity|Hydro;PJ/yr;net hydroelectric production (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Hydro;EJ/yr;1000;;0;;R
 1;energy (electricity);Secondary Energy|Electricity|Non-Biomass Renewables;PJ/yr;net electricity production from hydro, wind, solar, geothermal, ocean, and other renewable sources (excluding bioenergy). This is a summary category for all the non-biomass renewables. (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Non-Biomass Renewables;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Nuclear;PJ/yr;net electricity production from nuclear energy (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Nuclear;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Oil;PJ/yr;net electricity production from refined liquid oil products (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Oil;EJ/yr;1000;;0;;R
+1;energy (electricity);Secondary Energy|Electricity|Nuclear;PJ/yr;net electricity production from nuclear energy (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Nuclear;EJ/yr;1000;;0;;Rx
+1;energy (electricity);Secondary Energy|Electricity|Oil;PJ/yr;net electricity production from refined liquid oil products (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Oil;EJ/yr;1000;;0;;Rx
 2;energy (electricity);Secondary Energy|Electricity|Oil|w/ CCS;PJ/yr;net electricity production from refined liquids with a CO2 capture component (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
-2;energy (electricity);Secondary Energy|Electricity|Oil|w/o CCS;PJ/yr;net electricity production from refined liquids with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Oil|w/o CC;EJ/yr;1000;;0;;R
+2;energy (electricity);Secondary Energy|Electricity|Oil|w/o CCS;PJ/yr;net electricity production from refined liquids with freely vented CO2 emissions (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|Oil|w/o CC;EJ/yr;1000;;0;;Rx
 1;energy (electricity);Secondary Energy|Electricity|Solar;PJ/yr;net electricity production from all sources of solar energy (e.g., PV and concentrating solar power) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Solar;EJ/yr;1000;;0;;R
 2;energy (electricity);Secondary Energy|Electricity|Solar|CSP;PJ/yr;net electricity production from concentrating solar power (CSP) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Solar|+|CSP;EJ/yr;1000;;0;;R
 2;energy (electricity);Secondary Energy|Electricity|Solar|PV;PJ/yr;net electricity production from solar photovoltaics (PV) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Solar|+|PV;EJ/yr;1000;;0;;R
@@ -1278,7 +1278,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 1;energy (electricity);Secondary Energy|Electricity|Wind;PJ/yr;net electricity production from wind energy (on- and offshore) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Wind;EJ/yr;1000;;0;;R
 1;energy (electricity);Secondary Energy|Electricity|Wind|Offshore;PJ/yr;net electricity production from offshore wind energy (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Wind|+|Offshore;EJ/yr;1000;;0;;R
 1;energy (electricity);Secondary Energy|Electricity|Wind|Onshore;PJ/yr;net electricity production from onshore wind energy (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|Wind|+|Onshore;EJ/yr;1000;;0;;R
-1;energy (electricity);Secondary Energy|Electricity|Hydrogen;PJ/yr;Net electricity production from hydrogen (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Electricity|+|Hydrogen;EJ/yr;1000;;0;;R
+1;energy (electricity);Secondary Energy|Electricity|Hydrogen;PJ/yr;Net electricity production from hydrogen (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);SE|Net|Electricity|+|Hydrogen;EJ/yr;1000;;0;;Rx
 2;energy (electricity);Secondary Energy|Electricity|Hydrogen|CC;PJ/yr;Net electricity production from hydrogen Combined Cycle (CC) units (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 2;energy (electricity);Secondary Energy|Electricity|Hydrogen|FC;PJ/yr;Net electricity production from hydrogen Fuel Cell (FC) units. (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
 2;energy (electricity);Secondary Energy|Electricity|Hydrogen|OC;PJ/yr;Net electricity production from hydrogen Open Cycle (OC) units. Includes low capital intensity existent technologies (steam turbines, combustion turbines and internal combustion) (net generation = gross generation minus the own electricity consumption of power stations, minus curtailment);;;;;0;;
@@ -1497,8 +1497,8 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Stock|Transportation|LDV|Two-Wheelers;million;Stock of two-wheelers;;;;;0;;
 3;energy (transport);Stock|Transportation|LDV|Midsize Car;million;Stock of midsize cars (US EPA);;;;;0;;
 3;energy (transport);Stock|Transportation|LDV|Large Car and SUV;million;Stock of large cars and SUVs (US EPA);;;;;0;;
-2;energy (transport);Stock|Transportation|Truck;million;Stock of trucks;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|ICE;million;Stock of trucks with internal combustion engine including hybrids and plug-in hybrids;;;;;0;;
+2;energy (transport);Stock|Transportation|Truck;million;Stock of trucks;Stock|Transport|Freight|Road;million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Truck|ICE;million;Stock of trucks with internal combustion engine including hybrids and plug-in hybrids;Stock|Transport|Freight|Road|Liquids;million veh;1;;0;;T
 3;energy (transport);Stock|Transportation|Truck|ICE|Truck (0-3.5t);million;Stock of internal-combustion engine trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|ICE|Truck (26t);million;Stock of internal-combustion engine trucks with weight 26t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|ICE|Truck (40t);million;Stock of internal-combustion engine trucks with weight 40t;;;;;0;;
@@ -1506,7 +1506,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Stock|Transportation|Truck|ICE|Truck (12t);million;Stock of internal-combustion engine trucks with weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|ICE|Truck (12t+);million;Stock of internal-combustion engine trucks with weight >12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|ICE|Tractor Truck;million;Stock of internal combustion engine tractor trucks;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|BEV;million;Stock of battery electric trucks;;;;;0;;
+3;energy (transport);Stock|Transportation|Truck|BEV;million;Stock of battery electric trucks;Stock|Transport|Freight|Road|BEV;million veh;1;;0;;T
 3;energy (transport);Stock|Transportation|Truck|BEV|Truck (0-3.5t);million;Stock of battery electric trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|BEV|Truck (26t);million;Stock of battery electric trucks with weight 26t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|BEV|Truck (40t);million;Stock of battery electric trucks with weight 40t;;;;;0;;
@@ -1514,7 +1514,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Stock|Transportation|Truck|BEV|Truck (12t);million;Stock of battery electric trucks with weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|BEV|Truck (12t+);million;Stock of battery electric trucks with weight >12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|BEV|Tractor Truck;million;Stock of battery electric tractor trucks;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|FCEV;million;Stock of fuel cell electric trucks;;;;;0;;
+3;energy (transport);Stock|Transportation|Truck|FCEV;million;Stock of fuel cell electric trucks;Stock|Transport|Freight|Road|FCEV;million veh;1;;0;;T
 3;energy (transport);Stock|Transportation|Truck|FCEV|Truck (0-3.5t);million;Stock of fuel-cell electric trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|FCEV|Truck (26t);million;Stock of fuel-cell electric trucks with weight 26t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|FCEV|Truck (40t);million;Stock of fuel-cell electric trucks with weight 40t;;;;;0;;
@@ -1541,17 +1541,17 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Stock|Transportation|Truck|Overhead Line|ICE|Truck (12t);million;Stock of overhead line trucks with additional internal combustion engine and weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|Overhead Line|ICE|Truck (12t+);million;Stock of overhead line trucks with additional internal combustion engine and weight >12t;;;;;0;;
 3;energy (transport);Stock|Transportation|Truck|Overhead Line|ICE|Tractor Truck;million;Stock of overhead line tractor trucks with additional internal combustion engine;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|Truck (0-3.5t);million;Stock of trucks with weight < 3.5t;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|Truck (26t);million;Stock of trucks with weight 26t;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|Truck (40t);million;Stock of trucks with weight 40t;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|Truck (7.5t);million;Stock of trucks with weight 3.5 - 7.5t;;;;;0;;
+3;energy (transport);Stock|Transportation|Truck|Truck (0-3.5t);million;Stock of trucks with weight < 3.5t;Stock|Transport|Freight|Road|Light|Truck(0-3_5t);million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Truck|Truck (26t);million;Stock of trucks with weight 26t;Stock|Transport|Freight|Road|Heavy|Truck(26t);million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Truck|Truck (40t);million;Stock of trucks with weight 40t;Stock|Transport|Freight|Road|Heavy|Truck(40t);million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Truck|Truck (7.5t);million;Stock of trucks with weight 3.5 - 7.5t;Stock|Transport|Freight|Road|Light|Truck(7_5t);million veh;1;;0;;T
 3;energy (transport);Stock|Transportation|Truck|Truck (12t);million;Stock of trucks with weight 7.5 - 12t;;;;;0;;
-3;energy (transport);Stock|Transportation|Truck|Truck (12t+);million;Stock of trucks with weight >12t;;;;;0;;
+3;energy (transport);Stock|Transportation|Truck|Truck (12t+);million;Stock of trucks with weight >12t;Stock|Transport|Freight|Road|Heavy|Truck(18t);million veh;1;;0;Ariadne and EDGE-T weight class not fully overlapping. Take closest category. ;T
 3;energy (transport);Stock|Transportation|Truck|Tractor Truck;million;Stock of tractor trucks;;;;;0;;
-2;energy (transport);Stock|Transportation|Bus;million;Stock of buses;;;;;0;;
-3;energy (transport);Stock|Transportation|Bus|ICE;million;Stock of buses with internal combustion engine including hybrids and plug-in hybrids;;;;;0;;
-3;energy (transport);Stock|Transportation|Bus|BEV;million;Stock of battery electric buses;;;;;0;;
-3;energy (transport);Stock|Transportation|Bus|FCEV;million;Stock of fuel cell electric buses;;;;;0;;
+2;energy (transport);Stock|Transportation|Bus;million;Stock of buses;Stock|Transport|Pass|Road|Bus;million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Bus|ICE;million;Stock of buses with internal combustion engine including hybrids and plug-in hybrids;Stock|Transport|Pass|Road|Bus|Liquids;million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Bus|BEV;million;Stock of battery electric buses;Stock|Transport|Pass|Road|Bus|BEV;million veh;1;;0;;T
+3;energy (transport);Stock|Transportation|Bus|FCEV;million;Stock of fuel cell electric buses;Stock|Transport|Pass|Road|Bus|FCEV;million veh;1;;0;;T
 2;energy (transport);Sales|Transportation|LDV;million;Sales of light duty vehicles;Sales|Transport|Pass|Road|LDV|Four Wheelers|Small|Subcompact Car|Liquids;million veh;1;;0;;T
 2;energy (transport);Sales|Transportation|LDV;million;Sales of light duty vehicles;Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Compact Car|Liquids;million veh;1;;0;;T
 2;energy (transport);Sales|Transportation|LDV;million;Sales of light duty vehicles;Sales|Transport|Pass|Road|LDV|Four Wheelers|Medium|Midsize Car|Liquids;million veh;1;;0;;T
@@ -1604,8 +1604,8 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Sales|Transportation|LDV|Two-Wheelers;million;Sales of two-wheelers;;;;;0;;
 3;energy (transport);Sales|Transportation|LDV|Midsize Car;million;Sales of midsize cars (US EPA);;;;;0;;
 3;energy (transport);Sales|Transportation|LDV|Large Car and SUV;million;Sales of large cars and SUVs (US EPA);;;;;0;;
-2;energy (transport);Sales|Transportation|Truck;million;Sales of heavy trucks;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|ICE;million;Sales of trucks with internal combustion engine including hybrids and plug-in hybrids;;;;;0;;
+2;energy (transport);Sales|Transportation|Truck;million;Sales of heavy trucks;Sales|Transport|Freight|Road;million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Truck|ICE;million;Sales of trucks with internal combustion engine including hybrids and plug-in hybrids;Sales|Transport|Freight|Road|Liquids;million veh;1;;0;;T
 3;energy (transport);Sales|Transportation|Truck|ICE|Truck (0-3.5t);million;Sales of internal-combustion engine trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|ICE|Truck (26t);million;Sales of internal-combustion engine trucks with weight 26t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|ICE|Truck (40t);million;Sales of internal-combustion engine trucks with weight 40t;;;;;0;;
@@ -1613,7 +1613,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Sales|Transportation|Truck|ICE|Truck (12t);million;Sales of internal-combustion engine trucks with weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|ICE|Truck (12t+);million;Sales of internal-combustion engine trucks with weight >12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|ICE|Tractor Truck;million;Sales of internal combustion engine tractor trucks;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|BEV;million;Sales of battery electric trucks;;;;;0;;
+3;energy (transport);Sales|Transportation|Truck|BEV;million;Sales of battery electric trucks;Sales|Transport|Freight|Road|BEV;million veh;1;;0;;T
 3;energy (transport);Sales|Transportation|Truck|BEV|Truck (0-3.5t);million;Sales of battery electric trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|BEV|Truck (26t);million;Sales of battery electric trucks with weight 26t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|BEV|Truck (40t);million;Sales of battery electric trucks with weight 40t;;;;;0;;
@@ -1621,7 +1621,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Sales|Transportation|Truck|BEV|Truck (12t);million;Sales of battery electric trucks with weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|BEV|Truck (12t+);million;Sales of battery electric trucks with weight >12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|BEV|Tractor Truck;million;Sales of battery electric tractor trucks;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|FCEV;million;Sales of fuel cell electric trucks;;;;;0;;
+3;energy (transport);Sales|Transportation|Truck|FCEV;million;Sales of fuel cell electric trucks;Sales|Transport|Freight|Road|FCEV;million veh;1;;0;;T
 3;energy (transport);Sales|Transportation|Truck|FCEV|Truck (0-3.5t);million;Sales of fuel-cell electric trucks with weight < 3.5t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|FCEV|Truck (26t);million;Sales of fuel-cell electric trucks with weight 26t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|FCEV|Truck (40t);million;Sales of fuel-cell electric trucks with weight 40t;;;;;0;;
@@ -1648,17 +1648,17 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 3;energy (transport);Sales|Transportation|Truck|Overhead Line|ICE|Truck (12t);million;Sales of overhead line trucks with additional internal combustion engine and weight 7.5 - 12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|Overhead Line|ICE|Truck (12t+);million;Sales of overhead line trucks with additional internal combustion engine and weight >12t;;;;;0;;
 3;energy (transport);Sales|Transportation|Truck|Overhead Line|ICE|Tractor Truck;million;Sales of overhead line tractor trucks with additional internal combustion engine;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|Truck (0-3.5t);million;Sales of trucks with weight < 3.5t;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|Truck (26t);million;Sales of trucks with weight 26t;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|Truck (40t);million;Sales of trucks with weight 40t;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|Truck (7.5t);million;Sales of trucks with weight 3.5 - 7.5t;;;;;0;;
+3;energy (transport);Sales|Transportation|Truck|Truck (0-3.5t);million;Sales of trucks with weight < 3.5t;Sales|Transport|Freight|Road|Light|Truck(0-3_5t);million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Truck|Truck (26t);million;Sales of trucks with weight 26t;Sales|Transport|Freight|Road|Heavy|Truck(26t);million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Truck|Truck (40t);million;Sales of trucks with weight 40t;Sales|Transport|Freight|Road|Heavy|Truck(40t);million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Truck|Truck (7.5t);million;Sales of trucks with weight 3.5 - 7.5t;Sales|Transport|Freight|Road|Light|Truck(7_5t);million veh;1;;0;;T
 3;energy (transport);Sales|Transportation|Truck|Truck (12t);million;Sales of trucks with weight 7.5 - 12t;;;;;0;;
-3;energy (transport);Sales|Transportation|Truck|Truck (12t+);million;Sales of trucks with weight >12t;;;;;0;;
+3;energy (transport);Sales|Transportation|Truck|Truck (12t+);million;Sales of trucks with weight >12t;Sales|Transport|Freight|Road|Heavy|Truck(18t);million veh;1;;0;;T
 3;energy (transport);Sales|Transportation|Truck|Tractor Truck;million;Sales of tractor trucks;;;;;0;;
-2;energy (transport);Sales|Transportation|Bus;million;Sales of heavy buses;;;;;0;;
-3;energy (transport);Sales|Transportation|Bus|ICE;million;Sales of buses with internal combustion engine including hybrids and plug-in hybrids;;;;;0;;
-3;energy (transport);Sales|Transportation|Bus|BEV;million;Sales of battery electric buses;;;;;0;;
-3;energy (transport);Sales|Transportation|Bus|FCEV;million;Sales of fuel cell electric buses;;;;;0;;
+2;energy (transport);Sales|Transportation|Bus;million;Sales of heavy buses;Sales|Transport|Pass|Road|Bus;million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Bus|ICE;million;Sales of buses with internal combustion engine including hybrids and plug-in hybrids;Sales|Transport|Pass|Road|Bus|Liquids;million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Bus|BEV;million;Sales of battery electric buses;Sales|Transport|Pass|Road|Bus|BEV;million veh;1;;0;;T
+3;energy (transport);Sales|Transportation|Bus|FCEV;million;Sales of fuel cell electric buses;Sales|Transport|Pass|Road|Bus|FCEV;million veh;1;;0;;T
 2;energy (supply);Trade|Primary Energy|Biomass|Volume;PJ/yr;net exports of solid, unprocessed biomass, at the global level these should add up to the trade losses only;Trade|Biomass;EJ/yr;1000;;0;;R
 2;energy (supply);Trade|Primary Energy|Coal|Volume;PJ/yr;net exports of coal, at the global level these should add up to the trade losses only;Trade|Coal;EJ/yr;1000;;0;;R
 2;energy (supply);Trade|Primary Energy|Gas|Volume;PJ/yr;net exports of natural gas, at the global level these should add up to the trade losses only;Trade|Gas;EJ/yr;1000;;0;;R
@@ -1908,38 +1908,38 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 1;energy (hydrogen);Investment|Energy Supply|Hydrogen;billion EUR2020/yr;Total investment spending for the production of hydrogen from all energy sources (fossil, biomass, electrolysis). For plants equipped with CCS, the investment in the capturing equipment should be included but not the one on transport and storage.;Energy Investments|Hydrogen;billion US$2017/yr;0.9534;;0;;R
 2;energy (supply);Investment|RnD|Energy Supply;billion EUR2020/yr;Total investment spending into research and development, energy supply sector;;;;;0;;
 1;energy (transport);Investment|Transportation;billion EUR2020/yr;Total investment spending into vehicle purchases, infrastructure and charging infrastructure in the transport sector (sum of all total investment/consumption spending variables in the transport sector);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation;billion EUR2020/yr;Total investment spending into vehicle purchases in the transport sector (sum of all total investment/consumption spending variables in the transport sector);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|LDV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation;billion EUR2020/yr;Total investment spending into vehicle purchases in the transport sector (sum of all total investment/consumption spending variables in the transport sector);Annualized fleet investments|Transport;billion US$2017/yr;0.9534;;0;;R
+1;energy (transport);Investment|Energy Demand|Transportation|LDV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks);Annualized fleet investments|Transport|Pass|Road|LDV;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|LDV|Additional;billion EUR2020/yr;Additional investment spending for climate friendly technologies compared to the alternative fossil technology (e-car versus ICE, hybrid versus ICE, and fuel cell versus ICE) through new vehicle purchases in the transport sector (light-duty cars and trucks);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|LDV|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: internal combustion engine technologies running on any type of liquid or gaseous fuel including mild hybrids and excluding plug-in hybrids);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|LDV|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: electric vehicle technologies, only all-electrics);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|LDV|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: internal combustion engine technologies running on any type of liquid or gaseous fuel including mild hybrids and excluding plug-in hybrids);Annualized fleet investments|Transport|Pass|Road|LDV|Liquids;billion US$2017/yr;0.9534;;0;;R
+1;energy (transport);Investment|Energy Demand|Transportation|LDV|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: electric vehicle technologies, only all-electrics);Annualized fleet investments|Transport|Pass|Road|LDV|BEV;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|LDV|BEV|Additional;billion EUR2020/yr;Additional investment spending for e-cars compared to the alternative ICE technology through new vehicle purchases in the transport sector (light-duty cars and trucks: electric vehicle technologies, only all-electrics);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|LDV|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|LDV|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: fuel cell technologies running on hydrogen or another type of fuel);Annualized fleet investments|Transport|Pass|Road|LDV|FCEV;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|LDV|FCEV|Additional;billion EUR2020/yr;Additional investment spending for FCEV-cars compared to the alternative ICE technology through new vehicle purchases in the transport sector (light-duty cars and trucks: fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|LDV|PHEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|LDV|PHEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (light-duty cars and trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);Annualized fleet investments|Transport|Pass|Road|LDV|Hybrid electric;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|LDV|PHEV|Additional;billion EUR2020/yr;Additional investment spending for PHEV-cars compared to the alternative ICE technology through new vehicle purchases in the transport sector (light-duty cars and trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Bus;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, any type of engine and fuels);;;;;0;;
+2;energy (transport);Investment|Energy Demand|Transportation|Bus;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, any type of engine and fuels);Annualized fleet investments|Transport|Pass|Road|Bus;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|Bus|Additional;billion EUR2020/yr;Additional investment spending for climate friendly bus technologies compared the the fossil alternative (ICE);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Bus|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, internal combustion engine technologies running on any type of liquid or gaseous fuel including mild hybrids and excluding plug-in hybrids);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Bus|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, electric vehicle technologies, only all-electrics);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Bus|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Rail;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (rail);;;;;0;;
+2;energy (transport);Investment|Energy Demand|Transportation|Bus|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, internal combustion engine technologies running on any type of liquid or gaseous fuel including mild hybrids and excluding plug-in hybrids);Annualized fleet investments|Transport|Pass|Road|Bus|Liquids;billion US$2017/yr;0.9534;;0;;R
+2;energy (transport);Investment|Energy Demand|Transportation|Bus|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, electric vehicle technologies, only all-electrics);Annualized fleet investments|Transport|Pass|Road|Bus|BEV;billion US$2017/yr;0.9534;;0;;R
+2;energy (transport);Investment|Energy Demand|Transportation|Bus|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (buses, fuel cell technologies running on hydrogen or another type of fuel);Annualized fleet investments|Transport|Pass|Road|Bus|FCEV;billion US$2017/yr;0.9534;;0;;R
+2;energy (transport);Investment|Energy Demand|Transportation|Rail;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (rail);Annualized fleet investments|Transport|Pass|Rail;billion US$2017/yr;0.9534;;0;;R
 2;energy (transport);Investment|Energy Demand|Transportation|Rail|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (rail, internal combustion engine technologies running on any type of liquid or gaseous fuel including mild hybrids and excluding plug-in hybrids);;;;;0;;
 2;energy (transport);Investment|Energy Demand|Transportation|Rail|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (rail, electric vehicle technologies, only all-electrics);;;;;0;;
 2;energy (transport);Investment|Energy Demand|Transportation|Rail|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (rail, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|Truck;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|Truck;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks);Annualized fleet investments|Transport|Freight|Road;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|Additional;billion EUR2020/yr;Additional investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks) for climate friendly trucks compared the the fossil alternative (ICE);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|Truck|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|Truck|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: electric vehicle technologies, only all-electrics);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|Truck|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);Annualized fleet investments|Transport|Freight|Road|Liquids;billion US$2017/yr;0.9534;;0;;R
+1;energy (transport);Investment|Energy Demand|Transportation|Truck|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: electric vehicle technologies, only all-electrics);Annualized fleet investments|Transport|Freight|Road|BEV;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|BEV|Additional;billion EUR2020/yr;Additional investment spending for e-trucks compared to the alternative ICE technology through new vehicle purchases in the transport sector (heavy-duty freight trucks: electric vehicle technologies, only all-electrics);;;;;0;;
-1;energy (transport);Investment|Energy Demand|Transportation|Truck|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
+1;energy (transport);Investment|Energy Demand|Transportation|Truck|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: fuel cell technologies running on hydrogen or another type of fuel);Annualized fleet investments|Transport|Freight|Road|FCEV;billion US$2017/yr;0.9534;;0;;R
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|FCEV|Additional;billion EUR2020/yr;Additional investment spending for FCEV-trucks compared to the alternative ICE technology spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|PHEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);;;;;0;;
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|PHEV|Additional;billion EUR2020/yr;Additional investment spending for PHEV-trucks compared to the alternative ICE technology spending through new vehicle purchases in the transport sector (heavy-duty freight trucks: plug-in hybrids with internal combustion engine running on any type of liquid or gaseous fuel);;;;;0;;
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks using overhead line technology: electric vehicle technologies, only all-electrics);;;;;0;;
 1;energy (transport);Investment|Energy Demand|Transportation|Truck|Overhead Line|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (heavy-duty freight trucks using overhead line technology: internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;;
 2;energy (transport);Investment|Energy Demand|Transportation|Other;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (other, like bicycles, e-scooter, …);;;;;0;;
-2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation);;;;;0;;
+2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation);Annualized fleet investments|Transport|Freight|Domestic Shipping;billion US$2017/yr;0.9534;;0;;R
 2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation|ICE;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation, internal combustion engine technologies running on any type of liquid or gaseous fuel, including mild hybrids and excluding plug-in hybrids);;;;;0;;
 2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation|BEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation, electric vehicle technologies, only all-electrics);;;;;0;;
 2;energy (transport);Investment|Energy Demand|Transportation|Domestic Navigation|FCEV;billion EUR2020/yr;Total investment spending through new vehicle purchases in the transport sector (domestic navigation, fuel cell technologies running on hydrogen or another type of fuel);;;;;0;;
@@ -2034,7 +2034,7 @@ Tier;Category;variable;unit;Definition;piam_variable;piam_unit;piam_factor;Comme
 2;policy;Price|Carbon|EU-wide Regulation Non-ETS;EUR2020/t CO2;Price of carbon implied by EU-wide Non-ETS sector target;;;;;0;;
 2;policy;Price|Carbon|National Climate Target;EUR2020/t CO2;Price of carbon due to national policies for all sectors - either from a direct carbon price, or as result of a national climate target;;;;;0;;
 2;policy;Price|Carbon|National Climate Target Non-ETS;EUR2020/t CO2;Price of carbon due to national policies for the non-ETS sectors - either from a direct carbon price, or as result of a national climate target for these sectors;;;;;0;;
-1;economy;Cost|Total Energy System Cost;billion EUR2020/yr;total energy system cost;;;;;0;;
+1;economy;Cost|Total Energy System Cost;billion EUR2020/yr;total energy system cost;Energy system costs;billion US$2017/yr;0.9534;;0;;R
 1;economy;Cost|Energy Service|Transportation|Passenger;EUR2020/Pkm;average/specific transportation cost per pkm;;;;;0;;
 1;economy;Cost|Energy Service|Transportation|Freight;EUR2020/tkm;average/specific transportation cost per tkm;;;;;0;;
 1;economy;Cost|Energy Service|Residential and Commercial|Heating;EUR2020/m2/yr;average/specific heating cost per heated floor m2;;;;;0;;