diff --git a/definitions/region/native_regions/aim_hub_global_2.4.yaml b/definitions/region/native_regions/aim_hub_global_2.4.yaml
new file mode 100644
index 00000000..5f1ac6cf
--- /dev/null
+++ b/definitions/region/native_regions/aim_hub_global_2.4.yaml
@@ -0,0 +1,19 @@
+- AIM/Hub-Global 2.4:
+    - AIM/Hub-Global 2.4|Brazil
+    - AIM/Hub-Global 2.4|Canada
+    - AIM/Hub-Global 2.4|China
+    - AIM/Hub-Global 2.4|Former USSR
+    - AIM/Hub-Global 2.4|India
+    - AIM/Hub-Global 2.4|Japan
+    - AIM/Hub-Global 2.4|Turkey
+    - AIM/Hub-Global 2.4|USA
+    - AIM/Hub-Global 2.4|Other Africa
+    - AIM/Hub-Global 2.4|EU
+    - AIM/Hub-Global 2.4|Rest of Europe
+    - AIM/Hub-Global 2.4|Rest of Latin America
+    - AIM/Hub-Global 2.4|Middle East
+    - AIM/Hub-Global 2.4|North Africa
+    - AIM/Hub-Global 2.4|New Zealand and Australia
+    - AIM/Hub-Global 2.4|Rest of Asia
+    - AIM/Hub-Global 2.4|Rest of East and South East Asia
+
diff --git a/definitions/region/native_regions/native_regions_witch_6_0.yml b/definitions/region/native_regions/native_regions_witch_6_0.yml
new file mode 100644
index 00000000..ea17717b
--- /dev/null
+++ b/definitions/region/native_regions/native_regions_witch_6_0.yml
@@ -0,0 +1,285 @@
+- WITCH 6.0:
+  - WITCH 6.0|Brazil:
+      countries:
+      - Brazil
+  - WITCH 6.0|Canada:
+      countries:
+      - Canada
+      - Saint Pierre and Miquelon
+  - WITCH 6.0|China:
+      countries:
+      - China
+      - Hong Kong
+      - Macao
+      - Taiwan
+  - WITCH 6.0|Europe (EU+EFTA+Balkan Countries and Turkey):
+      countries:
+      - Bulgaria
+      - Cyprus
+      - Czechia
+      - Estonia
+      - Hungary
+      - Lithuania
+      - Latvia
+      - Poland
+      - Romania
+      - Slovakia
+      - Slovenia
+      - Malta
+      - Croatia
+      - Austria
+      - Belgium
+      - Germany
+      - Denmark
+      - Spain
+      - Finland
+      - France
+      - United Kingdom
+      - Greece
+      - Ireland
+      - Italy
+      - Luxembourg
+      - Netherlands
+      - Portugal
+      - Sweden
+      - Liechtenstein
+      - Norway
+      - Switzerland
+      - Greenland
+      - Iceland
+      - Faroe Islands
+      - Åland Islands
+      - Andorra
+      - Guernsey
+      - Gibraltar
+      - Isle of Man
+      - Jersey
+      - Monaco
+      - Svalbard and Jan Mayen
+      - San Marino
+      - Vatican
+      - Bosnia and Herzegovina
+      - Albania
+      - North Macedonia
+      - Montenegro
+      - Serbia
+  - WITCH 6.0|India:
+      countries:
+      - India
+  - WITCH 6.0|Indonesia:
+      countries:
+      - Indonesia
+  - WITCH 6.0|Japan and Korea:
+      countries:
+      - Japan
+      - South Korea
+      - North Korea
+  - WITCH 6.0|Latin America and the Caribbean:
+      countries:
+      - Antarctica
+      - Bermuda
+      - South Georgia and the South Sandwich Islands
+      - Turks and Caicos Islands
+      - British Virgin Islands
+      - United States Virgin Islands
+      - Aruba
+      - Anguilla
+      - Argentina
+      - Antigua and Barbuda
+      - Bonaire, Sint Eustatius and Saba
+      - Bahamas
+      - Saint Barthélemy
+      - Belize
+      - Bolivia
+      - Barbados
+      - Chile
+      - Colombia
+      - Costa Rica
+      - Cuba
+      - Curaçao
+      - Cayman Islands
+      - Dominica
+      - Dominican Republic
+      - Ecuador
+      - Falkland Islands (Malvinas)
+      - Guadeloupe
+      - Grenada
+      - Guatemala
+      - French Guiana
+      - Guyana
+      - Honduras
+      - Haiti
+      - Jamaica
+      - Saint Kitts and Nevis
+      - Saint Lucia
+      - Saint Martin (French part)
+      - Montserrat
+      - Martinique
+      - Nicaragua
+      - Panama
+      - Peru
+      - Puerto Rico
+      - Paraguay
+      - El Salvador
+      - Suriname
+      - Sint Maarten (Dutch part)
+      - Trinidad and Tobago
+      - Uruguay
+      - Saint Vincent and the Grenadines
+      - Venezuela
+  - WITCH 6.0|Middle East and North Africa:
+      countries:
+      - United Arab Emirates
+      - Bahrain
+      - Algeria
+      - Egypt
+      - Western Sahara
+      - Iran
+      - Iraq
+      - Israel
+      - Jordan
+      - Kuwait
+      - Lebanon
+      - Libya
+      - Morocco
+      - Oman
+      - Palestine
+      - Qatar
+      - Saudi Arabia
+      - Syria
+      - Tunisia
+      - Yemen
+  - WITCH 6.0|Mexico:
+      countries:
+      - Mexico
+  - WITCH 6.0|Australia, New Zealand, and Oceania islands:
+      countries:
+      - New Zealand
+      - Australia
+      - Christmas Island
+      - Cook Islands
+      - Heard Island and McDonald Islands
+      - Norfolk Island
+      - Niue
+      - Nauru
+      - Pitcairn
+      - Tokelau
+      - Tuvalu
+      - United States Minor Outlying Islands
+      - Wallis and Futuna
+      - Fiji
+      - Papua New Guinea
+      - Micronesia
+      - Guam
+      - American Samoa
+      - Timor-Leste
+      - French Polynesia
+      - Kiribati
+      - Northern Mariana Islands
+      - Marshall Islands
+      - New Caledonia
+      - Palau
+      - Samoa
+      - Solomon Islands
+      - Tonga
+      - Vanuatu
+  - WITCH 6.0|South Asia:
+      countries:
+      - Afghanistan
+      - Bangladesh
+      - Bhutan
+      - Sri Lanka
+      - Maldives
+      - Nepal
+      - Pakistan
+  - WITCH 6.0|South East Asia:
+      countries:
+      - Brunei Darussalam
+      - Cocos (Keeling) Islands
+      - Cambodia
+      - Laos
+      - Myanmar
+      - Malaysia
+      - Philippines
+      - Singapore
+      - Thailand
+      - Viet Nam
+  - WITCH 6.0|South Africa:
+      countries:
+      - South Africa
+  - WITCH 6.0|Sub Saharan Africa:
+      countries:
+      - Djibouti
+      - British Indian Ocean Territory
+      - Bouvet Island
+      - French Southern Territories
+      - Angola
+      - Benin
+      - Botswana
+      - Burkina Faso
+      - Burundi
+      - Cameroon
+      - Cabo Verde
+      - Central African Republic
+      - Chad
+      - Comoros
+      - Congo
+      - Democratic Republic of the Congo
+      - Côte d'Ivoire
+      - Equatorial Guinea
+      - Eritrea
+      - Ethiopia
+      - Gabon
+      - Gambia
+      - Ghana
+      - Guinea
+      - Guinea-Bissau
+      - Kenya
+      - Lesotho
+      - Liberia
+      - Madagascar
+      - Malawi
+      - Mali
+      - Mauritania
+      - Mauritius
+      - Mayotte
+      - Mozambique
+      - Namibia
+      - Niger
+      - Nigeria
+      - Réunion
+      - Rwanda
+      - Sao Tome and Principe
+      - Senegal
+      - Seychelles
+      - Saint Helena, Ascension and Tristan da Cunha
+      - Sierra Leone
+      - Somalia
+      - South Sudan
+      - Sudan
+      - Eswatini
+      - Tanzania
+      - Togo
+      - Uganda
+      - Zambia
+      - Zimbabwe
+  - WITCH 6.0|Non-EU Eastern European and Transition Countries:
+      countries:
+      - Mongolia
+      - Armenia
+      - Azerbaijan
+      - Belarus
+      - Georgia
+      - Kazakhstan
+      - Kyrgyzstan
+      - Moldova
+      - Russian Federation
+      - Tajikistan
+      - Turkey
+      - Turkmenistan
+      - Ukraine
+      - Uzbekistan
+  - WITCH 6.0|United States of America:
+      countries:
+      - United States
+      
\ No newline at end of file
diff --git a/definitions/variable/energy/secondary-energy-non-electricity.yaml b/definitions/variable/energy/secondary-energy-non-electricity.yaml
index 6a09aa05..2195c852 100644
--- a/definitions/variable/energy/secondary-energy-non-electricity.yaml
+++ b/definitions/variable/energy/secondary-energy-non-electricity.yaml
@@ -71,8 +71,34 @@
 - Secondary Energy|Gases|Gas:
     description: Consumption of natural gas (fossil methane)
     unit: EJ/yr
+- Secondary Energy|Gases|Hydrogen:
+    description: Production of gaseous fuels from hydrogen (if hydrogen is explicitly
+      modeled as a commodity and not an implicit intermediate product of the
+      transformation technologies)
+    unit: EJ/yr
+- Secondary Energy|Gases|Hydrogen|Fossil:
+    description: Production of gaseous fuels using hydrogen from fossils (if hydrogen is
+      explicitly modeled as a commodity and not an implicit intermediate product of the
+      transformation technologies)
+    unit: EJ/yr
+- Secondary Energy|Gases|Hydrogen|Biomass:
+    description: Production of gaseous fuels using hydrogen generated from biomass
+      (if hydrogen is explicitly modeled as a commodity and not an implicit intermediate
+      product of the transformation technologies)
+    unit: EJ/yr
+- Secondary Energy|Gases|Hydrogen|Electricity:
+    description: Production of gaseous fuels using hydrogen from electrolysis, i.e.,
+      e-fuels (if hydrogen is explicitly modeled as a commodity and not an implicit
+      intermediate product of the transformation technologies)
+    unit: EJ/yr
+- Secondary Energy|Gases|Hydrogen|Other:
+    description: Production of gaseous fuels using hydrogen from other sources
+      (if hydrogen is explicitly modeled as a commodity and not an implicit intermediate
+      product of the transformation technologies)
+    unit: EJ/yr
 - Secondary Energy|Gases|Electricity:
     description: Production of gas from electricity (power-to-gas)
+      (if hydrogen is not explicitly modeled as an intermediate product)
     unit: EJ/yr
 - Secondary Energy|Gases|Other:
     description: Production of gases from sources that do not fit any other category
diff --git a/definitions/variable/macro-economy/trade.yaml b/definitions/variable/macro-economy/trade.yaml
index 44829d48..b56bb826 100644
--- a/definitions/variable/macro-economy/trade.yaml
+++ b/definitions/variable/macro-economy/trade.yaml
@@ -1,13 +1,10 @@
-- Trade|Export [Value]:
-    description: total exports measured in monetary quantities
+# trade in goods
+- Trade|Goods [Value]:
+    description: Net exports of all goods measured in monetary quantities
     unit: billion USD_2010/yr
     tier: 1
-    min: 0
-- Trade|Import [Value]:
-    description: total imports measured in monetary quantities
-    unit: billion USD_2010/yr
-    tier: 1
-    min: 0
+    navigate: Trade
+    engage: Trade
 
 # emissions allowances
 - Trade|Emissions Allowances [Volume]:
diff --git a/mappings/AIM_Hub_Global.yaml b/mappings/AIM_Hub_Global.yaml
new file mode 100644
index 00000000..4464d8c5
--- /dev/null
+++ b/mappings/AIM_Hub_Global.yaml
@@ -0,0 +1,73 @@
+model: AIM/Hub-Global 2.4
+native_regions:
+  - BRA: AIM/Hub-Global 2.4|Brazil
+  - CAN: AIM/Hub-Global 2.4|Canada
+  - CHN: AIM/Hub-Global 2.4|China
+  - CIS: AIM/Hub-Global 2.4|Former USSR
+  - IND: AIM/Hub-Global 2.4|India
+  - JPN: AIM/Hub-Global 2.4|Japan
+  - TUR: AIM/Hub-Global 2.4|Turkey
+  - USA: AIM/Hub-Global 2.4|USA
+  - XAF: AIM/Hub-Global 2.4|Other Africa
+  - XE25: AIM/Hub-Global 2.4|EU
+  - XER: AIM/Hub-Global 2.4|Rest of Europe
+  - XLM: AIM/Hub-Global 2.4|Rest of Latin America
+  - XME: AIM/Hub-Global 2.4|Middle East
+  - XNF: AIM/Hub-Global 2.4|North Africa
+  - XOC: AIM/Hub-Global 2.4|New Zealand and Australia
+  - XSA: AIM/Hub-Global 2.4|Rest of Asia
+  - XSE: AIM/Hub-Global 2.4|Rest of East and South East Asia
+  - World
+common_regions:
+  # R5 regions 
+  - Asia (R5):
+    - CHN
+    - IND
+    - XSA
+    - XSE
+  - Latin America (R5):
+    - BRA
+    - XLM
+  - Middle East & Africa (R5):
+    - XAF
+    - XME
+    - XNF
+  - OECD & EU (R5):
+    - CAN
+    - JPN
+    - TUR
+    - USA
+    - XE25
+    - XER
+    - XOC
+  - Reforming Economies (R5):
+    - CIS 
+  # R10 regions 
+  - Africa (R10):
+    - XAF
+    - XNF
+  - China+ (R10):
+    - CHN
+  - Europe (R10):
+    - TUR
+    - XE25
+  - India+ (R10):
+    - IND
+  - Latin America (R10):
+    - BRA
+    - XLM
+  - Middle East (R10):
+    - XME
+  - North America (R10):
+    - CAN
+    - USA
+  - Pacific OECD (R10):
+    - JPN
+    - XOC
+  - Reforming Economies (R10):
+    - XER
+    - CIS
+  - Rest of Asia (R10):
+    - XSA
+    - XSE
+
diff --git a/mappings/region_mappings_witch_6_0.yml b/mappings/region_mappings_witch_6_0.yml
new file mode 100644
index 00000000..abe2263d
--- /dev/null
+++ b/mappings/region_mappings_witch_6_0.yml
@@ -0,0 +1,118 @@
+model:
+  - WITCH 6.0
+native_regions:
+  - brazil: WITCH 6.0|Brazil
+  - canada: WITCH 6.0|Canada
+  - china: WITCH 6.0|China
+  - europe: WITCH 6.0|Europe (EU+EFTA+Balkan Countries and Turkey)
+  - india: WITCH 6.0|India
+  - indonesia: WITCH 6.0|Indonesia
+  - jpnkor: WITCH 6.0|Japan and Korea
+  - laca: WITCH 6.0|Latin America and the Caribbean
+  - mena: WITCH 6.0|Middle East and North Africa
+  - mexico: WITCH 6.0|Mexico
+  - oceania: WITCH 6.0|Australia, New Zealand, and Oceania islands
+  - sasia: WITCH 6.0|South Asia
+  - seasia: WITCH 6.0|South East Asia
+  - southafrica: WITCH 6.0|South Africa
+  - ssa: WITCH 6.0|Sub Saharan Africa
+  - te: WITCH 6.0|Non-EU Eastern European and Transition Countries
+  - usa: WITCH 6.0|United States of America
+common_regions:
+  - World:
+      - brazil
+      - canada
+      - china
+      - europe
+      - india
+      - indonesia
+      - jpnkor
+      - laca
+      - mena
+      - mexico
+      - oceania
+      - sasia
+      - seasia
+      - southafrica
+      - ssa
+      - te
+      - usa
+  # R5 regions 
+  - Asia (R5):
+      - china
+      - india
+      - indonesia
+      - sasia
+      - seasia
+  - Latin America (R5):
+      - brazil
+      - laca
+      - mexico
+  - Middle East & Africa (R5):
+      - mena
+      - southafrica
+      - ssa
+  - OECD & EU (R5):
+      - canada
+      - europe
+      - jpnkor
+      - oceania
+      - usa
+  - Reforming Economies (R5):
+      - te
+  # R9 regions 
+  - China (R9):
+      - china
+  - European Union (R9):
+      - europe
+  - India (R9):
+      - india
+  - Latin America (R9):
+      - brazil
+      - laca
+      - mexico
+  - Middle East & Africa (R9):
+      - mena
+      - southafrica
+      - ssa
+  - Other Asia (R9):
+      - indonesia
+      - sasia
+      - seasia
+  - Other OECD (R9):
+      - canada
+      - jpnkor
+      - oceania
+  - Reforming Economies (R9):
+      - te
+  - USA (R9):
+      - usa
+  # R10 regions 
+  - Africa (R10):
+      - southafrica
+      - ssa
+  - China+ (R10):
+      - china
+  - Europe (R10):
+      - europe
+  - India+ (R10):
+      - india
+      - sasia
+  - Latin America (R10):
+      - brazil
+      - laca
+      - mexico
+  - Middle East (R10):
+      - mena
+  - North America (R10):
+      - canada
+      - usa
+  - Pacific OECD (R10):
+      - jpnkor
+      - oceania
+  - Reforming Economies (R10):
+      - te
+  - Rest of Asia (R10):
+      - indonesia
+      - seasia
+