diff --git a/data/final_energy_map_v7.0.rda b/data/final_energy_map_v7.0.rda
index a84a1e31..9be72516 100644
Binary files a/data/final_energy_map_v7.0.rda and b/data/final_energy_map_v7.0.rda differ
diff --git a/data/final_energy_map_v7.1.rda b/data/final_energy_map_v7.1.rda
index 092fa2d1..9db01e13 100644
Binary files a/data/final_energy_map_v7.1.rda and b/data/final_energy_map_v7.1.rda differ
diff --git a/data/final_energy_map_v7.2.rda b/data/final_energy_map_v7.2.rda
index e33d76b5..567af995 100644
Binary files a/data/final_energy_map_v7.2.rda and b/data/final_energy_map_v7.2.rda differ
diff --git a/inst/extdata/mappings/GCAM7.0/final_energy_map.csv b/inst/extdata/mappings/GCAM7.0/final_energy_map.csv
index d16bdb0f..a4835db0 100644
--- a/inst/extdata/mappings/GCAM7.0/final_energy_map.csv
+++ b/inst/extdata/mappings/GCAM7.0/final_energy_map.csv
@@ -74,9 +74,9 @@ construction energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energ
 construction energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids feedstocks,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
-desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
+desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Gases,,,,Final Energy (w/o bunkers),1
+desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Liquids,,,,Final Energy (w/o bunkers),1
 food processing,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Electricity,,,,,Final Energy (w/o bunkers),1
 food processing,process heat food processing,NoReported,,,,,,,,,,,,,1
 industrial energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
@@ -88,9 +88,9 @@ industrial energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final E
 industrial feedstocks,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Solids,Final Energy|Non-Energy Use|Solids|Coal,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Solids,Final Energy|Non-Energy Use|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,gas,Final Energy,Final Energy|Gases,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gases,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Gases,,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
-industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 iron and steel,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -101,7 +101,7 @@ iron and steel,gas,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Fina
 iron and steel,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Liquids,,,,,Final Energy (w/o bunkers),1
-irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
+irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 mining energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -114,10 +114,10 @@ mining energy use,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final E
 mining energy use,H2 wholesale dispensing,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,,,,,,,Final Energy (w/o bunkers),1
-municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 N fertilizer,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,delivered industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
diff --git a/inst/extdata/mappings/GCAM7.1/final_energy_map.csv b/inst/extdata/mappings/GCAM7.1/final_energy_map.csv
index eb26a5f2..a5ee3fa2 100644
--- a/inst/extdata/mappings/GCAM7.1/final_energy_map.csv
+++ b/inst/extdata/mappings/GCAM7.1/final_energy_map.csv
@@ -69,9 +69,9 @@ construction energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energ
 construction energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids feedstocks,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
-desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
+desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Gases,,,,Final Energy (w/o bunkers),1
+desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Liquids,,,,Final Energy (w/o bunkers),1
 food processing,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Electricity,,,,,Final Energy (w/o bunkers),1
 food processing,process heat food processing,NoReported,,,,,,,,,,,,,1
 industrial energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
@@ -83,9 +83,9 @@ industrial energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final E
 industrial feedstocks,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Solids,Final Energy|Non-Energy Use|Solids|Coal,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Solids,Final Energy|Non-Energy Use|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,gas,Final Energy,Final Energy|Gases,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gases,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Gases,,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
-industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 iron and steel,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -95,7 +95,7 @@ iron and steel,gas,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Fina
 iron and steel,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Liquids,,,,,Final Energy (w/o bunkers),1
-irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
+irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 mining energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -107,10 +107,10 @@ mining energy use,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final E
 mining energy use,H2 wholesale dispensing,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,,,,,,,Final Energy (w/o bunkers),1
-municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 N fertilizer,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Gases,,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Gases,,Final Energy (w/o bunkers),1
diff --git a/inst/extdata/mappings/GCAM7.2/final_energy_map.csv b/inst/extdata/mappings/GCAM7.2/final_energy_map.csv
index eb26a5f2..a5ee3fa2 100644
--- a/inst/extdata/mappings/GCAM7.2/final_energy_map.csv
+++ b/inst/extdata/mappings/GCAM7.2/final_energy_map.csv
@@ -69,9 +69,9 @@ construction energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energ
 construction energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
 construction feedstocks,refined liquids feedstocks,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Non-Metallic Minerals,Final Energy|Non-Energy Use|Non-Metallic Minerals|Liquids,,,,,Final Energy (w/o bunkers),1
-desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
-desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,,,,,,,Final Energy (w/o bunkers),1
+desalinated water,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+desalinated water,gas,Final Energy,Final Energy|Gases,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Gases,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Gases,,,,Final Energy (w/o bunkers),1
+desalinated water,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Liquids,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Desalination,Final Energy|Commercial|Liquids,,,,Final Energy (w/o bunkers),1
 food processing,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Industry,Final Energy|Industry|Electricity,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Electricity,,,,,Final Energy (w/o bunkers),1
 food processing,process heat food processing,NoReported,,,,,,,,,,,,,1
 industrial energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
@@ -83,9 +83,9 @@ industrial energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final E
 industrial feedstocks,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Solids,Final Energy|Non-Energy Use|Solids|Coal,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Solids,Final Energy|Non-Energy Use|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,gas,Final Energy,Final Energy|Gases,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Gases,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Gases,,,,,Final Energy (w/o bunkers),1
 industrial feedstocks,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Non-Energy Use,Final Energy|Non-Energy Use|Liquids,,Final Energy|Non-Energy Use|Other Sector,Final Energy|Non-Energy Use|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
-industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+industrial wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+industrial water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 iron and steel,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 iron and steel,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Solids,Final Energy|Industry|Iron and Steel|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -95,7 +95,7 @@ iron and steel,gas,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Fina
 iron and steel,H2 industrial,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Hydrogen,,,,,Final Energy (w/o bunkers),1
 iron and steel,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Iron and Steel,Final Energy|Industry|Iron and Steel|Liquids,,,,,Final Energy (w/o bunkers),1
-irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,,,,,,,Final Energy (w/o bunkers),1
+irrigation water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 mining energy use,biomass,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,delivered biomass industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Biomass,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Biomass,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Biomass,,,,Final Energy (w/o bunkers),1
 mining energy use,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Solids,Final Energy|Industry|Other Sector|Solids|Coal,,,,Final Energy (w/o bunkers),1
@@ -107,10 +107,10 @@ mining energy use,H2 retail delivery,Final Energy,Final Energy|Hydrogen,,Final E
 mining energy use,H2 wholesale dispensing,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,hydrogen,Final Energy,Final Energy|Hydrogen,,Final Energy|Industry,Final Energy|Industry|Hydrogen,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Hydrogen,,,,,Final Energy (w/o bunkers),1
 mining energy use,refined liquids,Final Energy,Final Energy|Liquids,,Final Energy|Industry,Final Energy|Industry|Liquids,,Final Energy|Industry|Other Sector,Final Energy|Industry|Other Sector|Liquids,,,,,Final Energy (w/o bunkers),1
-municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
-municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,,,,,,,Final Energy (w/o bunkers),1
-municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Commercial,,,,,,,,,Final Energy (w/o bunkers),1
+municipal wastewater treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water abstraction,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Groundwater Extraction,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water distribution,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,Final Energy|Commercial|Water|Transfer,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
+municipal water treatment,electricity,Final Energy,Final Energy|Electricity,,Final Energy|Residential and Commercial,Final Energy|Residential and Commercial|Electricity,Final Energy|Commercial,Final Energy|Commercial|Water,,Final Energy|Commercial|Electricity,,,,Final Energy (w/o bunkers),1
 N fertilizer,coal,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,delivered coal industry,Final Energy,Final Energy|Solids,Final Energy|Solids|Coal,Final Energy|Industry,Final Energy|Industry|Solids,Final Energy|Industry|Solids|Coal,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Solids,Final Energy|Industry|Chemicals|Solids|Coal,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Solids,Final Energy|Industry|Chemicals|Ammonia|Solids|Coal,Final Energy (w/o bunkers),1
 N fertilizer,gas,Final Energy,Final Energy|Gases,,Final Energy|Industry,Final Energy|Industry|Gases,,Final Energy|Industry|Chemicals,Final Energy|Industry|Chemicals|Gases,,Final Energy|Industry|Chemicals|Ammonia,Final Energy|Industry|Chemicals|Ammonia|Gases,,Final Energy (w/o bunkers),1