diff --git a/nomenclature/definitions/variable/emissions/emissions.yaml b/nomenclature/definitions/variable/emissions/emissions.yaml
index 4f74d5d6..2a38bcf1 100644
--- a/nomenclature/definitions/variable/emissions/emissions.yaml
+++ b/nomenclature/definitions/variable/emissions/emissions.yaml
@@ -419,6 +419,43 @@ Emissions|CO2|Industrial Processes:
 Emissions|CO2|Other:
    description: CO2 emissions from other sources
    unit: Mt CO2/yr
+   
+
+Emissions|CO2|Energy:
+   description: CO2 emissions from energy use on supply and demand side (IPCC
+                category 1A, 1B)
+   unit: Mt CO2/yr
+   
+
+Emissions|CO2|Heat|Residential and Commercial:
+   description: CO2 emissions from energy use from supply technologies for residential
+                and commercial heating
+   unit: Mt CO2/yr
+   
+Emissions|CO2|Heat|Residential and Commercial|<Fuel>:
+   description: CO2 emissions from energy use from <this fuel> for residential
+                and commercial heating
+   unit: Mt CO2/yr
+
+Emissions|CO2|Heat|Industrial:
+   description: CO2 emissions from energy use from supply technologies for industrial
+                heating
+   unit: Mt CO2/yr
+   
+Emissions|CO2|Heat|Industrial|<Fuel>:
+   description: CO2 emissions from energy use from <this fuel> for industrial
+                heating
+   unit: Mt CO2/yr
+
+Emissions|CO2|Electricity:
+   description: CO2 emissions from energy use from supply technologies for power
+                generation
+   unit: Mt CO2/yr
+
+Emissions|CO2|Electricity|<Fuel>:
+   description: CO2 emissions from energy use from <this fuel> for power
+                generation
+   unit: Mt CO2/yr
 
 Emissions|CO:
    description: Total carbon monoxide (CO) emissions
diff --git a/nomenclature/definitions/variable/energy/energy-final.yaml b/nomenclature/definitions/variable/energy/energy-final.yaml
index 21ecf18e..f89b29e2 100644
--- a/nomenclature/definitions/variable/energy/energy-final.yaml
+++ b/nomenclature/definitions/variable/energy/energy-final.yaml
@@ -501,6 +501,13 @@ Final Energy|Electricity|Other (excl. Heat, Cooling, Transport):
    sector: all
    energy use: all excl.heating, cooling, transportation               
    unit: GWh/yr
+   
+Final Energy|Electricity|Total (excl. Heat and Transport):
+   description: Final electricity consumption for non heating, non e-transport uses, 
+   energy source: electricity
+   sector: all
+   energy use: all excl.heating, transportation               
+   unit: GWh/yr
 
 Final Energy|Electricity|Profile:
    description: Time series of Final electricity consumption profiles. 
diff --git a/nomenclature/definitions/variable/technology/power-plant.yaml b/nomenclature/definitions/variable/technology/power-plant.yaml
index 9c8db1b4..be38b00a 100644
--- a/nomenclature/definitions/variable/technology/power-plant.yaml
+++ b/nomenclature/definitions/variable/technology/power-plant.yaml
@@ -193,19 +193,43 @@ Initial Storage Level|Electricity|Energy Storage System:
    unit: [MWh, GWh]
 
 Maximum Charge|Electricity|Energy Storage System:
-   description: Maximum charge when storing energy the energy storage system unit.
+   description: Maximum charge when storing energy in the energy storage system unit.
    unit: [MW, GW]
 
 Maximum Discharge|Electricity|Energy Storage System:
    description: Maximum discharge when consuming energy from the energy storage system unit.
    unit: [MW, GW]
 
+Maximum Charge|Electricity|Energy Storage System|Lithium-Ion:
+   description: Maximum charge when storing energy in the Lithium-Ion Batteries systems.
+   unit: GW
+
+Maximum Discharge|Electricity|Energy Storage System|Lithium-Ion:
+   description: Maximum discharge when consuming energy from the Lithium-Ion Batteries systems.
+   unit: GW
+   
+Maximum Charge|Electricity|Energy Storage System|Redox Flow:
+   description: Maximum charge when storing energy in the Redox Flow Batteries systems.
+   unit: GW
+
+Maximum Discharge|Electricity|Energy Storage System|Redox Flow:
+   description: Maximum discharge when consuming energy from the Redox Flow Batteries systems.
+   unit: GW
+   
+Maximum Charge|Electricity|Energy Storage System|Compressed Air:
+   description: Maximum charge when storing energy in the Compressed air energy storages systems.
+   unit: GW
+
+Maximum Discharge|Electricity|Energy Storage System|Compressed Air:
+   description: Maximum discharge when consuming energy from the Compressed air energy storages systems.
+   unit: GW
+
 Maximum Storage|Electricity|Energy Storage System:
-   description: Maximum energy that can be stored by the energy storage systems.
+   description: Maximum energy that can be stored in the energy storage system unit.
    unit: [MWh, GWh]
    
 Maximum Storage|Electricity|Energy Storage System|Lithium-Ion:
-   description: Maximum energy that can be stored by the Lithium Iron Batteries systems.
+   description: Maximum energy that can be stored by the Lithium-Ion Batteries systems.
    unit: [MWh, GWh]
 
 Maximum Storage|Electricity|Energy Storage System|Redox Flow:
@@ -215,6 +239,18 @@ Maximum Storage|Electricity|Energy Storage System|Redox Flow:
 Maximum Storage|Electricity|Energy Storage System|Compressed Air:
    description: Maximum energy that can be stored by the Compressed air energy storages systems.
    unit: [MWh, GWh]
+   
+Roundtrip Efficiency|Electricity|Energy Storage System|Lithium-Ion:
+   description: Roundtrip efficiency for the Lithium-Ion Batteries systems.
+   unit: '%'
+
+Roundtrip Efficiency|Electricity|Energy Storage System|Redox Flow:
+   description: Roundtrip efficiency for the Redox Flow Batteries systems.
+   unit: '%'
+
+Roundtrip Efficiency|Electricity|Energy Storage System|Compressed Air:
+   description: Roundtrip efficiency for the Compressed air energy storages systems.
+   unit: '%'   
 
 Minimum Storage|Electricity|Energy Storage System:
    description: Minimum energy that can be stored by the energy storage system unit.