From 22257c8ed46e80be55463ee60a865b1bec7d5aeb Mon Sep 17 00:00:00 2001
From: klau506 <claudia.rodes@bc3research.org>
Date: Tue, 14 Jan 2025 09:25:33 +0100
Subject: [PATCH] ComDef: fix final en Water

---
 data/final_energy_map_v7.0.rda                | Bin 3167 -> 3173 bytes
 data/final_energy_map_v7.1.rda                | Bin 3163 -> 3206 bytes
 data/final_energy_map_v7.2.rda                | Bin 3202 -> 3163 bytes
 .../mappings/GCAM7.0/final_energy_map.csv     |  22 +++++++++---------
 .../mappings/GCAM7.1/final_energy_map.csv     |  22 +++++++++---------
 .../mappings/GCAM7.2/final_energy_map.csv     |  22 +++++++++---------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/data/final_energy_map_v7.0.rda b/data/final_energy_map_v7.0.rda
index a84a1e31689661224c7d5a87a938a1519cf8e4d6..9be7251641580d00e58a7adbd2b84a764de8d413 100644
GIT binary patch
literal 3173
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
LML1B9dUf8V&~)(0

literal 3167
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
F@_@hOE}8%U

diff --git a/data/final_energy_map_v7.1.rda b/data/final_energy_map_v7.1.rda
index 092fa2d1aaeb4fa983c92a7ce101c4545520d238..9db01e13dff04a88de26c1b97f2841d39b08ddd3 100644
GIT binary patch
literal 3206
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

literal 3163
zcmV-h45afyT4*^jL0KkKSy4g1AOL4>|H%LU{{R2~|NDRE-oU@_|MWlr2mk;P;1*we
zUmF8Jr9dD6(Qq|tfB=z2RZ-2TqJX6URD%d;1rnGt0aB`mvYAb$hNhm4N2a4{02%-T
zLrpy(9#cb4NB{r;H~;_|001&HG5`Po00EJZ00u$8007Vc0g<7Q0000042*yPG6b4Q
z2~@&h0%m{!044wc6951NzyJbjRFEc(5_(OjWHe}cngQx$4Ff=WfChj)Kmci=0+Ny@
zrkYJOk4ckM-l_Vd%6_TjnAF5*&;h+rXwm9=fXKvcLr-d+O;1Vr_=;1j;@;1P;7L9G
z{Q4Cm|9_W-D&qdVeVo*imy`bg&nZGKjq>#p>ii!cl&JE%&J?PPx}V8e4QAG?hj~BF
zQ<m1{vx|e*IN+BgEScQx?wql({#yP&v#!svH=gLOnxm1SnHkD(r`GdPlOgt&LUPp&
zZi34OM8+iwFsMrbm;P8}F=C){fnZ_5Xe2~}OASE736>0ngy%U^?9I-DqHzsvqpoSo
zq;#4%IOMoFN_2IyZKql}HCc?70pkxoaHp+LNB=h|dfj=uX7gRDZ#M$z!8K~|9iY^4
z<>YoNrmnKD4x7U}M^&M#Y^Gqwnpn|^r1Gw-*ITM&)78c=46O2;RkckWuPK`vZ9DN(
zCkX+O2M16!0LDRJDylH#&nWg{_PbXobk)qOwON$Ia_gR|=v-wVl09q9S7pmKY}=WW
zUU|%KMT^Hbb=6jBwC#qQHrVs)$mUawHde|u8oj<%?5^s$lgXK@EsqPx@t0=_lJ3gA
zJ-uB=gvuJVc|mkuhSQ{LhI5KRqACi*c*Tf}SSZOdxZ88g_r*@VU6P%RCwAJ$T=6>F
zGfpn~wzF2x2d=v$){&_gkXa%}2#W(|8?swvv@wEtF7F4E(L3tRLsykLvEiNPTv(TP
zV*^S=Q5lm#Wy5TQmLd$=8LSq(G9*~dgu)q03l<PkA+3u6b(VptDJ!)WHf$lYCWM%e
zC>u@m8xjV{mYS+Vcx_k+R1IxGb7NNGw^}raO|~VPPxq)A$*D4v8MzZpN)G5Ml4xeh
zV1_Ye1S!b8NW&D4+#E>iYF68Th8$}QnP~7`WZNh#6xp`xdtE4pE@wmuN7zCkq?Ja~
z8s;iVACF&Fl2P;NP_Hzp>>h*TRXu@9ao)ZF_zCgQ@|ScbQ{s-%=MmUFN~hN^R2LEP
zDe5HmrB7i;n)R(~w3YTt7il~^EG?+idc%Xr&puTgD!9~4q|r_-C#zEy!!DdTqmzQQ
zWgo(-@CTxIQ`Ih!IT3o)J#|;OPf7=xuJG2Nz;>dXmFXE)NtRwpT~%G{#EhAy<VS^d
zT2sY!Na#KSD(G~K_AIA#vV18A_R^=KROC~<rKyDboJzbN#}v{QOUH@e@>G8swL_&(
z=;a^&OV~9h!i*F3mC)rCY}&CJ%UNi{V;VDAvqoyoV*X7^auI#CD=MX0mxx94WG_&@
zudC|)Iaf^8Ql#UW^51e%rz2KZm(g6V$2)3NrD=szC>n^Ggufs*q*+C#34wZHm^>2J
z2(2)q#iO6B+vA$*R-~}88@QU%FG-$;Tr)Q|mTMLiE<~~~FL^AOl@+0z3{+ZTs%$7+
z8-={9rb?p{5`?BM#!NF~XugJGDHhVYnlq}@xZtEQkh({e5~LTC8Fg8Z@qPN^<a?vs
zdvA^Jd(V1Lp?nMAF9X5qM#55Uri9RCoHqS33S1|INt}tqNi<}U`@(mW{aXAKc7iX_
z><_g=RCu8Eob;9CjVfHplh*rADjcAgieWa0#ozdU&HJBM?)_C?ml27nqUY^ZeH6aL
zPI|8RInj1V@dx=UfvYKUTGgs1BSh{Lrxi?(D*fb_L2y=zc9yL=t(-Z<9EQp{1@+gV
z(q&`HpSo4&L)Ge|GT`9n394~T#+y@|+=GT@to{n4{;}Yy@8Q@_`G>+$cK>IjNB*Vq
zk9WMB55lEC9HXxUQ}C+%RYdtd6m*Zsu$gv{b$XWr;+M%^VJqTBRWeKB5BG->r*+9R
zNb0)&A*minhu=y&Q61t(N>lj1eo5rA#i3eC`>3CZOX#S+zQXp8G*5vao}%e0T}3tV
zKxm7UjYTz8?1<`-(mSKdPwIXWPsUG3F2uaWUTQD+BdEUuCz`Hld+`@VQ9E%K33n<%
z=XhhnYK7p^sil!Mcw+O#dkCNOC6yDfyZvZR^&#bUh`i{h5$L5qGL+;OX;kQw?bI*3
zDy~b|N&Pp|m}J?LvMR2a<RbGS4{zv|-&A$ftrzdzN9dMlUfIgUq->179xgo)nN2{!
z?xEs{{Wyz)RbFZ@te&EHlD|4s;vE#7PSaYqYVabw!Ci8^PW+X3g<8GnhLrpiJwp>0
znDb6$nqbwdHqS01-kmNW`99Ps$K+(yi9gHsktgy*olEFnaaW)s>X&Hb56dTINF6m&
zdnBXiDSMKO_G&+ARQ96r2a$|Ro(qK&hYW3N4P{zn%~_bmjah@KbiP_1^#i1Ig1zVu
z)hfHD&8Eeg+HGvLvrP=f(@drnKvG63L=Z%XilT`XilUK7A~AxI7^<MF6h+OIl))}j
zu@_VwAzpn^Q|I!N+9$Xy3mVG6%lt>;pAxx}E`p2BD(<D*F4V+n!iN#?#WZwSk7QH!
zG_S26+$hyzO-z|fB)cUaeLd*#Reot=(%VU>w4ZE!!RwN{^WKtobgrQ)=^<RCE)=K8
zLG#FBsg_N!(NteVrld#EPTZ*NL4HuomSr8PJW$G{?Ist=MLVE$!OT_OJ;1mTWfrKr
z#LK=dlxCL7){Uz&W~-=s#6MHaigxezMu@`&-iYbzCrSs3qxK@2SBg;XC!J3v7mBOG
zztDc+_E+s5vh|)yreAO_O9g{27bR;<$z)XbRUW{>N^q_Bze|#KD76&7FfCw}>TyYU
zPmKi0LjhI9q`HC4D}^SdP37K>)fPZ?E14hbN}tPos*Ci)2C6ib_Uqb+e1a~eE7`>~
zxd^^R=o+!<3gJ|ph3q1pVjj99l)m74pt&h~2^g<kRpce~#D1c1Ujm0f{d<z9%|QJr
zE7tc`6U|%Vsqgk9%jGmpSe_{Cr1<aelz;Y5oDcJf;v>j?DfIe4Jo|jSB<3xoYSd<&
z%&D!o<Z~A2WU0i|45wAV_>ug`$ocB7sC<39hidIaYP*Ml)J6L$qxGcrr@*h^FV~NB
zaZ}M(mW!T~xK~|B9m=6!1w-XsD8HbHe03@Gsqs=ir;wk`)aepl(V*)jWmbh)tWq<H
zw##Ljmc-awO?kW2SFAcp(B){&A0o>xme*ZPYB?Q8Rp%+i$=fxisiQN3a=5ukxmsG9
zYr8I`GIK4qE2x;cY}+zyab30=yY<?fS9x-{Ns`pvfso2V!$5+uL7d3}D>N2ZY64lR
zj4;XzRs~9787l`Pl4K=A3qt_OQ2|uOFlA&!6&q-*8Vi<OLba-)SX-HqdEkcxI+Mh^
zQAc8SsIMZfNMD~K%&2K<Q)BA#lyocS?tt*+8lm)8zPne$M~Fj_79`ObPN^7rDNm$5
zARQGKXj6otb`s~RS}Y4hc~@=QByepJsf;jW+cwo|)9#G~$e2$p<|_14+jNdnKJuJU
z;QG*?U{!gFyp>(#9=EJx4rXeLFIq5ql&4fC577CM?hdL4YLLpJy{R8;+S^OjQXY|d
zR9~V2{;7E<swv(c3Ru0bypNmXN}n}V+Oil=X%&5;LD$bZy*`Nf{!#}Yrb6+>*C$=7
zzG0I5GRggi-S}wxQL7AwjHQh+Hb}|NW;w1nwoPfsIKzfxVz^3jhYIGd3No`Aw6<*y
zDnj(2zPgKvE@&*0$)v@pj8;Yp8BCUzh{+aE))OmaX*8`3OR^6fo@otLqSU){6IyK8
zHK40xk_;g=IRQvRrjFK9=GzkOQd^HrnX#LaP1zZOGgEjjTSu5>FgUzga1&A_P8pfK
zzz{*nBq^j3H4Q+g0tyt|+<-_GGkX%$wz7-4qgLZh+o;X(ylupiLxx2p5rErGt=%x%
zaOWn`tmbAWaOE>C&N<FRJG2iBrq@&$%PCV*W`H#?LuqnkENnMfz;7TLII>kMUCrTG
zFsn`XU4S@1oG6?Ot&aRgW361#Q(~IiSZy8N4Q6O3@7IU-`-}byxgwk>NGPD+kN}p7
B6EFY(

diff --git a/data/final_energy_map_v7.2.rda b/data/final_energy_map_v7.2.rda
index e33d76b5c5ac41e0a714c0e0f971940b6f870fb5..567af995ed391e5d29bb9203114b06464598b9e4 100644
GIT binary patch
literal 3163
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
Bq!|DJ

literal 3202
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

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