diff --git a/definitions/variable/emissions/emissions.yaml b/definitions/variable/emissions/emissions.yaml
index 9dc73398..0e793888 100644
--- a/definitions/variable/emissions/emissions.yaml
+++ b/definitions/variable/emissions/emissions.yaml
@@ -343,6 +343,10 @@
     description: Emissions of carbon dioxide (CO2) from energy demand in the {Non-Energy Sector}
     unit: Mt CO2/yr
     tier: 2
+    # Only if `Non-Energy Sector` == "Iron and Steel"
+    navigate: Emissions|CO2|Energy|Demand|Industry|Steel
+    ngfs5: Emissions|CO2|Energy|Demand|Industry|Steel
+    shape: Emissions|CO2|Energy|Demand|Industry|Steel
 - Emissions|{Level-2 Species}|Energy|Demand|Residential and Commercial and AFOFI:
     description: Emissions of {Level-2 Species} from fuel combustion in residential,
       commercial and institutional sectors (IPCC category 1A4a and 1A4b)
@@ -426,11 +430,17 @@
       (IPCC categories 1A2, 1A5, 2A, 2B, 2C, 2E) in the {Non-Energy Sector}
     unit: "{Level-3 Species}"
     tier: 2
+    navigate: Emissions|{Level-3 Species}|Industrial Processes|{Non-Energy Sector}
+    # Only if `Non-Energy Sector` == "Iron and Steel"
+    ngfs5: Emissions|{Level-3 Species}|Steel
+    shape: Emissions|{Level-3 Species}|Industrial Processes|{Non-Energy Sector}
 - Emissions|{Level-3 Species}|Industrial Processes|{Industrial-Process Sector}:
     description: Emissions of {Level-3 Species} from industrial processes
       (IPCC categories 1A2, 1A5, 2A, 2B, 2C, 2E) in the {Industrial-Process Sector}
     unit: "{Level-3 Species}"
     tier: 2
+    # Only when `Industrial-Process Sector` == "Cement"
+    navigate: Emissions|{Level-3 Species}|Industrial Processes|Non-Metallic Minerals|Cement
 
 - Emissions|{Level-3 Species}|Product Use:
     description: Emissions of {Level-3 Species} from product use (IPCC category 2D, 2F
diff --git a/definitions/variable/energy/final-energy.yaml b/definitions/variable/energy/final-energy.yaml
index c7f26d0a..c3333c47 100644
--- a/definitions/variable/energy/final-energy.yaml
+++ b/definitions/variable/energy/final-energy.yaml
@@ -82,6 +82,8 @@
     description: Final energy consumption by the {Sector}
     unit: EJ/yr
     tier: 1
+    # Only when `Sector` == "Industry|Iron and Steel"
+    ngfs_phase_5: Final Energy|Industry|Steel
 - Final Energy|{Sector}|Electricity:
     description: Final energy consumption by the {Sector} of electricity
     unit: EJ/yr
@@ -90,6 +92,8 @@
     description: Final energy consumption by the {Sector} of {Secondary Fuel Level 2}
     unit: EJ/yr
     tier: 1
+    # Only when `Sector` == "Industry|Iron and Steel" and `Secondary Fuel Level 2` == "Solids|Coal"
+    ngfs_phase_5: Final Energy|Industry|Steel|Solids|Fossil
 - Final Energy|{Sector}|Other:
     description: Final energy consumption by the {Sector} of other energy sources
     unit: EJ/yr
diff --git a/definitions/variable/industry/production.yaml b/definitions/variable/industry/production.yaml
index 839d353d..c1f7f9b3 100644
--- a/definitions/variable/industry/production.yaml
+++ b/definitions/variable/industry/production.yaml
@@ -10,6 +10,7 @@
     navigate: Production|Iron and Steel|{Iron Commodity}|Volume
     engage: Production|Iron and Steel|{Iron Commodity}|Volume
     ngfs5: Production|{Iron Commodity}
+    shape: Production|{Iron Commodity}
 
 - Production|Non-Metallic Minerals:
     description: Production of Non-Metallic Minerals
@@ -23,6 +24,8 @@
     navigate: Production|Non-Metallic Minerals|{Non-Metallic Minerals Commodity}|Volume
     engage: Production|Non-Metallic Minerals|{Non-Metallic Minerals Commodity}|Volume
     ngfs5: Production|{Non-Metallic Minerals Commodity}
+    # Is this needed? The variable seems to be already imported successfully.
+    shape: Production|Non-Metallic Minerals|{Non-Metallic Minerals Commodity}|Volume
 
 - Production|Non-Ferrous Metals|{Non-Ferrous Metals Commodity}:
     description: Production of {Non-Ferrous Metals Commodity}
diff --git a/definitions/variable/transport/energy-services.yaml b/definitions/variable/transport/energy-services.yaml
index 13566adb..01082f4d 100644
--- a/definitions/variable/transport/energy-services.yaml
+++ b/definitions/variable/transport/energy-services.yaml
@@ -2,13 +2,21 @@
     description: Energy service demand for passenger transport on roads in light duty vehicles
     unit: billion pkm/yr
     tier: 2
-    navigate: Energy Service|Transportation|Road|LDV
+    navigate: Energy Service|Transportation|Passenger|Road|LDV
+    ngfs5: Energy Service|Transportation|Passenger|Road|LDV
+    shape: Energy Service|Transportation|Passenger|Road|LDV
 - Energy Service|Transportation|Passenger|Road|Light-Duty Vehicle|{Drive Type}:
     description: Energy service demand for passenger transport on roads in light duty vehicles
       with {Drive Type}
     unit: billion pkm/yr
     tier: 2
     navigate: Energy Service|Transportation|Road|LDV|{Drive Type}
+- Energy Service|Transportation|Passenger|Aviation:
+    description: Energy service demand for passenger transport on through aviation
+    unit: billion pkm/yr
+    tier: 2
+    navigate: Energy Service|Bunkers|Passenger|International Aviation
+    ngfs5: Energy Service|Transportation|Passenger|Aviation
 - Energy Service|Transportation|Freight|Truck:
     description: Energy service demand for freight transport on roads in trucks
     unit: billion tkm/yr
@@ -19,3 +27,14 @@
     unit: billion tkm/yr
     tier: 2
     navigate: Energy Service|Transportation|Freight|Truck|{Drive Type}
+- Energy Service|Transportation|Freight|International Aviation:
+    description: Energy service demand for freight transport through international aviation
+    unit: billion tkm/yr
+    tier: 2
+    navigate: Energy Service|Bunkers|Freight|International Aviation
+- Energy Service|Transportation|Freight|International Shipping:
+    description: Energy service demand for freight transport through international shipping
+    unit: billion tkm/yr
+    tier: 2
+    navigate: Energy Service|Bunkers|Freight|International Shipping
+    ngfs5: Energy Service|Transportation|Freight|International Shipping
diff --git a/definitions/variable/transport/stocks-sales.yaml b/definitions/variable/transport/stocks-sales.yaml
index 7f4ff5ba..6b41b5f0 100644
--- a/definitions/variable/transport/stocks-sales.yaml
+++ b/definitions/variable/transport/stocks-sales.yaml
@@ -2,6 +2,8 @@
     description: Number of sold {Vehicle Type}
     unit: million
     tier: 2
+    # Only if `Vehicle Type` == Light-Duty Vehicle
+    ngfs5: Transport|Stock|Road|Passenger|LDV
 - Sales|Transportation|{Vehicle Type}|{Drive Type}:
     description: Number of sold {Vehicle Type} with {Drive Type}
     unit: million