diff --git a/fedelemflowlist/flowmapping/eLCI.csv b/fedelemflowlist/flowmapping/eLCI.csv
index 7bf36859..1d285684 100644
--- a/fedelemflowlist/flowmapping/eLCI.csv
+++ b/fedelemflowlist/flowmapping/eLCI.csv
@@ -2300,7 +2300,7 @@ eLCI,"NMVOC, non-methane volatile organic compounds, unspecified origin",,emissi
 eLCI,"VOC, volatile organic compounds, unspecified origin",,emission/air,kg,=,1,Volatile organic compounds,6f861846-1c4c-3fc9-a198-56b2d9abd83b,emission/air,kg,Hottle,Edelen,2/5/2020
 eLCI,"NMVOC, non-methane volatile organic compounds, unspecified ",,emission/air,kg,=,1,Volatile organic compounds,6f861846-1c4c-3fc9-a198-56b2d9abd83b,emission/air,kg,Hottle,Edelen,2/5/2020
 eLCI,"NMVOC, non-methane volatile organic compounds, unspecified",,emission/air,kg,=,1,Volatile organic compounds,6f861846-1c4c-3fc9-a198-56b2d9abd83b,emission/air,kg,Hottle,Edelen,2/10/2020
-eLCI,"water, fresh",,resource,m3,=,1000.0,"Water, fresh",8ba7dd57-b502-397b-944a-f63c6615f754,resource/water,kg,Hottle,Edelen,2/5/2020
+eLCI,"water, fresh",,resource,m3,=,1000,"Water, fresh",8ba7dd57-b502-397b-944a-f63c6615f754,resource/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Fresh water,,resource,kg,=,1,"Water, fresh",8ba7dd57-b502-397b-944a-f63c6615f754,resource/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Ground water,,resource,kg,=,1,"Water, fresh",8ba7dd57-b502-397b-944a-f63c6615f754,resource/water,kg,Hottle,Edelen,2/5/2020
 eLCI,"Ground water, regionalized, AU",,resource,kg,=,1,"Water, fresh",8ba7dd57-b502-397b-944a-f63c6615f754,resource/water,kg,Hottle,Edelen,2/5/2020
@@ -2872,11 +2872,11 @@ eLCI,Total organic carbon ,,emission/air,kg,=,1,Total Organic Carbon,2f1ba44b-e6
 eLCI,Triethylene glycol,,emission/water,kg,=,1,Triethylene glycol,e8504f5c-8ad1-33e2-81cc-f46d5fb5018a,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Tungsten,,emission/water,kg,=,1,Tungsten,2e3e37e5-3662-3cb5-8d6d-626337fe83cf,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Uranium,,emission/ground,kg,=,1,Uranium,c622a929-bd96-3d1a-817c-9fd0086fe9b2,emission/ground,kg,Jamieson,Edelen,2/21/2020
-eLCI,Uranium [Radioactive emissions to industrial soil],,NETL database/emissions,kBq,=,8.3e-05,Uranium,c622a929-bd96-3d1a-817c-9fd0086fe9b2,emission/ground,kg,Hottle,Edelen,2/10/2020
+eLCI,Uranium [Radioactive emissions to industrial soil],,NETL database/emissions,kBq,=,8.30E-05,Uranium,c622a929-bd96-3d1a-817c-9fd0086fe9b2,emission/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium,,emission/water,kg,=,1,Uranium,a63a9c73-2fe4-3679-93c2-28b6f7fb8915,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Uranium (U238),,emission/water,kg,=,1,Uranium,a63a9c73-2fe4-3679-93c2-28b6f7fb8915,emission/water,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium (total),,emission/water,kg,=,1,Uranium,a63a9c73-2fe4-3679-93c2-28b6f7fb8915,emission/water,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium-238,,emission/water,kBq,=,8.3e-05,Uranium,a63a9c73-2fe4-3679-93c2-28b6f7fb8915,emission/water,kg,Hottle,Edelen,2/5/2020
+eLCI,Uranium-238,,emission/water,kBq,=,8.30E-05,Uranium,a63a9c73-2fe4-3679-93c2-28b6f7fb8915,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Yttrium,,emission/water,kg,=,1,Yttrium,5f38d379-fe5b-354c-83b3-cba734266e82,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Zinc,,emission/water,kg,=,1,Zinc,41f104ab-8f49-3924-9b57-98ed81cd54a0,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Zinc chloride,,emission/air,kg,=,1,Zinc chloride,751bac95-6705-39b4-a9c9-3d394a5eaaa8,emission/air,kg,Jamieson,Edelen,2/21/2020
@@ -3219,7 +3219,7 @@ eLCI,"Water (groundwater from technosphere, waste water)",,emission/water,kg,=,1
 eLCI,Water (process water) [Operating materials],,NETL database/emissions,kg,=,1,Water,96054103-8509-3049-a638-c4d13cc707cc,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Water [Operating materials],,NETL database/emissions,kg,=,1,Water,96054103-8509-3049-a638-c4d13cc707cc,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Water,,emission/water,kg,=,1,Water,96054103-8509-3049-a638-c4d13cc707cc,emission/water,kg,Jamieson,Edelen,2/21/2020
-eLCI,Water (river water from technosphere turbined),,emission/water,m3,=,1000.0,Water,96054103-8509-3049-a638-c4d13cc707cc,emission/water,kg,Hottle,Edelen,2/5/2020
+eLCI,Water (river water from technosphere turbined),,emission/water,m3,=,1000,Water,96054103-8509-3049-a638-c4d13cc707cc,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,"Copper - Gold - Ore (1,07% Cu; 0,54 g/t Au)",,resource,kg,=,1,Copper ore,b11d9d11-6356-3680-a898-7e15eb5cd669,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,"Copper - Gold - Silver - ore (0,51% Cu; 0,6 g/t Au; 1,5 g/t Ag)",,resource,kg,=,1,Copper ore,b11d9d11-6356-3680-a898-7e15eb5cd669,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,"Copper - Gold - Silver - ore (1,0% Cu; 0,4 g/t Au; 66 g/t Ag)",,resource,kg,=,1,Copper ore,b11d9d11-6356-3680-a898-7e15eb5cd669,resource/ground,kg,Hottle,Edelen,2/10/2020
@@ -3372,9 +3372,9 @@ eLCI,Heptane (isomers),,emission/air,kg,=,1,Heptane,9a2c8196-dc6a-3ee0-868d-4278
 eLCI,Heptane,,emission/air,kg,=,1,Heptane,9a2c8196-dc6a-3ee0-868d-4278ac51a46f,emission/air,kg,Jamieson,Edelen,2/21/2020
 eLCI,Hexamethylene diamine (HMDA),,emission/air,kg,=,1,Hexamethylenediamine,48266a38-cc1b-3448-a058-2521390e8ff2,emission/air,kg,Hottle,Edelen,2/10/2020
 eLCI,Hexamethylene diamine,,emission/air,kg,=,1,Hexamethylenediamine,48266a38-cc1b-3448-a058-2521390e8ff2,emission/air,kg,Hottle,Edelen,2/5/2020
-eLCI,High radioactive waste,,emission/ground,kg,=,42016806722689.08,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
-eLCI,Low radioactive wastes,,emission/ground,kg,=,42016806722689.08,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
-eLCI,Medium radioactive wastes,,emission/ground,kg,=,42016806722689.08,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
+eLCI,High radioactive waste,,emission/ground,kg,=,4.20E+13,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
+eLCI,Low radioactive wastes,,emission/ground,kg,=,4.20E+13,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
+eLCI,Medium radioactive wastes,,emission/ground,kg,=,4.20E+13,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,4/6/2020
 eLCI,Radionuclide,,emission/ground,kBq,=,1,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,,2/10/2020
 eLCI,Radionuclide [Emissions to industrial soil],,NETL database/emissions,kBq,=,1,Radionuclides,10261eb6-4546-3b80-93df-9d514f5d3e31,emission/ground,kBq,Hottle,Edelen,2/10/2020
 eLCI,Hydrocarbons (unspecified),,emission/ground,kg,=,1,Hydrocarbons,182b44a1-6470-3848-a6c3-a68810b726d6,emission/ground,kg,Hottle,Edelen,2/10/2020
@@ -3391,8 +3391,8 @@ eLCI,Hydrocyanic acid,,emission/air,kg,=,1,Hydrogen cyanide,aa7539ee-9aeb-3cb5-9
 eLCI,Hydrogen cyanide (prussic acid),,emission/water,kg,=,1,Hydrogen cyanide,db989bb6-a79a-35b1-aee9-2db77f60875a,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Hydrocyanic acid,,emission/water,kg,=,1,Hydrogen cyanide,db989bb6-a79a-35b1-aee9-2db77f60875a,emission/water,kg,Hottle,Edelen,2/10/2020
 eLCI,Hydrogen iodide,,emission/air,kg,=,1,Hydriodic acid,8aec1626-a25f-3cb6-a102-670bc1a14863,emission/air,kg,Hottle,Edelen,2/5/2020
-eLCI,"Hydrogen-3, Tritium",,emission/air,kg,=,359712230215827.3,Tritium,58f54817-71a6-30c8-a2dc-ed7de941afdd,emission/air,kBq,Hottle,,2/5/2020
-eLCI,"Hydrogen-3, Tritium",,emission/water,kg,=,359712230215827.3,Tritium,9e480e1c-719e-3284-9e0c-e7587e264c6b,emission/water,kBq,Hottle,,2/5/2020
+eLCI,"Hydrogen-3, Tritium",,emission/air,kg,=,3.60E+14,Tritium,58f54817-71a6-30c8-a2dc-ed7de941afdd,emission/air,kBq,Hottle,,2/5/2020
+eLCI,"Hydrogen-3, Tritium",,emission/water,kg,=,3.60E+14,Tritium,9e480e1c-719e-3284-9e0c-e7587e264c6b,emission/water,kBq,Hottle,,2/5/2020
 eLCI,Ilmenite (titanium ore),,resource,kg,=,1,Ilmenite,94d7e0ed-c5c2-36ef-bf30-b393b143a0f1,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Ilmenite (titanium ore) [Non renewable resources],,NETL database/resources,kg,=,1,Ilmenite,94d7e0ed-c5c2-36ef-bf30-b393b143a0f1,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Inden,,emission/air,kg,=,1,Indene,f7a3085d-b4bd-3e70-b14e-894381987c85,emission/air,kg,Hottle,Edelen,2/26/2020
@@ -3421,7 +3421,7 @@ eLCI,Lead-210,,emission/air,kBq,=,1,Lead-210,e20f518e-1e27-386a-8711-7b364a9390c
 eLCI,"Lead - Zinc - Silver - ore (5,49% Pb; 12,15% Zn; 57,4 gpt Ag)",,resource,kg,=,1,Lead ore,9e2e9b02-a9b1-3f39-80cf-20f0d6da484e,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,"Lead - Zinc - Silver - ore (5,49% Pb; 12,15% Zn; 57,4 gpt Ag) [Non renewable resources]",,NETL database/resources,kg,=,1,Lead ore,9e2e9b02-a9b1-3f39-80cf-20f0d6da484e,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Lead - zinc ore (4.6%-0.6%) [Non renewable resources],,NETL database/resources,kg,=,1,Lead ore,9e2e9b02-a9b1-3f39-80cf-20f0d6da484e,resource/ground,kg,Hottle,Edelen,2/10/2020
-eLCI,Lead-210/kg,,emission/water,kg,=,2801120448179.271,Lead-210,5c8aca95-6eb3-3b26-83d0-838936066653,emission/water,kBq,Hottle,,2/5/2020
+eLCI,Lead-210/kg,,emission/water,kg,=,2.80E+12,Lead-210,5c8aca95-6eb3-3b26-83d0-838936066653,emission/water,kBq,Hottle,,2/5/2020
 eLCI,Lignite (in MJ),,resource,MJ,=,1,"Coal, lignite",de2f54e4-dbbe-3850-a341-c6d921dbfdec,resource/ground,MJ,Hottle,Edelen,2/5/2020
 eLCI,Lignite (in kg),,resource,kg,=,14.005602,"Coal, lignite",de2f54e4-dbbe-3850-a341-c6d921dbfdec,resource/ground,MJ,Hottle,Edelen,2/5/2020
 eLCI,Lignite Australia,,resource,kg,=,14.005602,"Coal, lignite",de2f54e4-dbbe-3850-a341-c6d921dbfdec,resource/ground,MJ,Hottle,Edelen,2/5/2020
@@ -3631,7 +3631,7 @@ eLCI,Silicon,,resource,kg,=,1,Silicon,d56ecf74-2408-37b4-9856-0064a02026a1,resou
 eLCI,Silicon [Non renewable elements],,NETL database/resources,kg,=,1,Silicon,d56ecf74-2408-37b4-9856-0064a02026a1,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Silicon dioxide (silica),,emission/water,kg,=,1,Silica,9d1be6fc-6398-35e9-8179-20182c429610,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,Silicon Dioxide,,emission/water,kg,=,1,Silica,9d1be6fc-6398-35e9-8179-20182c429610,emission/water,kg,Hottle,Edelen,2/10/2020
-eLCI,Silver (Ag110m),,emission/water,kg,=,179856115107913.66,Silver-110,dbd3853e-af15-36e9-aab2-3bf918264f66,emission/water,kBq,Hottle,,4/6/2020
+eLCI,Silver (Ag110m),,emission/water,kg,=,1.80E+14,Silver-110,dbd3853e-af15-36e9-aab2-3bf918264f66,emission/water,kBq,Hottle,,4/6/2020
 eLCI,Silver-110,,emission/water,kBq,=,1,Silver-110,dbd3853e-af15-36e9-aab2-3bf918264f66,emission/water,kBq,Jamieson,Edelen,2/21/2020
 eLCI,Slate,,resource,kg,=,1,Slate,87ec5bd0-9a73-3041-a9eb-3837b3974084,resource/ground,kg,Hottle,Edelen,2/5/2020
 eLCI,Slate [Non renewable resources],,NETL database/resources,kg,=,1,Slate,87ec5bd0-9a73-3041-a9eb-3837b3974084,resource/ground,kg,Hottle,Edelen,2/10/2020
@@ -3707,14 +3707,14 @@ eLCI,Uranium-235,,emission/water,kBq,=,1,Uranium-235,3c817988-581c-39d4-9117-1bf
 eLCI,Uranium (U238),,emission/air,kg,=,1,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium (total),,emission/air,kg,=,1,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium,,emission/air,kg,=,1,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Jamieson,Edelen,2/21/2020
-eLCI,Uranium (total) [Radioactive emissions to air],,NETL database/emissions,kBq,=,8.3e-05,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium-238,,emission/air,kBq,=,8.3e-05,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/5/2020
+eLCI,Uranium (total) [Radioactive emissions to air],,NETL database/emissions,kBq,=,8.30E-05,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/10/2020
+eLCI,Uranium-238,,emission/air,kBq,=,8.30E-05,Uranium,e10e86a1-fd6a-3ac5-a822-55762e8ae99d,emission/air,kg,Hottle,Edelen,2/5/2020
 eLCI,Uranium free ore,,resource,kg,=,1,Gangue,4d1e4708-089f-38b8-93c3-577387828162,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,Spoil (deposited),,resource,kg,=,1,Gangue,4d1e4708-089f-38b8-93c3-577387828162,resource/ground,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium natural (in MJ),,resource,MJ,=,2e-06,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/5/2020
+eLCI,Uranium natural (in MJ),,resource,MJ,=,2.00E-06,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/5/2020
 eLCI,"Uranium, in ground",,resource,kg,=,1,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,,3/10/2020
 eLCI,Uranium free ore [Uranium (resource)],,NETL database/resources,kg,=,1,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium natural (in MJ) [Uranium (resource)],,NETL database/resources,MJ,=,2e-06,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/10/2020
+eLCI,Uranium natural (in MJ) [Uranium (resource)],,NETL database/resources,MJ,=,2.00E-06,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,"Uranium, in ground [Uranium (resource)]",,NETL database/resources,kg,=,1,Uranium,af4664da-60f0-31e5-83ba-0d2518959c5b,resource/ground,kg,Hottle,Edelen,2/10/2020
 eLCI,"Uranium oxide (U3O8), 332 GJ per kg, in ore",,resource,kg,=,332000,Uranium oxide,17f224af-6c5a-39df-892e-ea4c10be928a,resource/ground,MJ,Hottle,Edelen,2/5/2020
 eLCI,"Uranium oxide (U3O8), 332 GJ per kg, in ore [Uranium (resource)]",,NETL database/resources,kg,=,332000,Uranium oxide,17f224af-6c5a-39df-892e-ea4c10be928a,resource/ground,MJ,Hottle,Edelen,2/10/2020
@@ -4202,10 +4202,10 @@ eLCI,"Total organic carbon, TOC (Ecoinvent) [ecoinvent long-term to fresh water]
 eLCI,Total organic bound carbon (TOC) [Analytical measures to sea water],,NETL database/emissions,kg,=,1,Total Organic Carbon,250ac737-b4e4-3288-8ce9-f75f1b70db1f,emission/water/saline water body,kg,Hottle,Edelen,2/10/2020
 eLCI,Unspecified Iron Oxides [Inorganic emissions to fresh water],,NETL database/emissions,kg,=,1,Iron oxide,f2ea9499-e58a-3ba1-9f88-c57b96dac6d7,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
 eLCI,Unspecified Solids (Suspended) [Inorganic emissions to fresh water],,NETL database/emissions,kg,=,1,"Suspended solids, inorganic",a8b6b039-3cb4-3f3f-a505-ac4d982d69d0,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium (U238) [Radioactive emissions to fresh water],,NETL database/emissions,kBq,=,8.3e-05,Uranium,7140c7dc-59e5-3bb2-8937-425a262b34f1,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
+eLCI,Uranium (U238) [Radioactive emissions to fresh water],,NETL database/emissions,kBq,=,8.30E-05,Uranium,7140c7dc-59e5-3bb2-8937-425a262b34f1,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium (total) [Emissions to fresh water],,NETL database/emissions,kg,=,1,Uranium,7140c7dc-59e5-3bb2-8937-425a262b34f1,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
 eLCI,Uranium [Heavy metals to fresh water],,NETL database/emissions,kg,=,1,Uranium,7140c7dc-59e5-3bb2-8937-425a262b34f1,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
-eLCI,Uranium (U238) [Radioactive emissions to sea water],,NETL database/emissions,kBq,=,8.3e-05,Uranium,7825a844-a58a-3f10-8a30-fcbc851d5dd6,emission/water/saline water body,kg,Hottle,Edelen,2/10/2020
+eLCI,Uranium (U238) [Radioactive emissions to sea water],,NETL database/emissions,kBq,=,8.30E-05,Uranium,7825a844-a58a-3f10-8a30-fcbc851d5dd6,emission/water/saline water body,kg,Hottle,Edelen,2/10/2020
 eLCI,VOC (unspecified) [Hydrocarbons to fresh water],,NETL database/emissions,kg,=,1,Volatile organic compounds,6a1916f0-c6d9-36b9-a86e-7b5a3bffaf32,emission/water/fresh water body,kg,Hottle,Edelen,2/10/2020
 eLCI,Vanadium (+III) [Heavy metals to air],,NETL database/emissions,kg,=,1,Vanadium(III),0387b6af-2916-3037-a697-7f9db79856ed,emission/air,kg,Hottle,Edelen,2/10/2020
 eLCI,"Vanadium, ion [Deposited goods]",,NETL database/emissions,kg,=,1,Vanadium(V),1fa8e0d1-75b1-375f-bcbb-b1ec6f49c6b9,emission/ground,kg,Hottle,Edelen,2/10/2020
@@ -4224,10 +4224,75 @@ eLCI,Decane,,emission/water,kg,=,1,Decane,0c8c9877-5938-36dd-910b-48daed6913e1,e
 eLCI,Furans,,emission/water,kg,=,1,Furans,22031c64-cc11-3d96-835b-02e9d08a349f,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,Phthalic Acid,,emission/air,kg,=,1,Phthalic acid,69651d2f-6c0b-305f-a0b4-a61ac0fdd1b9,emission/air,kg,Jamieson,Edelen,2/21/2020
 eLCI,Sulfate,,emission/air,kg,=,1,Sulfate,91135754-4694-3e21-977b-9f7e352fba00,emission/air,kg,Jamieson,Edelen,2/21/2020
-eLCI,Thorium-232,,emission/air,kg,=,4000.0,Thorium-232,14e72c98-7d68-323f-8ec6-4cc91aa22c78,emission/air,kBq,Jamieson,,2/21/2020
+eLCI,Thorium-232,,emission/air,kg,=,4000,Thorium-232,14e72c98-7d68-323f-8ec6-4cc91aa22c78,emission/air,kBq,Jamieson,,2/21/2020
 eLCI,"Water, saline",,emission/water,kg,=,1,"Water, saline",55222571-f94b-36fd-b74a-4e32219dfe2f,emission/water,kg,Jamieson,Edelen,2/21/2020
 eLCI,"Aluminum, ion",,emission/water,kg,=,1,Aluminum(III),ad176e5a-7abc-380d-a365-f17d52bf6584,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,"Phenol compounds, unspecified",,emission/water,kg,=,1,Phenols,12812f0a-dd3e-3a55-b1fc-9fc7d5ea994f,emission/water,kg,Hottle,Edelen,2/5/2020
 eLCI,"Toluene, vinyl",,emission/air,kg,=,1,Vinyltoluene,926e6e98-b7ed-38f3-9873-93aeaf5f33e6,emission/air,kg,Hottle,Edelen,2/5/2020
 eLCI,Chlorides,,emission/water,kg,<,1,"Chlorides and sulfates, total",1fd6ca1f-26bf-3d26-8170-55746d2e2522,emission/water,kg,Hottle,Young,2/10/2020
 eLCI,Tetrachloroethene,,emission/air,kg,=,1,Tetrachloroethane,5e5215d6-2374-38ee-b26d-3a128f2e6ecd,emission/air,kg,Hottle,Edelen,2/10/2020
+eLCI,Aluminum,,emission/ground,kg,=,1,Aluminum,ce7ca5a4-4642-3f68-b2e6-61853872844d,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Ammonium,,emission/ground,kg,=,1,Ammonium,c912dddb-589b-335b-bb1c-16c36b0d3e21,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Arsenic,,emission/ground,kg,=,1,Arsenic,e96ce1ce-5cda-3807-9d86-3735e1c79fa9,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Barium,,emission/ground,kg,=,1,Barium,e55533b3-325c-3b5a-968e-d916c37e3652,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Berylium,,emission/ground,kg,=,1,Beryllium,da0f6c12-b6ba-366a-8d62-4e373f300ffa,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Bicarbonate,,emission/ground,kg,=,1,Bicarbonate,1208f3d7-8e09-3e47-9fa8-cbef9b54253d,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Boron,,emission/ground,kg,=,1,Boron,78e348a1-4f2b-3c1b-9edc-a36b7b0af531,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Bromine,,emission/ground,kg,=,1,Bromine,98ff9077-502a-39b9-87fe-5c7465307ef5,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Cyanide,,emission/ground,kg,=,1,Cyanide,6d4f326f-f8bb-3f79-a350-23db9ba95a53,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Fluorine,,emission/ground,kg,=,1,Fluorine,50550d21-3283-376f-8beb-a64f36521466,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Iodine,,emission/ground,kg,=,1,Iodine,2f81e068-0e22-375b-9f95-99f46a757f21,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Lithium,,emission/ground,kg,=,1,Lithium,d989d2b9-fa3f-3b64-805d-f4bb267c9a0e,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,nitrate-nitrite,,emission/ground,kg,=,1,Nitrate,d6d40356-2c5c-3ae0-89a9-fec2a41f07b2,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Nitrite,,emission/ground,kg,=,1,Nitrite,ec1e5b2d-d3c6-31b7-9782-a5604248a90c,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Phenols,,emission/ground,kg,=,1,Phenols,d0527c98-4239-332b-83f9-58ff59a84047,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Radium 226,,emission/ground,kg,=,1,Radium-226,960f54af-e598-3e31-a338-18f169860eed,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Radium 228,,emission/ground,kg,=,1,Radium-228,c10072c0-289d-30f7-affa-8422637c9c5b,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Silicon,,emission/ground,kg,=,1,Silicon,d13b421a-8f69-3f80-98f8-fdf507df717f,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Silver,,emission/ground,kg,=,1,Silver,8d7944f4-3acf-3f76-9aec-b11b0173a2a7,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Strontium 87 or 86,,emission/ground,kg,=,1,Strontium,4ac6cdf2-e742-3dfd-bde7-af7567bc4e35,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Sulfate,,emission/ground,kg,=,1,Sulfate,9cf42314-fd4f-358e-8fe2-58f3c0c8b478,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Sulfite,,emission/ground,kg,=,1,Sulfite,0a0e1672-e580-32df-a662-3fe7a1c8f6ce,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Titanium,,emission/ground,kg,=,1,Titanium,9ead7a1d-e02d-3fc5-aefb-a081e974e914,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Iron,,emission/ground,kg,=,1,Iron,106f9639-cbb0-3fc8-8a6b-8fcc40f3111e,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total organic carbon,,emission/ground,kg,=,1,Total Organic Carbon,1f466816-2538-329a-86fb-8bee31cabba1,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Suspended Solids ,,emission/ground,kg,=,1,"Suspended solids, inorganic",60c584ff-104f-3007-8ae7-b04b7ec6af49,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Ammonium,,emission/water,kg,=,1,Ammonium,d9134087-d959-37a7-b2b0-6c8a620f4c4d,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Berylium,,emission/water,kg,=,1,Beryllium,c00fa432-1dcc-3bf3-870f-4043c05cc887,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Iodine,,emission/water,kg,=,1,Iodine,c60dcead-4e5d-3463-97d8-be23d09bc504,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,nitrate-nitrite,,emission/water,kg,=,1,Nitrate,3b5d9ccd-0ce5-37ca-8865-c0e1863b405d,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Oil and Grease,,emission/water,kg,=,1,"Total oil and grease, less total petroleum hydrocarbons (TPH)",3349b083-3e67-3533-8b77-ffb62f9f22d4,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Phenols,,emission/water,kg,=,1,Phenols,12812f0a-dd3e-3a55-b1fc-9fc7d5ea994f,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Radium 226,,emission/water,kg,=,1,Radium-226,643aef04-de1f-3c91-a4d8-71f164dbe30f,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Radium 228,,emission/water,kg,=,1,Radium-228,02ee8bfe-ea2c-3dfd-944d-53bd8c43a42a,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Strontium 87 or 86,,emission/water,kg,=,1,Strontium,42904b8f-ac78-3e54-8774-2d117b505a09,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total ammonia,,emission/water,kg,=,1,Ammonia,2d117fdd-370d-331c-b07c-b0172c4a10ef,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total dissolved organic carbon,,emission/water,kg,=,1,Total Organic Carbon,cbf6df8e-c4a2-3920-a97a-2238ccb7bc6c,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Iron,,emission/water,kg,=,1,Iron,2b61d376-c8c2-31ae-9c19-9b8b958c74dd,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Kjedahl Nitrogen,,emission/water,kg,=,1,Nitrogen,d4625608-6ef8-3ce6-bfa4-0f96f3535e23,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total organic carbon,,emission/water,kg,=,1,Total Organic Carbon,cbf6df8e-c4a2-3920-a97a-2238ccb7bc6c,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Phosphorous,,emission/water,kg,=,1,Phosphorus,1733622b-b54a-3202-8e58-4670a96ef6b3,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,"1,3-Butadiene",,emission/air,kg,=,1,"1,3-Butadiene",457411b2-4dac-3eb2-965d-97b60660afa2,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,2-Methyl Naphthalene,,emission/air,kg,=,1,2-Methylnaphthalene,5f3bb2ec-d153-3cb5-9bc1-3eef8f44bf67,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Acentaphthene,,emission/air,kg,=,1,Acenaphthene,43aed9d7-5a9b-3f3e-8d51-cc8bebd9a9a1,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Black carbon,,emission/air,kg,=,1,Carbon black,34e3e9d7-a951-3525-a73b-cfb3f74dbe97,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Chromium (unspecified),,emission/air,kg,=,1,Chromium,98bd36e1-fbe4-32ee-ba78-3b6726917c9b,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,"Dichlorobenzene (m-DCB; 1,3-Dichlorobenzene)",,emission/air,kg,=,1,m-Dichlorobenzene,54f426c2-5eb6-3d54-99e6-41cfa6d6e715,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Ethylendichloride,,emission/air,kg,=,1,"1,2-Dichloroethane",c2d517e6-4c5d-3002-8a0d-54434c5a3bae,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Hydrogen sulphide ,,emission/air,kg,=,1,Hydrogen sulfide,f8cbcd43-8201-3b05-b19a-82d305414af4,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,iso-Butyraldehyde,,emission/air,kg,=,1,Isobutyraldehyde,1ed39c7d-b21c-3a99-9059-6a8d14a73489,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Nickel (+II),,emission/air,kg,=,1,Nickel(II),3b7209a0-e9df-3308-a096-0ee2a8712dfe,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Polycyclic aromatic hydrocarbons (carcinogenic),,emission/air,kg,=,1,Polycyclic aromatic hydrocarbons,3bf6bb55-a2d2-36a1-988c-3caf0d73baf9,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Sulfur trioxide,,emission/air,kg,=,1,Sulfur trioxide,e7db2838-8512-3079-a3fc-bd3361d22943,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Vanadium (+III),,emission/air,kg,=,1,Vanadium,7e3145d3-a1a3-36d0-ae11-d380127cde8b,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Aldehyde (unspecified) ,,emission/air,kg,=,1,"Aldehydes, unspecified",69bf1b3e-8c8f-3ade-b0a1-1ab051a8496e,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Benzo{e}anthracene ,,emission/air,kg,=,1,Benz[a]anthracene,248c35a7-7964-3f7b-aff8-9f29e983835e,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Dimethylbenz(a)anthracene ,,emission/air,kg,=,1,"7,12-Dimethylbenz[a]anthracene",675d27f1-91b6-3a26-b747-2d8f5fdfa02f,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Hydrogen sulphide ,,emission/air,kg,=,1,Hydrogen sulfide,f8cbcd43-8201-3b05-b19a-82d305414af4,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Indeno,,emission/air,kg,=,1,"Indeno[1,2,3-cd]pyrene",e962ef47-cedd-36b6-b962-abacbab62a02,emission/air,kg,Hanna,Henriksen,12/5/2025
+eLCI,Phosphate ,,emission/ground,kg,=,1,Orthophosphate,a068de64-a23b-3f9b-859b-f0e31614fe56,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Thalium ,,emission/ground,kg,=,1,Thallium,b6b8acf7-f3e2-3146-9a49-01a3530cd850,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Total Kjedahl Nitrogen ,,emission/ground,kg,=,1,Nitrogen,11a87634-d3a9-31a9-bd33-8d60b9f0f4d4,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Thalium ,,emission/water,kg,=,1,Thallium,6051a1f6-90e3-3231-b4e6-fdd69c961129,emission/water,kg,Hanna,Henriksen,12/5/2025
+eLCI,Alkalinity ,,emission/ground,kg,=,1,Calcium carbonate,74273558-eaf4-3a18-9699-2e27cfee147f,emission/ground,kg,Hanna,Henriksen,12/5/2025
+eLCI,Alkalinity ,,emission/water,kg,=,1,Calcium carbonate,2849da1c-036f-3b74-a007-5a102cf375a1,emission/water,kg,Hanna,Henriksen,12/5/2025
diff --git a/wiki/resources/FEDEFLcontexts.xlsx b/wiki/resources/FEDEFLcontexts.xlsx
index 2f861d81..afd57e6d 100644
Binary files a/wiki/resources/FEDEFLcontexts.xlsx and b/wiki/resources/FEDEFLcontexts.xlsx differ