diff --git a/definitions/variable/afolu/agriculture.yaml b/definitions/variable/afolu/agriculture.yaml
index d0f02559..851274bd 100644
--- a/definitions/variable/afolu/agriculture.yaml
+++ b/definitions/variable/afolu/agriculture.yaml
@@ -1,156 +1,309 @@
+### Agricultural Demand
 - Agricultural Demand:
     description: Total demand for food, non-food and feed products (crops and livestock)
       and bioenergy crops (1st & 2nd generation)
     unit: million t DM/yr
     agmip: Domestic use (CONS)
-    tier: 2
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Crops:
     description: Demand for crops including food, feed products and bioenergy
       (1st & 2nd generation crops)
     unit: million t DM/yr
     agmip: Domestic use (CONS) - Crops (CRP)
-    tier: 2
-- Agricultural Demand|Crops|Food:
-    description: Demand for food crops
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Bioenergy:
+    description: Demand for bioenergy crops (1st & 2nd generation)
     unit: million t DM/yr
-    agmip: Food demand (FOOD) - Crops (CRP)
-    tier: 3
-- Agricultural Demand|Crops|Food|{Cereal and Non-Energy Crop Types}:
-    description: Demand for food from {Cereal and Non-Energy Crop Types}
+    agmip:
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Bioenergy|1st Generation:
+    description: Demand for 1st generation bioenergy crops (sugar, starch and oil crops)
     unit: million t DM/yr
     agmip:
-    tier: 4
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Bioenergy|2nd generation:
+    description: Demand for second-generation bioenergy crops 
+      (short rotation grasses, short rotation trees)
+    unit: million t DM/yr
+    agmip: Domestic use (CONS) - Energy Crops (ECP)
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Crops|Feed:
     description: Demand for feed crops
     unit: million t DM/yr
     agmip: Feed demand (FEED) - Crops (CRP)
-    tier: 3
-- Agricultural Demand|Crops|Feed|{Cereal and Non-Energy Crop Types}:
-    description: Demand for feed from {Cereal and Non-Energy Crop Types}
-    unit: million t DM/yr
-    agmip:
-    tier: 4
-- Agricultural Demand|Crops|Bioenergy:
-    description: Demand for bioenergy crops (1st & 2nd generation)
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Feed|{Crop Types w/o Energy Crops}:
+    description: Demand for feed crops - {Crop Types w/o Energy Crops}
     unit: million t DM/yr
     agmip:
     tier: 3
-- Agricultural Demand|Crops|Bioenergy|1st Generation:
-    description: Demand for 1st generation bioenergy crops (sugar, starch and oil crops)
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Food:
+    description: Demand for food crops
     unit: million t DM/yr
-    agmip:
-    tier: 3
-- Agricultural Demand|Crops|Bioenergy|2nd generation:
-    description: Demand for second-generation bioenergy crops (short rotation grasses, short rotation trees)
+    agmip: Food demand (FOOD) - Crops (CRP)
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Crops|Food|{Crop Types w/o Energy Crops}:
+    description: Demand for food crops - {Crop Types w/o Energy Crops}
     unit: million t DM/yr
-    agmip: Domestic use (CONS) - Energy Crops (ECP)
+    agmip:
     tier: 3
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Crops|Other:
-    description: Demand of crops for other uses
+    description: Demand for crops for other uses
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Livestock:
-    description: Demand for livestock products
+    description: Demand for livestock products (excluding fish)
     unit: million t DM/yr
     agmip: Domestic use (CONS) - LSP
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Livestock|Feed:
+    description: Demand for livestock products used as feed (excluding fish)
+    unit: million t DM/yr
+    agmip:
     tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Livestock|Food:
-    description: Demand for livestock products used as food
+    description: Demand for livestock products used as food (excluding fish)
     unit: million t DM/yr
     agmip: Food demand (FOOD) - Livestock (LSP)
-    tier: 3
-- Agricultural Demand|Livestock|Food|Dairy:
-    description: Demand for livestock products used as food from dairy (milk and eggs)
-    unit: million t DM/yr
-    agmip: Food demand (FOOD) - Dairy (DRY)
-    tier: 4
-- Agricultural Demand|Livestock|Food|Ruminant:
-    description: Demand for livestock products used as food from ruminants
-    unit: million t DM/yr
-    agmip: Food demand (FOOD) - Ruminant (RUM)
-    tier: 4
-- Agricultural Demand|Livestock|Food|Non-Ruminant:
-    description: Demand for livestock products used as food from monogastrics and poultry
-    unit: million t DM/yr
-    agmip: Food demand (FOOD) - Non-Ruminant (NRM)
-    tier: 4
-- Agricultural Demand|Livestock|Feed:
-    description: Demand for livestock products used as feed
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
+- Agricultural Demand|Livestock|Food|{Livestock Products}:
+    description: Demand for livestock products used as food - {Livestock Products}
     unit: million t DM/yr
     agmip:
     tier: 3
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Livestock|Other:
     description: Demand for livestock products for other uses
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Residues:
     description: Demand for residues from agricultural production for feed, bioenergy and
       other uses
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Residues|Feed:
     description: Demand for residues as feed
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Residues|Bioenergy:
     description: Demand for residues as bioenergy
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 - Agricultural Demand|Residues|Other:
     description: Demand of residues for other uses
     unit: million t DM/yr
     agmip:
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Demand
 
+### Agricultural Production
 - Agricultural Production:
-    description: Total production of food, non-food and feed products (crops and livestock)
-      and bioenergy crops (1st & 2nd generation)
+    description: Total production of food, non-food and feed products 
+      (crops and livestock) and bioenergy crops (1st & 2nd generation)
     unit: million t DM/yr
     agmip: Production (PROD)
-    tier: 2
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Production
 - Agricultural Production|Crops:
     description: Production of crops
     unit: million t DM/yr
     agmip: Production (PROD) - All crops (CRP)
-    tier: 2
-- Agricultural Production|Crops|{Cereal and Non-Energy Crop Types}:
-    description: Production of {Cereal and Non-Energy Crop Types}
-    unit: million t DM/yr
-    agmip:
-    tier: 3
-- Agricultural Production|Crops|Energy Crops:
-    description: Production of purpose-grown bioenergy crops
-      (short-rotation grasses and trees)
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Production
+- Agricultural Production|Crops|{Crop Types}:
+    description: Production of {Crop Types}
     unit: million t DM/yr
-    agmip: Production (PROD) - Energy crops (ECP)
     tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Production
 - Agricultural Production|Livestock:
-    description: Production of livestock products
+    description: Production of livestock products (excluding fish)
     unit: million t DM/yr
     agmip: Production (PROD) - Livestock (LSP)
-    tier: 2
-- Agricultural Production|Livestock|Dairy:
-    description: Production of dairy livestock products
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Production
+- Agricultural Production|Livestock|{Livestock Products}:
+    description: Production of {Livestock Products}
     unit: million t DM/yr
     agmip: Production (PROD) - Dairy (DRY)
-    tier: 3
-- Agricultural Production|Livestock|Ruminant:
-    description: Production of livestock products from ruminants
-    unit: million t DM/yr
-    agmip: Production (PROD) - Ruminant (RUM)
-    tier: 3
-- Agricultural Production|Livestock|Non-Ruminant:
-    description: Production of livestock products from monogastrics and poultry
-    unit: million t DM/yr
-    agmip: Production (PROD) - Non-Ruminant (NRM)
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Production
 - Agricultural Production|Residues:
     description: Production of agricultural residues
     unit: million t DM/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Production
+
+### Agricultural Trade
+- Agricultural Trade:
+    description: Net export of food, non-food and feed products 
+      (crops and livestock) and bioenergy crops (1st & 2nd generation)
+    unit: million t DM/yr
+    agmip: Production (PROD)
+    tier: 2
+    domain: AFOLU
+    subsubdomain: Agricultural Trade
+- Agricultural Trade|Crops:
+    description: Net export of crops
+    unit: million t DM/yr
+    agmip: Production (PROD) - All crops (CRP)
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Trade
+- Agricultural Trade|Crops|{Crop Types}:
+    description: Net export of {Crop Types}
+    unit: million t DM/yr
     agmip:
     tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Trade
+- Agricultural Trade|Livestock:
+    description: Net export of livestock products (excluding fish)
+    unit: million t DM/yr
+    agmip: Production (PROD) - Livestock (LSP)
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Trade
+- Agricultural Trade|Livestock|{Livestock Products}:
+    description: Net export of {Livestock Products}
+    unit: million t DM/yr
+    agmip: Production (PROD) - Dairy (DRY)
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Trade
+- Agricultural Trade|Residues:
+    description: Net export of agricultural residues
+    unit: million t DM/yr
+    agmip:
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Trade
+
+### Crop Yields
+- Yield|Cropland|{Crop Types}:
+    description: Yield of cropland with {Crop Types}
+    unit: t DM/ha/yr
+    weight: Land Cover|Cropland
+    tier: 2
+    domain: AFOLU
+    subdomain: Crop Yields
+
+### Fertilizer Use -> see sdg-indicators for nitrogen fertilizer use (Nitrogen|Cropland Budget|Inputs)
+- Fertilizer Use|Phosphorus:
+    description: Phosphorus fertilizer use on cropland (synthetic and organic)
+    unit: Tg P/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Cropland Input
+
+### Agricultural Prices
+- Price|Agriculture|Food Products [Index]:
+    description: Farm-gate price index of food crops and livestock products (weighted average)
+    unit: Index (2020 = 1)
+    weight: Agricultural Production
+    navigate: Price|Agriculture|Non-Energy Crops and Livestock|Index
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Livestock [Index]:
+    description: Farm-gate price index of livestock products (weighted average)
+    sdg: 2
+    weight: Agricultural Production|Livestock
+    unit: Index (2020 = 1)
+    shape: Price|Agriculture|Livestock|Index
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Crops [Index]:
+    description: Farm-gate price index of food crops (weighted average)
+    unit: Index (2020 = 1)
+    weight: Agricultural Production|Crops
+    navigate: Price|Agriculture|Non-Energy Crops|Index
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Crops|Corn [Index]:
+    description: Farm-gate price index of corn / maize
+    unit: Index (2020 = 1)
+    weight: Agricultural Production|Crops
+    navigate: Price|Agriculture|Corn|Index
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Crops|Soybean [Index]:
+    description: Farm-gate price index of soybean
+    unit: Index (2020 = 1)
+    weight: Agricultural Production|Crops
+    navigate: Price|Agriculture|Soybean|Index
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Crops|Wheat [Index]:
+    description: Farm-gate price index of wheat
+    unit: Index (2020 = 1)
+    weight: Agricultural Production|Crops
+    navigate: Price|Agriculture|Wheat|Index
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Food Products|Crops|Rice [Index]:
+    description: Farm-gate price index of rice
+    unit: Index (2020 = 1)
+    weight: Agricultural Production|Crops
+    tier: 2
+    domain: AFOLU
+    subdomain: Agricultural Prices
+- Price|Agriculture|Energy crops:
+    description: Farm-gate price of second-generation bioenergy crops 
+      (short rotation grasses, short rotation trees)
+    unit: USD_2010/GJ
+    weight: Agricultural Production|Crops|Energy Crops
+    tier: 1
+    domain: AFOLU
+    subdomain: Agricultural Prices
diff --git a/definitions/variable/afolu/food.yaml b/definitions/variable/afolu/food.yaml
deleted file mode 100644
index 95380454..00000000
--- a/definitions/variable/afolu/food.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- Food Demand [per capita]:
-    description: Total food demand per capita in calories
-    unit: kcal/cap/day
-    weight: Population
-    sdg: 2
-    shape: Food|Intake
-- Food Demand|Crops [per capita]:
-    description: Food demand per capita in calories satisfied by crops
-    unit: kcal/cap/day
-    weight: Population
-    sdg: 2
-    agmip: p.c. calory intake (CALI) - All crops (CRP)
-    shape: Food|Intake|Crops
-- Food Demand|Livestock [per capita]:
-    description: Food demand per capita in calories satisfied by livestock
-    unit: kcal/cap/day
-    weight: Population
-    sdg: 2
-    agmip: p.c. calory intake (CALI) - Livestock (LSP)
-    shape: Food|Intake|Livestock
diff --git a/definitions/variable/afolu/food_system.yaml b/definitions/variable/afolu/food_system.yaml
new file mode 100644
index 00000000..b91ae493
--- /dev/null
+++ b/definitions/variable/afolu/food_system.yaml
@@ -0,0 +1,92 @@
+- Food Availability [per capita]:
+    description: Food available for consumption - crops and livestock products
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 1
+    domain: AFOLU
+    subdomain: Food system
+- Food Availability|Crops [per capita]:
+    description: Food available for consumption - crops
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 1
+    domain: AFOLU
+    subdomain: Food system
+- Food Availability|Crops|{Cereal and Non-Energy Crop Types} [per capita]:
+    description: Food available for consumption - {Cereal and Non-Energy Crop Types}
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 3
+    domain: AFOLU
+    subdomain: Food system
+- Food Availability|Livestock [per capita]:
+    description: Food available for consumption - livestock products
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 1
+    domain: AFOLU
+    subdomain: Food system
+- Food Availability|Livestock|{Livestock Products} [per capita]:
+    description: Food available for consumption - {Livestock Products}
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 3
+    domain: AFOLU
+    subdomain: Food system
+
+- Food Intake [per capita]:
+    description: Food actually consumed - crops and livestock products
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 2
+    domain: AFOLU
+    subdomain: Food system
+- Food Intake|Crops [per capita]:
+    description: Food actually consumed - crops
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 2
+    domain: AFOLU
+    subdomain: Food system
+- Food Intake|Crops|{Cereal and Non-Energy Crop Types} [per capita]:
+    description: Food actually consumed - {Cereal and Non-Energy Crop Types}
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 3
+    domain: AFOLU
+    subdomain: Food system
+- Food Intake|Livestock [per capita]:
+    description: Food actually consumed - livestock products
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 2
+    domain: AFOLU
+    subdomain: Food system
+- Food Intake|Livestock|{Livestock Products} [per capita]:
+    description: Food actually consumed - {Livestock Products}
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 3
+    domain: AFOLU
+    subdomain: Food system
+
+- Food Waste [per capita]:
+    description: Amount of food (crops and livestock) per capita that is disposed and 
+      not consumed (difference between food availabilty and food intake) - 
+      includes food losses and food waste
+    unit: kcal/cap/day
+    sdg: 2
+    weight: Population
+    tier: 2
+    domain: AFOLU
+    subdomain: Food system
diff --git a/definitions/variable/afolu/forestry.yaml b/definitions/variable/afolu/forestry.yaml
index 14ee1833..69b1618d 100644
--- a/definitions/variable/afolu/forestry.yaml
+++ b/definitions/variable/afolu/forestry.yaml
@@ -1,19 +1,114 @@
-- Forestry Demand|Roundwood:
+# Forestry Demand Roundwood
+- Forestry Demand Roundwood:
     description: Total roundwood demand
     unit: million m3/yr
-- Forestry Demand|Roundwood|Industrial Roundwood:
-    description: Industrial roundwood demand
+    tier: 1
+    domain: AFOLU
+    subdomain: Forestry Demand
+- Forestry Demand Roundwood|{Raw products}:
+    description: "{Raw products} demand"
     unit: million m3/yr
-- Forestry Demand|Roundwood|Wood Fuel:
-    description: Wood fuel demand
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Demand
+- Forestry Demand Roundwood|Industrial Roundwood|Material use:
+    description: Industrial roundwood demand - used for material
     unit: million m3/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Demand
+- Forestry Demand|Roundwood|Industrial Roundwood|Energy use:
+    description: Industrial roundwood demand - used for energy
+    unit: million m3/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Demand
 
-- Forestry Production|Roundwood:
+# Forestry Production Roundwood
+- Forestry Production Roundwood:
     description: Total roundwood production
     unit: million m3/yr
-- Forestry Production|Roundwood|Industrial Roundwood:
-    description: Industrial roundwood production
+    tier: 1
+    domain: AFOLU
+    subdomain: Forestry Production
+- Forestry Production Roundwood|{Raw products}:
+    description: "{Raw products} production"
+    unit: million m3/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Production
+
+# Forestry Trade Roundwood
+- Forestry Trade Roundwood:
+    description: Net export of roundwood
     unit: million m3/yr
-- Forestry Production|Roundwood|Wood Fuel:
-    description: Wood fuel production
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Trade
+- Forestry Trade Roundwood|{Raw products}:
+    description: Net export of {Raw products}
     unit: million m3/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Trade
+
+# Forestry Demand, Production and Trade of Semi-finished Products
+- Forestry Demand Semi-finished|{Semi-finished products}:
+    description: "{Semi-finished products} demand"
+    unit: "{Semi-finished products}"
+    tier: 3
+    domain: AFOLU
+    subdomain: Forestry Demand
+- Forestry Production Semi-finished|{Semi-finished products}:
+    description: "{Semi-finished products} production"
+    unit: "{Semi-finished products}"
+    tier: 3
+    domain: AFOLU
+    subdomain: Forestry Production
+- Forestry Trade Semi-finished|{Semi-finished products}:
+    description: "Net export of {Semi-finished products}"
+    unit: "{Semi-finished products}"
+    tier: 3
+    domain: AFOLU
+    subdomain: Forestry Trade
+
+# Forestry Yield
+- Yield|Forestry|Timber production:
+    description: Actual timber yield, average on productive forest land. 
+      Equals to harvested biomass volume divided by forest area used for timber production
+    unit: m3/ha
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Yield
+
+# Forestry Harvested Area
+- Harvested area|Forestry:
+    description: Total timber harvest/production area 
+      (= sum of timber plantations, and other productive forest that is being harvested)
+    unit: million ha/yr
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Area
+
+# Forestry Prices
+- Price|Forestry Roundwood [Index]:
+    description: Farm-gate price index of roundwood products (weighted average)
+    unit: Index (2020 = 1)
+    weight: Forestry Production|Roundwood
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Prices
+- Price|Forestry Roundwood|{Raw products} [Index]:
+    description: Farm-gate price index of {Raw products}
+    unit: Index (2020 = 1)
+    weight: Forestry Production|Roundwood|{Raw products}
+    tier: 2
+    domain: AFOLU
+    subdomain: Forestry Prices
+- Price|Forestry Semi-finished|{Semi-finished products} [Index]:
+    description: Farm-gate price index of {Semi-finished products}
+    unit: Index (2020 = 1)
+    weight: Forestry Production Semi-finished|{Semi-finished products}
+    tier: 3
+    domain: AFOLU
+    subdomain: Forestry Prices
diff --git a/definitions/variable/afolu/land-cover-change.yaml b/definitions/variable/afolu/land-cover-change.yaml
new file mode 100644
index 00000000..eefc6340
--- /dev/null
+++ b/definitions/variable/afolu/land-cover-change.yaml
@@ -0,0 +1,91 @@
+- Forest Area Change|Net Change:
+    description: Annual net change in total forest area between last period and this 
+      period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Deforestation:
+    description: Annual gross deforestation between last period and this period 
+      (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Deforestation|Primary:
+    description: Annual gross loss of primary forest between last period and this period 
+      (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Deforestation|Secondary:
+    description: Annual gross loss of secondary forest between last period and this period 
+      (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion:
+    description: Annual gross forest expansion between last period and this period 
+      (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Secondary:
+    description: Annual gross expansion of secondary forest between last 
+      period and this period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted:
+    description: Annual gross expansion of planted forest between last period and this 
+      period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Plantation:
+    description: Annual gross expansion of plantations between last period and this 
+      period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Plantation|Timber:
+    description: Annual gross expansion of timber plantations between last period and this 
+      period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Plantation|Re-Afforestation:
+    description: Annual gross expansion of carbon plantations between last period and this 
+      period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Natural:
+    description: Annual gross expansion of planted forest not classified as plantation forest 
+      between last period and this period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Natural|Re-Afforestation:
+    description: Annual gross Re/afforestation for carbon sequestration with native tree 
+      species between last period and this period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
+- Forest Area Change|Gross Change|Forest Expansion|Planted|Natural|Other:
+    description: Annual gross expansion of other planted forest not classified as plantation 
+      between last period and this period (difference divided by period length)
+    unit: million ha/yr
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Cover
diff --git a/definitions/variable/afolu/land-cover.yaml b/definitions/variable/afolu/land-cover.yaml
index bed8d5b2..29a36cc9 100644
--- a/definitions/variable/afolu/land-cover.yaml
+++ b/definitions/variable/afolu/land-cover.yaml
@@ -1,82 +1,138 @@
 - Land Cover:
     description: Total land cover
     unit: million ha
-    tier: 2
     agmip: Land Cover (LAND) - Total (TOT)
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Cover
 
 - Land Cover|Built-Up Area:
     description: Built-up land associated with human settlements
     unit: million ha
-    tier: 2
     engage: Land Cover|Built-up Area
     navigate: Land Cover|Built-up Area
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Cover
 
 - Land Cover|Pasture:
     description: Pasture, not only high quality rangeland, based on FAO definition of
       "permanent meadows and pastures"
     unit: million ha
-    tier: 2
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Cover
 
 - Land Cover|Cropland:
     description: Arable land, i.e. land in bioenergy crop, food, and feed/fodder crops,
       permanent crops as well as other arable land (physical area)
     unit: million ha
-    tier: 2
     agmip: Land Cover (LAND) - All crops (CRP)
-- Land Cover|Cropland|{Cereal and Non-Energy Crop Types}:
-    description: Cropland for {Cereal and Non-Energy Crop Types}
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Cropland|{Crop Types}:
+    description: Cropland for {Crop Types}
     unit: million ha
-    tier: 3
-    agmip:
-- Land Cover|Cropland|Energy Crops:
-    description: Cropland for purpose-grown bioenergy crops
-      (short-rotation grasses and trees)
-    unit: million ha
-    tier: 3
-    agmip:
+    tier: {Crop Types}
+    domain: AFOLU
+    subdomain: Land Cover
 
 - Land Cover|Forest:
-    description: Managed and unmanaged forest area
+    description: Sum of primary, secondary and planted forest (FAO definition)
     unit: million ha
-    tier: 2
     agmip: Land Cover (LAND) - Forest (FOR)
-- Land Cover|Forest|Managed:
-    description: Managed forest area incl. timber plantations and re-/afforestation areas
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Primary:
+    description: Naturally regenerated forest of native tree species, where there are no 
+      clearly visible indications of human activities and the ecological processes are not 
+      significantly disturbed (FAO definition)
     unit: million ha
+    sdg: 15
     tier: 2
-    agmip:
-- Land Cover|Forest|Managed|Timber Plantations:
-    description: Area of timber plantations
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Secondary:
+    description: Forest predominantly composed of trees established through natural 
+      regeneration excluding primary forest (based on FAO definition of Naturally Regenerating Forest)
     unit: million ha
+    sdg: 15
     tier: 2
-    agmip: Land Cover (LAND) - Forest (FOR)
-- Land Cover|Forest|Managed|Afforestation:
-    description: Afforestation area
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted:
+    description: Forest predominantly composed of trees established through planting 
+      and/or deliberate seeding (FAO definition)
     unit: million ha
     tier: 2
-    agmip:
-- Land Cover|Forest|Managed|Reforestation:
-    description: Reforestation area
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Plantation:
+    description: Plantations are planted forests that are intensively managed and meet ALL the following 
+      criteria at planting and stand maturity - 
+      one or two species, even age class, and regular spacing (FAO definition)
     unit: million ha
     tier: 2
-    agmip:
-- Land Cover|Forest|Natural Forest:
-    description: Undisturbed (primary), modified and secondary forests from natural succession
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Plantation|Timber:
+    description: Plantations for timber production
     unit: million ha
     tier: 2
-    sdg: 15
-- Land Cover|Forest|Natural Forest|Primary Forest:
-    description: Undisturbed primary natural forests
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Plantation|Re-Afforestation:
+    description: Plantations for carbon sequestration - Re-Afforestation with 
+      monoculture and/or non-native species
     unit: million ha
-    tier: 3
-    sdg: 15
-- Land Cover|Forest|Natural Forest|Secondary Forest:
-    description: Modified natural forests and secondary forests from natural succession
+    tier: 2
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Natural:
+    description: Planted forest which is not classified as plantation forest. In particular, 
+      this includes re/afforestation for carbon sequestration with native tree species
     unit: million ha
-    tier: 3
-    sdg: 15
+    tier: 2
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Natural|Re-Afforestation:
+    description: Re/afforestation for carbon sequestration with native tree species
+    unit: million ha
+    tier: 2
+    domain: AFOLU
+    subdomain: Land Cover
+- Land Cover|Forest|Planted|Natural|Other:
+    description: Other planted forest which is not classified as plantation forest
+    unit: million ha
+    tier: 2
+    domain: AFOLU
+    subdomain: Land Cover
+
+- Land Cover|Other Natural:
+    description: Non-forest natural land - 
+      sum of primary non-forest, abandoned and restoration land
+    unit: million ha
+    tier: 2
+- Land Cover|Other Natural|Primary Non-Forest:
+    description: Primary non-forest natural land without clearly visible 
+      indications of human activities 
+    unit: million ha
+    tier: 2
+- Land Cover|Other Natural|Restored:
+    description: Intentionally restored natural land for the purpose of natural and/or 
+      biodiversity conservation
+    unit: million ha
+    tier: 2
+- Land Cover|Other Natural|Abandoned:
+    description: Naturally regenerating land due to the abandonment of 
+      agricultural or forestry land 
+    unit: million ha
+    tier: 2
 
 - Land Cover|Other Land:
-    description: Other land cover that does not fit into any other category
+    description: Other land cover that does not fit into any other land cover category, 
+      e.g. ice and water bodies
     unit: million ha
     tier: 2
diff --git a/definitions/variable/afolu/land-management.yaml b/definitions/variable/afolu/land-management.yaml
new file mode 100644
index 00000000..d17f69a5
--- /dev/null
+++ b/definitions/variable/afolu/land-management.yaml
@@ -0,0 +1,24 @@
+- Land Management|Cropland|Rainfed:
+    description: Rainfed cropland (physical area)
+    unit: million ha
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Management
+- Land Management|Cropland|Irrigated:
+    description: Irrigated cropland (physical area)
+    unit: million ha
+    tier: 1
+    domain: AFOLU
+    subdomain: Land Management
+- Land Management|Cropland|{Crop Types}|Rainfed:
+    description: Rainfed cropland (physical area) for {Crop Types}
+    unit: million ha
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Management
+- Land Management|Cropland|{Crop Types}|Irrigated:
+    description: Irrigated cropland (physical area) for {Crop Types}
+    unit: million ha
+    tier: 3
+    domain: AFOLU
+    subdomain: Land Management
diff --git a/definitions/variable/afolu/prices.yaml b/definitions/variable/afolu/prices.yaml
deleted file mode 100644
index 400c6faa..00000000
--- a/definitions/variable/afolu/prices.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- Price|Agriculture|Food Products [Index]:
-    description: Weighted average price index of food crops and livestock products
-    unit: Index (2020 = 1)
-    weight: Agricultural Production
-    navigate: Price|Agriculture|Non-Energy Crops and Livestock|Index
-- Price|Agriculture|Food Products|Livestock [Index]:
-    description: Weighted average price index of livestock products
-    sdg: 2
-    unit: Index (2020 = 1)
-    shape: Price|Agriculture|Livestock|Index
-- Price|Agriculture|Food Products|Crops [Index]:
-    description: Weighted average price index of food crops
-    unit: Index (2020 = 1)
-    weight: Agricultural Production|Crops
-    navigate: Price|Agriculture|Non-Energy Crops|Index
-- Price|Agriculture|Food Products|Crops|Corn [Index]:
-    description: Price index of corn / maize
-    unit: Index (2020 = 1)
-    weight: Agricultural Production|Crops
-    navigate: Price|Agriculture|Corn|Index
-- Price|Agriculture|Food Products|Crops|Soybean [Index]:
-    description: Price index of soybean
-    unit: Index (2020 = 1)
-    weight: Agricultural Production|Crops
-    navigate: Price|Agriculture|Soybean|Index
-- Price|Agriculture|Food Products|Crops|Wheat [Index]:
-    description: Price index of wheat
-    unit: Index (2020 = 1)
-    weight: Agricultural Production|Crops
-    navigate: Price|Agriculture|Wheat|Index
-- Price|Agriculture|Food Products|Crops|Rice [Index]:
-    description: Price index of rice
-    unit: Index (2020 = 1)
-    weight: Agricultural Production|Crops
diff --git a/definitions/variable/afolu/tag_cereal_and_crop_types.yaml b/definitions/variable/afolu/tag_cereal_and_crop_types.yaml
deleted file mode 100644
index 56fe4a90..00000000
--- a/definitions/variable/afolu/tag_cereal_and_crop_types.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- Cereal and Non-Energy Crop Types:
-    - Cereals:
-        description: cereals (maize, rice, temperate cereals and tropical cereals)
-    - Oil Crops:
-        description: oil crops (cotton seed, groundnuts, oilpalms,
-          other oil crops incl rapeseed, soybean, sunflower)
-    - Sugar Crops:
-        description: sugar crops (sugar beet, sugar cane)
-    - Other Crops:
-        description: other crops (fruits, vegetables, nuts, potatoes, pulses,
-          tropical roots)
\ No newline at end of file
diff --git a/definitions/variable/afolu/tag_crop_livestock_types.yaml b/definitions/variable/afolu/tag_crop_livestock_types.yaml
new file mode 100644
index 00000000..5359d912
--- /dev/null
+++ b/definitions/variable/afolu/tag_crop_livestock_types.yaml
@@ -0,0 +1,33 @@
+- Crop Types:
+    - Cereals:
+        description: cereals (maize, rice, temperate cereals and tropical cereals)
+    - Oil Crops:
+        description: oil crops (cotton seed, groundnuts, oilpalms,
+          other oil crops incl rapeseed, soybean, sunflower)
+    - Sugar Crops:
+        description: sugar crops (sugar beet, sugar cane)
+    - Other Crops:
+        description: other crops (fruits, vegetables, nuts, potatoes, pulses,
+          tropical roots)
+    - Energy Crops:
+        description: second-generation bioenergy crops 
+          (short rotation grasses, short rotation trees)
+- Crop Types w/o Energy Crops:
+    - Cereals:
+        description: cereals (maize, rice, temperate cereals and tropical cereals)
+    - Oil Crops:
+        description: oil crops (cotton seed, groundnuts, oilpalms,
+          other oil crops incl rapeseed, soybean, sunflower)
+    - Sugar Crops:
+        description: sugar crops (sugar beet, sugar cane)
+    - Other Crops:
+        description: other crops (fruits, vegetables, nuts, potatoes, pulses,
+          tropical roots)
+- Livestock Products:
+    - Dairy:
+        description: dairy products (milk, eggs)
+    - Ruminant:
+        description: ruminant meat (cattle, goat, sheep)
+    - Non-Ruminant:
+        description: monogastric meat (pig, poultry)
+          
\ No newline at end of file
diff --git a/definitions/variable/afolu/tag_forestry_types.yaml b/definitions/variable/afolu/tag_forestry_types.yaml
new file mode 100644
index 00000000..45e30bf3
--- /dev/null
+++ b/definitions/variable/afolu/tag_forestry_types.yaml
@@ -0,0 +1,24 @@
+- Raw products:
+    - Industrial Roundwood:
+        description: Industrial Roundwood
+    - Wood fuel:
+        description: Wood fuel
+- Semi-finished products:
+    - Sawnwood:
+        description: Sawnwood
+        unit: million m3/yr
+    - Plywood:
+        description: Plywood
+        unit: million m3/yr
+    - Fiberboard:
+        description: Fiberboard
+        unit: million m3/yr
+    - Other wood products:
+        description: Other wood products
+        unit: million m3/yr
+    - Mechanical pulp:
+        description: Mechanical pulp
+        unit: million tDM/yr
+    - Chemical pulp:
+        description: Chemical pulp
+        unit: million tDM/yr
diff --git a/definitions/variable/afolu/water-ecosystems.yaml b/definitions/variable/afolu/water-ecosystems.yaml
index 2fcf6def..61ba9b6b 100644
--- a/definitions/variable/afolu/water-ecosystems.yaml
+++ b/definitions/variable/afolu/water-ecosystems.yaml
@@ -1,32 +1,48 @@
 - Water Ecosystems:
     description: All water ecosystems
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Lakes:
     description: Lakes
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Rivers:
     description: Rivers
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Wetlands:
     description: Wetlands
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Wetlands|Peatlands:
     description: Peatlands
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Wetlands|Peatlands|Intact:
     description: Intact peatlands
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Wetlands|Peatlands|Drained:
     description: Drained peatlands
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
 - Water Ecosystems|Wetlands|Peatlands|Rewetted:
     description: Rewetted peatlands
     unit: million ha
-    tier: 3
+    tier: 2
+    domain: AFOLU
+    subdomain: Water Ecosystems
diff --git a/definitions/variable/afolu/yield.yaml b/definitions/variable/afolu/yield.yaml
deleted file mode 100644
index db3167df..00000000
--- a/definitions/variable/afolu/yield.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- Yield|Cropland|{Cereal and Non-Energy Crop Types}:
-    description: Yield of cropland with {Cereal and Non-Energy Crop Types}
-    unit: t DM/ha/yr
-    weight: Land Cover|Cropland|{Cereal and Non-Energy Crop Types}
-- Yield|Cropland|Energy Crops:
-    description: Yield of purpose-grown bioenergy crops
-      (short-rotation grasses and trees)
-    unit: t DM/ha/yr
-    weight: Land Cover|Cropland|Energy Crops