diff --git a/dev/Untitled.ipynb b/dev/Untitled.ipynb
index 713eee8e..2a639785 100644
--- a/dev/Untitled.ipynb
+++ b/dev/Untitled.ipynb
@@ -12,6 +12,24 @@
     "bw.projects.set_current(\"ei39\")"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "e2a2dd03-d36a-462c-afc7-71fc24127353",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Cache folder cleared!\n"
+     ]
+    }
+   ],
+   "source": [
+    "clear_cache()"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 2,
@@ -22,8 +40,10 @@
     "scenarios = [\n",
     "    #{\"model\": \"image\", \"pathway\":\"SSP1-RCP19\", \"year\": 2050, \"filepath\":\"/Users/romain/Documents\"},\n",
     "    {\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2020,},\n",
-    "    {\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2060,},\n",
-    "    #{\"model\": \"remind\", \"pathway\":\"SSP1-PkBudg500\", \"year\": 2050,},\n",
+    "    {\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2040,},\n",
+    "    #{\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2060,},\n",
+    "    #{\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2080,},\n",
+    "    {\"model\": \"message\", \"pathway\":\"SSP2-Base\", \"year\": 2100,},\n",
     "]"
    ]
   },
@@ -76,6 +96,316 @@
       "Done!\n",
       "\n",
       "////////////////// IMPORTING DEFAULT INVENTORIES ///////////////////\n",
+      "Cannot find cached inventories. Will create them now for next time...\n",
+      "Importing default inventories...\n",
+      "\n",
+      "Extracted 1 worksheets in 0.11 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 7 worksheets in 0.03 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.17 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.45 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "The following datasets to import already exist in the source database. They will not be imported\n",
+      "+----------------------------------------------------+--------------------------------+----------+-------------+\n",
+      "|                        Name                        |       Reference product        | Location |     File    |\n",
+      "+----------------------------------------------------+--------------------------------+----------+-------------+\n",
+      "|          fluorspar production, 97% purity          |     fluorspar, 97% purity      |   GLO    | lci-PV.xlsx |\n",
+      "|     metallization paste production, back side      | metallization paste, back side |   RER    | lci-PV.xlsx |\n",
+      "| metallization paste production, back side, alumini | metallization paste, back side |   RER    | lci-PV.xlsx |\n",
+      "|     metallization paste production, front side     | metallization paste, front sid |   RER    | lci-PV.xlsx |\n",
+      "| photovoltaic module production, building-integrate | photovoltaic module, building- |   RER    | lci-PV.xlsx |\n",
+      "| photovoltaic module production, building-integrate | photovoltaic module, building- |   RER    | lci-PV.xlsx |\n",
+      "| photovoltaic mounting system production, for facad | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
+      "| photovoltaic mounting system production, for flat- | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
+      "| photovoltaic mounting system production, for slant | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
+      "|      photovoltaic panel factory construction       |   photovoltaic panel factory   |   GLO    | lci-PV.xlsx |\n",
+      "|            polyvinylfluoride production            |       polyvinylfluoride        |    US    | lci-PV.xlsx |\n",
+      "|      polyvinylfluoride production, dispersion      | polyvinylfluoride, dispersion  |    US    | lci-PV.xlsx |\n",
+      "|         polyvinylfluoride, film production         |    polyvinylfluoride, film     |    US    | lci-PV.xlsx |\n",
+      "|      silicon production, metallurgical grade       |  silicon, metallurgical grade  |    NO    | lci-PV.xlsx |\n",
+      "|             vinyl fluoride production              |         vinyl fluoride         |    US    | lci-PV.xlsx |\n",
+      "|             wafer factory construction             |         wafer factory          |    DE    | lci-PV.xlsx |\n",
+      "+----------------------------------------------------+--------------------------------+----------+-------------+\n",
+      "Extracted 1 worksheets in 0.05 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "The following datasets to import already exist in the source database. They will not be imported\n",
+      "+----------------------------------------------------+--------------------------------+----------+---------------------------------------------------+\n",
+      "|                        Name                        |       Reference product        | Location |                        File                       |\n",
+      "+----------------------------------------------------+--------------------------------+----------+---------------------------------------------------+\n",
+      "| carbon dioxide, captured at cement production plan | carbon dioxide, captured and r |   RER    | lci-synfuels-from-methanol-from-cement-plant.xlsx |\n",
+      "+----------------------------------------------------+--------------------------------+----------+---------------------------------------------------+\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "The following datasets to import already exist in the source database. They will not be imported\n",
+      "+----------------------------------------------------+----------------------+----------+-------------------------------------------+\n",
+      "|                        Name                        |  Reference product   | Location |                    File                   |\n",
+      "+----------------------------------------------------+----------------------+----------+-------------------------------------------+\n",
+      "| methanol distillation, hydrogen from coal gasifica |  methanol, purified  |   RER    | lci-synfuels-from-methanol-from-coal.xlsx |\n",
+      "| methanol synthesis, hydrogen from coal gasificatio | methanol, unpurified |   RER    | lci-synfuels-from-methanol-from-coal.xlsx |\n",
+      "+----------------------------------------------------+----------------------+----------+-------------------------------------------+\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 4 worksheets in 0.30 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.03 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.09 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Migrating to 3.8 first\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Applying strategy: migrate_datasets\n",
+      "Applying strategy: migrate_exchanges\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.02 seconds\n",
+      "Remove uncertainty data.\n",
+      "Extracted 1 worksheets in 0.01 seconds\n",
+      "Remove uncertainty data.\n",
+      "Done!\n",
+      "\n",
+      "Data cached. It is advised to restart your workflow at this point.\n",
+      "This allows premise to use the cached data instead, which results in\n",
+      "a faster workflow.\n",
       "Done!\n",
       "\n",
       "/////////////////////// EXTRACTING IAM DATA ////////////////////////\n",
@@ -107,6 +437,14 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
+      "`update_all()` will skip the following steps:\n",
+      "update_two_wheelers(), update_cars(), and update_buses()\n",
+      "If you want to update these steps, please run them separately afterwards.\n",
+      "\n",
+      "////////////////// MEDIUM AND HEAVY DUTY TRUCKS ////////////////////\n",
+      "No truck transport markets found in IAM data. Skipping.\n",
+      "No truck transport markets found in IAM data. Skipping.\n",
+      "No truck transport markets found in IAM data. Skipping.\n",
       "\n",
       "/////////////////////////// ELECTRICITY ////////////////////////////\n",
       "Adjust efficiency and emissions of coal power plants...\n",
@@ -120,22 +458,22 @@
       "Create low voltage markets.\n",
       "Done!\n",
       "Adjust efficiency of power plants...\n",
-      "Rescale inventories and emissions for Biomass IGCC\n",
+      "Rescale inventories and emissions for Gas OC\n",
+      "Rescale inventories and emissions for Gas ST\n",
+      "Rescale inventories and emissions for Nuclear\n",
+      "Rescale inventories and emissions for Biomass ST\n",
       "Rescale inventories and emissions for Oil CC\n",
+      "Rescale inventories and emissions for Coal SC\n",
+      "Rescale inventories and emissions for Foil ST\n",
       "Rescale inventories and emissions for Coal IGCC CCS\n",
       "Rescale inventories and emissions for Gas CC CCS\n",
       "Rescale inventories and emissions for Coal PCU\n",
-      "Rescale inventories and emissions for Nuclear\n",
+      "Rescale inventories and emissions for Coal PC\n",
       "Rescale inventories and emissions for Gas CC\n",
-      "Rescale inventories and emissions for Coal SC\n",
+      "Rescale inventories and emissions for Coal PC CCS\n",
       "Rescale inventories and emissions for Coal IGCC\n",
-      "Rescale inventories and emissions for Foil ST\n",
-      "Rescale inventories and emissions for Gas ST\n",
-      "Rescale inventories and emissions for Gas OC\n",
       "Rescale inventories and emissions for Oil ST\n",
-      "Rescale inventories and emissions for Coal PC CCS\n",
-      "Rescale inventories and emissions for Coal PC\n",
-      "Rescale inventories and emissions for Biomass ST\n",
+      "Rescale inventories and emissions for Biomass IGCC\n",
       "Adjust efficiency and emissions of coal power plants...\n",
       "Update efficiency of solar PV panels.\n",
       "Create biomass markets.\n",
@@ -147,27 +485,205 @@
       "Create low voltage markets.\n",
       "Done!\n",
       "Adjust efficiency of power plants...\n",
-      "Rescale inventories and emissions for Biomass IGCC\n",
+      "Rescale inventories and emissions for Gas OC\n",
+      "Rescale inventories and emissions for Gas ST\n",
+      "Rescale inventories and emissions for Nuclear\n",
+      "Rescale inventories and emissions for Biomass ST\n",
       "Rescale inventories and emissions for Oil CC\n",
+      "Rescale inventories and emissions for Coal SC\n",
+      "Rescale inventories and emissions for Foil ST\n",
       "Rescale inventories and emissions for Coal IGCC CCS\n",
       "Rescale inventories and emissions for Gas CC CCS\n",
       "Rescale inventories and emissions for Coal PCU\n",
-      "Rescale inventories and emissions for Nuclear\n",
+      "Rescale inventories and emissions for Coal PC\n",
       "Rescale inventories and emissions for Gas CC\n",
-      "Rescale inventories and emissions for Coal SC\n",
+      "Rescale inventories and emissions for Coal PC CCS\n",
       "Rescale inventories and emissions for Coal IGCC\n",
-      "Rescale inventories and emissions for Foil ST\n",
-      "Rescale inventories and emissions for Gas ST\n",
-      "Rescale inventories and emissions for Gas OC\n",
       "Rescale inventories and emissions for Oil ST\n",
-      "Rescale inventories and emissions for Coal PC CCS\n",
+      "Rescale inventories and emissions for Biomass IGCC\n",
+      "Adjust efficiency and emissions of coal power plants...\n",
+      "Update efficiency of solar PV panels.\n",
+      "Create biomass markets.\n",
+      "Replace biomass inputs.\n",
+      "Create region-specific power plants.\n",
+      "Empty old electricity datasets\n",
+      "Create high voltage markets.\n",
+      "Create medium voltage markets.\n",
+      "Create low voltage markets.\n",
+      "Done!\n",
+      "Adjust efficiency of power plants...\n",
+      "Rescale inventories and emissions for Gas OC\n",
+      "Rescale inventories and emissions for Gas ST\n",
+      "Rescale inventories and emissions for Nuclear\n",
+      "Rescale inventories and emissions for Biomass ST\n",
+      "Rescale inventories and emissions for Oil CC\n",
+      "Rescale inventories and emissions for Coal SC\n",
+      "Rescale inventories and emissions for Foil ST\n",
+      "Rescale inventories and emissions for Coal IGCC CCS\n",
+      "Rescale inventories and emissions for Gas CC CCS\n",
+      "Rescale inventories and emissions for Coal PCU\n",
       "Rescale inventories and emissions for Coal PC\n",
-      "Rescale inventories and emissions for Biomass ST\n"
+      "Rescale inventories and emissions for Gas CC\n",
+      "Rescale inventories and emissions for Coal PC CCS\n",
+      "Rescale inventories and emissions for Coal IGCC\n",
+      "Rescale inventories and emissions for Oil ST\n",
+      "Rescale inventories and emissions for Biomass IGCC\n",
+      "\n",
+      "//////////////////////// DIRECT AIR CAPTURE ////////////////////////\n",
+      "No DAC markets found in IAM data. Skipping.\n",
+      "No DAC markets found in IAM data. Skipping.\n",
+      "No DAC markets found in IAM data. Skipping.\n",
+      "\n",
+      "///////////////////////////// CEMENT //////////////////////////////\n",
+      "Start integration of cement data...\n",
+      "Create new clinker production datasets and delete old datasets\n",
+      "Create new clinker market datasets and delete old datasets\n",
+      "Create new cement market datasets\n",
+      "Create new cement production datasets and adjust electricity consumption\n",
+      "Done!\n",
+      "Start integration of cement data...\n",
+      "Create new clinker production datasets and delete old datasets\n",
+      "Create new clinker market datasets and delete old datasets\n",
+      "Create new cement market datasets\n",
+      "Create new cement production datasets and adjust electricity consumption\n",
+      "Done!\n",
+      "Start integration of cement data...\n",
+      "Create new clinker production datasets and delete old datasets\n",
+      "Create new clinker market datasets and delete old datasets\n",
+      "Create new cement market datasets\n",
+      "Create new cement production datasets and adjust electricity consumption\n",
+      "Done!\n",
+      "\n",
+      "////////////////////////////// STEEL //////////////////////////////\n",
+      "Create new steel production datasets and empty old datasets\n",
+      "Create pig iron production datasets\n",
+      "Create new steel production datasets and empty old datasets\n",
+      "Create pig iron production datasets\n",
+      "Create new steel production datasets and empty old datasets\n",
+      "Create pig iron production datasets\n",
+      "\n",
+      "////////////////////////////// FUELS ///////////////////////////////\n",
+      "Generate region-specific hydrogen production pathways.\n",
+      "{'name': 'hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity', 'var': 'hydrogen, electrolysis', 'feedstock name': 'electricity, low voltage', 'feedstock unit': 'kilowatt hour', 'floor value': 48.0}\n"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/romain/GitHub/premise/premise/fuels.py:506: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n",
+      "  hydrogen_efficiency_variable\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, with CCS (MDEA, 98% eff.), 26 bar', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, 26 bar', 'var': 'hydrogen, biomass', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, 25 bar', 'var': 'hydrogen, nat. gas', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, with CCS (MDEA, 98% eff.), 25 bar', 'var': 'hydrogen, nat. gas, with CCS', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, with CCS, at gasification plant', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, at gasification plant', 'var': 'hydrogen, biomass', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, with CCS, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 100 bar, from methane pyrolysis', 'var': 'hydrogen, pyrolsis', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 6.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from thermochemical water splitting, at solar tower', 'var': 'hydrogen, solar', 'feedstock name': 'Energy, solar, converted', 'feedstock unit': 'megajoule', 'floor value': 180}\n",
+      "Generate region-specific hydrogen supply chains.\n",
+      "Generate region-specific biogas and syngas supply chains.\n",
+      "Generate region-specific synthetic fuel supply chains.\n",
+      "Generate region-specific biofuel supply chains.\n",
+      "Generate new fuel markets.\n",
+      "--> petrol, unleaded\n",
+      "--> petrol, low-sulfur\n",
+      "--> diesel, low-sulfur\n",
+      "--> diesel\n",
+      "Done!\n",
+      "Generate region-specific hydrogen production pathways.\n",
+      "{'name': 'hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity', 'var': 'hydrogen, electrolysis', 'feedstock name': 'electricity, low voltage', 'feedstock unit': 'kilowatt hour', 'floor value': 48.0}\n"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/romain/GitHub/premise/premise/fuels.py:506: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n",
+      "  hydrogen_efficiency_variable\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, with CCS (MDEA, 98% eff.), 26 bar', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, 26 bar', 'var': 'hydrogen, biomass', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, 25 bar', 'var': 'hydrogen, nat. gas', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, with CCS (MDEA, 98% eff.), 25 bar', 'var': 'hydrogen, nat. gas, with CCS', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, with CCS, at gasification plant', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, at gasification plant', 'var': 'hydrogen, biomass', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, with CCS, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 100 bar, from methane pyrolysis', 'var': 'hydrogen, pyrolsis', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 6.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from thermochemical water splitting, at solar tower', 'var': 'hydrogen, solar', 'feedstock name': 'Energy, solar, converted', 'feedstock unit': 'megajoule', 'floor value': 180}\n",
+      "Generate region-specific hydrogen supply chains.\n",
+      "Generate region-specific biogas and syngas supply chains.\n",
+      "Generate region-specific synthetic fuel supply chains.\n",
+      "Generate region-specific biofuel supply chains.\n",
+      "Generate new fuel markets.\n",
+      "--> petrol, unleaded\n",
+      "--> petrol, low-sulfur\n",
+      "--> diesel, low-sulfur\n",
+      "--> diesel\n",
+      "Done!\n",
+      "Generate region-specific hydrogen production pathways.\n",
+      "{'name': 'hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity', 'var': 'hydrogen, electrolysis', 'feedstock name': 'electricity, low voltage', 'feedstock unit': 'kilowatt hour', 'floor value': 48.0}\n"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/Users/romain/GitHub/premise/premise/fuels.py:506: FutureWarning: elementwise comparison failed; returning scalar instead, but in the future will perform elementwise comparison\n",
+      "  hydrogen_efficiency_variable\n"
+     ]
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, with CCS (MDEA, 98% eff.), 26 bar', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming, from biomethane, high and low temperature, 26 bar', 'var': 'hydrogen, biomass', 'feedstock name': 'biomethane', 'feedstock unit': 'kilogram', 'floor value': 3.2}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, 25 bar', 'var': 'hydrogen, nat. gas', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, steam methane reforming of natural gas, with CCS (MDEA, 98% eff.), 25 bar', 'var': 'hydrogen, nat. gas, with CCS', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 3.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, with CCS, at gasification plant', 'var': 'hydrogen, biomass, with CCS', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, at gasification plant', 'var': 'hydrogen, biomass', 'feedstock name': 'wood chips', 'feedstock unit': 'kilogram', 'floor value': 7}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, with CCS, at coal gasification plant', 'var': 'hydrogen, coal', 'feedstock name': 'hard coal', 'feedstock unit': 'kilogram', 'floor value': 5}\n",
+      "{'name': 'hydrogen production, gaseous, 100 bar, from methane pyrolysis', 'var': 'hydrogen, pyrolsis', 'feedstock name': 'natural gas', 'feedstock unit': 'cubic meter', 'floor value': 6.5}\n",
+      "{'name': 'hydrogen production, gaseous, 25 bar, from thermochemical water splitting, at solar tower', 'var': 'hydrogen, solar', 'feedstock name': 'Energy, solar, converted', 'feedstock unit': 'megajoule', 'floor value': 180}\n",
+      "Generate region-specific hydrogen supply chains.\n",
+      "Generate region-specific biogas and syngas supply chains.\n",
+      "Generate region-specific synthetic fuel supply chains.\n",
+      "Generate region-specific biofuel supply chains.\n",
+      "Generate new fuel markets.\n",
+      "--> petrol, unleaded\n",
+      "--> petrol, low-sulfur\n",
+      "--> diesel, low-sulfur\n",
+      "--> diesel\n",
+      "Done!\n",
+      "\n",
+      "/////////////////////////// EMISSIONS //////////////////////////////\n",
+      "Integrating GAINS EU emission factors.\n",
+      "Integrating GAINS IAM emission factors.\n",
+      "Integrating GAINS EU emission factors.\n",
+      "Integrating GAINS IAM emission factors.\n",
+      "Integrating GAINS EU emission factors.\n",
+      "Integrating GAINS IAM emission factors.\n"
      ]
     }
    ],
    "source": [
-    "ndb.update_electricity()"
+    "ndb.update_all()"
    ]
   },
   {
@@ -180,38 +696,24 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Write new database(s) to Brightway2.\n",
       "Prepare database 1.\n",
       "- check for duplicates...\n",
       "- check for values format...\n",
       "- relinking exchanges...\n",
-      "Done!\n"
-     ]
-    },
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "Writing activities to SQLite3 database:\n",
-      "0% [##############################] 100% | ETA: 00:00:00\n",
-      "Total time elapsed: 00:00:24\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Title: Writing activities to SQLite3 database:\n",
-      "  Started: 07/25/2023 18:12:50\n",
-      "  Finished: 07/25/2023 18:13:14\n",
-      "  Total time elapsed: 00:00:24\n",
-      "  CPU %: 85.90\n",
-      "  Memory %: 14.54\n",
-      "Created database: message2020\n",
+      "Done!\n",
       "Prepare database 2.\n",
       "- check for duplicates...\n",
       "- check for values format...\n",
       "- relinking exchanges...\n",
+      "Done!\n",
+      "Prepare database 3.\n",
+      "- check for duplicates...\n",
+      "- check for values format...\n",
+      "- relinking exchanges...\n",
+      "Done!\n",
+      "Building superstructure database...\n",
+      "Dropped 0 duplicate(s).\n",
+      "Scenario difference file exported to /Users/romain/GitHub/premise/dev/export/scenario diff files!\n",
       "Done!\n"
      ]
     },
@@ -221,7 +723,7 @@
      "text": [
       "Writing activities to SQLite3 database:\n",
       "0% [##############################] 100% | ETA: 00:00:00\n",
-      "Total time elapsed: 00:00:25\n"
+      "Total time elapsed: 00:00:27\n"
      ]
     },
     {
@@ -229,12 +731,12 @@
      "output_type": "stream",
      "text": [
       "Title: Writing activities to SQLite3 database:\n",
-      "  Started: 07/25/2023 18:16:19\n",
-      "  Finished: 07/25/2023 18:16:45\n",
-      "  Total time elapsed: 00:00:25\n",
-      "  CPU %: 87.70\n",
-      "  Memory %: 10.77\n",
-      "Created database: message2060\n",
+      "  Started: 07/27/2023 11:08:01\n",
+      "  Finished: 07/27/2023 11:08:29\n",
+      "  Total time elapsed: 00:00:27\n",
+      "  CPU %: 83.30\n",
+      "  Memory %: 16.49\n",
+      "Created database: super_db_2023-07-27\n",
       "Generate scenario report.\n",
       "Report saved under /Users/romain/GitHub/premise/dev/export/scenario_report.\n",
       "Generate change report.\n",
@@ -243,413 +745,20 @@
     }
    ],
    "source": [
-    "ndb.write_db_to_brightway([\"message2020\", \"message2060\"])"
+    "ndb.write_superstructure_db_to_brightway()"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 5,
    "id": "4247493c-67c4-492c-a124-e3b5590a3c76",
    "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "<div><svg style=\"position: absolute; width: 0; height: 0; overflow: hidden\">\n",
-       "<defs>\n",
-       "<symbol id=\"icon-database\" viewBox=\"0 0 32 32\">\n",
-       "<path d=\"M16 0c-8.837 0-16 2.239-16 5v4c0 2.761 7.163 5 16 5s16-2.239 16-5v-4c0-2.761-7.163-5-16-5z\"></path>\n",
-       "<path d=\"M16 17c-8.837 0-16-2.239-16-5v6c0 2.761 7.163 5 16 5s16-2.239 16-5v-6c0 2.761-7.163 5-16 5z\"></path>\n",
-       "<path d=\"M16 26c-8.837 0-16-2.239-16-5v6c0 2.761 7.163 5 16 5s16-2.239 16-5v-6c0 2.761-7.163 5-16 5z\"></path>\n",
-       "</symbol>\n",
-       "<symbol id=\"icon-file-text2\" viewBox=\"0 0 32 32\">\n",
-       "<path d=\"M28.681 7.159c-0.694-0.947-1.662-2.053-2.724-3.116s-2.169-2.030-3.116-2.724c-1.612-1.182-2.393-1.319-2.841-1.319h-15.5c-1.378 0-2.5 1.121-2.5 2.5v27c0 1.378 1.122 2.5 2.5 2.5h23c1.378 0 2.5-1.122 2.5-2.5v-19.5c0-0.448-0.137-1.23-1.319-2.841zM24.543 5.457c0.959 0.959 1.712 1.825 2.268 2.543h-4.811v-4.811c0.718 0.556 1.584 1.309 2.543 2.268zM28 29.5c0 0.271-0.229 0.5-0.5 0.5h-23c-0.271 0-0.5-0.229-0.5-0.5v-27c0-0.271 0.229-0.5 0.5-0.5 0 0 15.499-0 15.5 0v7c0 0.552 0.448 1 1 1h7v19.5z\"></path>\n",
-       "<path d=\"M23 26h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
-       "<path d=\"M23 22h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
-       "<path d=\"M23 18h-14c-0.552 0-1-0.448-1-1s0.448-1 1-1h14c0.552 0 1 0.448 1 1s-0.448 1-1 1z\"></path>\n",
-       "</symbol>\n",
-       "</defs>\n",
-       "</svg>\n",
-       "<style>/* CSS stylesheet for displaying xarray objects in jupyterlab.\n",
-       " *\n",
-       " */\n",
-       "\n",
-       ":root {\n",
-       "  --xr-font-color0: var(--jp-content-font-color0, rgba(0, 0, 0, 1));\n",
-       "  --xr-font-color2: var(--jp-content-font-color2, rgba(0, 0, 0, 0.54));\n",
-       "  --xr-font-color3: var(--jp-content-font-color3, rgba(0, 0, 0, 0.38));\n",
-       "  --xr-border-color: var(--jp-border-color2, #e0e0e0);\n",
-       "  --xr-disabled-color: var(--jp-layout-color3, #bdbdbd);\n",
-       "  --xr-background-color: var(--jp-layout-color0, white);\n",
-       "  --xr-background-color-row-even: var(--jp-layout-color1, white);\n",
-       "  --xr-background-color-row-odd: var(--jp-layout-color2, #eeeeee);\n",
-       "}\n",
-       "\n",
-       "html[theme=dark],\n",
-       "body[data-theme=dark],\n",
-       "body.vscode-dark {\n",
-       "  --xr-font-color0: rgba(255, 255, 255, 1);\n",
-       "  --xr-font-color2: rgba(255, 255, 255, 0.54);\n",
-       "  --xr-font-color3: rgba(255, 255, 255, 0.38);\n",
-       "  --xr-border-color: #1F1F1F;\n",
-       "  --xr-disabled-color: #515151;\n",
-       "  --xr-background-color: #111111;\n",
-       "  --xr-background-color-row-even: #111111;\n",
-       "  --xr-background-color-row-odd: #313131;\n",
-       "}\n",
-       "\n",
-       ".xr-wrap {\n",
-       "  display: block !important;\n",
-       "  min-width: 300px;\n",
-       "  max-width: 700px;\n",
-       "}\n",
-       "\n",
-       ".xr-text-repr-fallback {\n",
-       "  /* fallback to plain text repr when CSS is not injected (untrusted notebook) */\n",
-       "  display: none;\n",
-       "}\n",
-       "\n",
-       ".xr-header {\n",
-       "  padding-top: 6px;\n",
-       "  padding-bottom: 6px;\n",
-       "  margin-bottom: 4px;\n",
-       "  border-bottom: solid 1px var(--xr-border-color);\n",
-       "}\n",
-       "\n",
-       ".xr-header > div,\n",
-       ".xr-header > ul {\n",
-       "  display: inline;\n",
-       "  margin-top: 0;\n",
-       "  margin-bottom: 0;\n",
-       "}\n",
-       "\n",
-       ".xr-obj-type,\n",
-       ".xr-array-name {\n",
-       "  margin-left: 2px;\n",
-       "  margin-right: 10px;\n",
-       "}\n",
-       "\n",
-       ".xr-obj-type {\n",
-       "  color: var(--xr-font-color2);\n",
-       "}\n",
-       "\n",
-       ".xr-sections {\n",
-       "  padding-left: 0 !important;\n",
-       "  display: grid;\n",
-       "  grid-template-columns: 150px auto auto 1fr 20px 20px;\n",
-       "}\n",
-       "\n",
-       ".xr-section-item {\n",
-       "  display: contents;\n",
-       "}\n",
-       "\n",
-       ".xr-section-item input {\n",
-       "  display: none;\n",
-       "}\n",
-       "\n",
-       ".xr-section-item input + label {\n",
-       "  color: var(--xr-disabled-color);\n",
-       "}\n",
-       "\n",
-       ".xr-section-item input:enabled + label {\n",
-       "  cursor: pointer;\n",
-       "  color: var(--xr-font-color2);\n",
-       "}\n",
-       "\n",
-       ".xr-section-item input:enabled + label:hover {\n",
-       "  color: var(--xr-font-color0);\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary {\n",
-       "  grid-column: 1;\n",
-       "  color: var(--xr-font-color2);\n",
-       "  font-weight: 500;\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary > span {\n",
-       "  display: inline-block;\n",
-       "  padding-left: 0.5em;\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in:disabled + label {\n",
-       "  color: var(--xr-font-color2);\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in + label:before {\n",
-       "  display: inline-block;\n",
-       "  content: '►';\n",
-       "  font-size: 11px;\n",
-       "  width: 15px;\n",
-       "  text-align: center;\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in:disabled + label:before {\n",
-       "  color: var(--xr-disabled-color);\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in:checked + label:before {\n",
-       "  content: '▼';\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in:checked + label > span {\n",
-       "  display: none;\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary,\n",
-       ".xr-section-inline-details {\n",
-       "  padding-top: 4px;\n",
-       "  padding-bottom: 4px;\n",
-       "}\n",
-       "\n",
-       ".xr-section-inline-details {\n",
-       "  grid-column: 2 / -1;\n",
-       "}\n",
-       "\n",
-       ".xr-section-details {\n",
-       "  display: none;\n",
-       "  grid-column: 1 / -1;\n",
-       "  margin-bottom: 5px;\n",
-       "}\n",
-       "\n",
-       ".xr-section-summary-in:checked ~ .xr-section-details {\n",
-       "  display: contents;\n",
-       "}\n",
-       "\n",
-       ".xr-array-wrap {\n",
-       "  grid-column: 1 / -1;\n",
-       "  display: grid;\n",
-       "  grid-template-columns: 20px auto;\n",
-       "}\n",
-       "\n",
-       ".xr-array-wrap > label {\n",
-       "  grid-column: 1;\n",
-       "  vertical-align: top;\n",
-       "}\n",
-       "\n",
-       ".xr-preview {\n",
-       "  color: var(--xr-font-color3);\n",
-       "}\n",
-       "\n",
-       ".xr-array-preview,\n",
-       ".xr-array-data {\n",
-       "  padding: 0 5px !important;\n",
-       "  grid-column: 2;\n",
-       "}\n",
-       "\n",
-       ".xr-array-data,\n",
-       ".xr-array-in:checked ~ .xr-array-preview {\n",
-       "  display: none;\n",
-       "}\n",
-       "\n",
-       ".xr-array-in:checked ~ .xr-array-data,\n",
-       ".xr-array-preview {\n",
-       "  display: inline-block;\n",
-       "}\n",
-       "\n",
-       ".xr-dim-list {\n",
-       "  display: inline-block !important;\n",
-       "  list-style: none;\n",
-       "  padding: 0 !important;\n",
-       "  margin: 0;\n",
-       "}\n",
-       "\n",
-       ".xr-dim-list li {\n",
-       "  display: inline-block;\n",
-       "  padding: 0;\n",
-       "  margin: 0;\n",
-       "}\n",
-       "\n",
-       ".xr-dim-list:before {\n",
-       "  content: '(';\n",
-       "}\n",
-       "\n",
-       ".xr-dim-list:after {\n",
-       "  content: ')';\n",
-       "}\n",
-       "\n",
-       ".xr-dim-list li:not(:last-child):after {\n",
-       "  content: ',';\n",
-       "  padding-right: 5px;\n",
-       "}\n",
-       "\n",
-       ".xr-has-index {\n",
-       "  font-weight: bold;\n",
-       "}\n",
-       "\n",
-       ".xr-var-list,\n",
-       ".xr-var-item {\n",
-       "  display: contents;\n",
-       "}\n",
-       "\n",
-       ".xr-var-item > div,\n",
-       ".xr-var-item label,\n",
-       ".xr-var-item > .xr-var-name span {\n",
-       "  background-color: var(--xr-background-color-row-even);\n",
-       "  margin-bottom: 0;\n",
-       "}\n",
-       "\n",
-       ".xr-var-item > .xr-var-name:hover span {\n",
-       "  padding-right: 5px;\n",
-       "}\n",
-       "\n",
-       ".xr-var-list > li:nth-child(odd) > div,\n",
-       ".xr-var-list > li:nth-child(odd) > label,\n",
-       ".xr-var-list > li:nth-child(odd) > .xr-var-name span {\n",
-       "  background-color: var(--xr-background-color-row-odd);\n",
-       "}\n",
-       "\n",
-       ".xr-var-name {\n",
-       "  grid-column: 1;\n",
-       "}\n",
-       "\n",
-       ".xr-var-dims {\n",
-       "  grid-column: 2;\n",
-       "}\n",
-       "\n",
-       ".xr-var-dtype {\n",
-       "  grid-column: 3;\n",
-       "  text-align: right;\n",
-       "  color: var(--xr-font-color2);\n",
-       "}\n",
-       "\n",
-       ".xr-var-preview {\n",
-       "  grid-column: 4;\n",
-       "}\n",
-       "\n",
-       ".xr-index-preview {\n",
-       "  grid-column: 2 / 5;\n",
-       "  color: var(--xr-font-color2);\n",
-       "}\n",
-       "\n",
-       ".xr-var-name,\n",
-       ".xr-var-dims,\n",
-       ".xr-var-dtype,\n",
-       ".xr-preview,\n",
-       ".xr-attrs dt {\n",
-       "  white-space: nowrap;\n",
-       "  overflow: hidden;\n",
-       "  text-overflow: ellipsis;\n",
-       "  padding-right: 10px;\n",
-       "}\n",
-       "\n",
-       ".xr-var-name:hover,\n",
-       ".xr-var-dims:hover,\n",
-       ".xr-var-dtype:hover,\n",
-       ".xr-attrs dt:hover {\n",
-       "  overflow: visible;\n",
-       "  width: auto;\n",
-       "  z-index: 1;\n",
-       "}\n",
-       "\n",
-       ".xr-var-attrs,\n",
-       ".xr-var-data,\n",
-       ".xr-index-data {\n",
-       "  display: none;\n",
-       "  background-color: var(--xr-background-color) !important;\n",
-       "  padding-bottom: 5px !important;\n",
-       "}\n",
-       "\n",
-       ".xr-var-attrs-in:checked ~ .xr-var-attrs,\n",
-       ".xr-var-data-in:checked ~ .xr-var-data,\n",
-       ".xr-index-data-in:checked ~ .xr-index-data {\n",
-       "  display: block;\n",
-       "}\n",
-       "\n",
-       ".xr-var-data > table {\n",
-       "  float: right;\n",
-       "}\n",
-       "\n",
-       ".xr-var-name span,\n",
-       ".xr-var-data,\n",
-       ".xr-index-name div,\n",
-       ".xr-index-data,\n",
-       ".xr-attrs {\n",
-       "  padding-left: 25px !important;\n",
-       "}\n",
-       "\n",
-       ".xr-attrs,\n",
-       ".xr-var-attrs,\n",
-       ".xr-var-data,\n",
-       ".xr-index-data {\n",
-       "  grid-column: 1 / -1;\n",
-       "}\n",
-       "\n",
-       "dl.xr-attrs {\n",
-       "  padding: 0;\n",
-       "  margin: 0;\n",
-       "  display: grid;\n",
-       "  grid-template-columns: 125px auto;\n",
-       "}\n",
-       "\n",
-       ".xr-attrs dt,\n",
-       ".xr-attrs dd {\n",
-       "  padding: 0;\n",
-       "  margin: 0;\n",
-       "  float: left;\n",
-       "  padding-right: 10px;\n",
-       "  width: auto;\n",
-       "}\n",
-       "\n",
-       ".xr-attrs dt {\n",
-       "  font-weight: normal;\n",
-       "  grid-column: 1;\n",
-       "}\n",
-       "\n",
-       ".xr-attrs dt:hover span {\n",
-       "  display: inline-block;\n",
-       "  background: var(--xr-background-color);\n",
-       "  padding-right: 10px;\n",
-       "}\n",
-       "\n",
-       ".xr-attrs dd {\n",
-       "  grid-column: 2;\n",
-       "  white-space: pre-wrap;\n",
-       "  word-break: break-all;\n",
-       "}\n",
-       "\n",
-       ".xr-icon-database,\n",
-       ".xr-icon-file-text2,\n",
-       ".xr-no-icon {\n",
-       "  display: inline-block;\n",
-       "  vertical-align: middle;\n",
-       "  width: 1em;\n",
-       "  height: 1.5em !important;\n",
-       "  stroke-width: 0;\n",
-       "  stroke: currentColor;\n",
-       "  fill: currentColor;\n",
-       "}\n",
-       "</style><pre class='xr-text-repr-fallback'>&lt;xarray.DataArray &#x27;value&#x27; (year: 14)&gt;\n",
-       "array([1.        , 1.0125    , 1.02518939, 1.03768939, 1.05056818,\n",
-       "       1.05549242, 1.06060606, 1.06060606, 1.06060606, 1.06060606,\n",
-       "       1.06060606, 1.06060606, 1.06060606, 1.06060606])\n",
-       "Coordinates:\n",
-       "    region     &lt;U3 &#x27;WEU&#x27;\n",
-       "    variables  &lt;U13 &#x27;Gas CC&#x27;\n",
-       "  * year       (year) int64 2020 2025 2030 2035 2040 ... 2080 2090 2100 2110</pre><div class='xr-wrap' style='display:none'><div class='xr-header'><div class='xr-obj-type'>xarray.DataArray</div><div class='xr-array-name'>'value'</div><ul class='xr-dim-list'><li><span class='xr-has-index'>year</span>: 14</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-9da1ccc1-eab6-4dc7-a8d7-4bc97ebe4f0b' class='xr-array-in' type='checkbox' checked><label for='section-9da1ccc1-eab6-4dc7-a8d7-4bc97ebe4f0b' title='Show/hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-array-preview xr-preview'><span>1.0 1.013 1.025 1.038 1.051 1.055 ... 1.061 1.061 1.061 1.061 1.061</span></div><div class='xr-array-data'><pre>array([1.        , 1.0125    , 1.02518939, 1.03768939, 1.05056818,\n",
-       "       1.05549242, 1.06060606, 1.06060606, 1.06060606, 1.06060606,\n",
-       "       1.06060606, 1.06060606, 1.06060606, 1.06060606])</pre></div></div></li><li class='xr-section-item'><input id='section-5fd938e5-7b8a-437c-9d6a-ca4061f7cfcb' class='xr-section-summary-in' type='checkbox'  checked><label for='section-5fd938e5-7b8a-437c-9d6a-ca4061f7cfcb' class='xr-section-summary' >Coordinates: <span>(3)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><ul class='xr-var-list'><li class='xr-var-item'><div class='xr-var-name'><span>region</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>&lt;U3</div><div class='xr-var-preview xr-preview'>&#x27;WEU&#x27;</div><input id='attrs-52f3e306-e0af-4105-bbe8-852c2c7c5b2e' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-52f3e306-e0af-4105-bbe8-852c2c7c5b2e' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-519068dd-d1a8-417b-be61-39f69f998f1b' class='xr-var-data-in' type='checkbox'><label for='data-519068dd-d1a8-417b-be61-39f69f998f1b' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array(&#x27;WEU&#x27;, dtype=&#x27;&lt;U3&#x27;)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span>variables</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>&lt;U13</div><div class='xr-var-preview xr-preview'>&#x27;Gas CC&#x27;</div><input id='attrs-fbc37150-c41f-4341-b0ce-1cdd56f262f3' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-fbc37150-c41f-4341-b0ce-1cdd56f262f3' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-1b5734cc-aceb-4c13-9436-800f58b5fe3d' class='xr-var-data-in' type='checkbox'><label for='data-1b5734cc-aceb-4c13-9436-800f58b5fe3d' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array(&#x27;Gas CC&#x27;, dtype=&#x27;&lt;U13&#x27;)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span class='xr-has-index'>year</span></div><div class='xr-var-dims'>(year)</div><div class='xr-var-dtype'>int64</div><div class='xr-var-preview xr-preview'>2020 2025 2030 ... 2090 2100 2110</div><input id='attrs-8188c1fb-c895-4181-8174-02d05ad433e2' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-8188c1fb-c895-4181-8174-02d05ad433e2' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-3d9708a9-44c6-4eb5-9e11-b3cf523ab326' class='xr-var-data-in' type='checkbox'><label for='data-3d9708a9-44c6-4eb5-9e11-b3cf523ab326' title='Show/Hide data repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-var-attrs'><dl class='xr-attrs'></dl></div><div class='xr-var-data'><pre>array([2020, 2025, 2030, 2035, 2040, 2045, 2050, 2055, 2060, 2070, 2080, 2090,\n",
-       "       2100, 2110])</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-5ed1cf5f-5766-48e2-995e-c6e4ea970989' class='xr-section-summary-in' type='checkbox'  ><label for='section-5ed1cf5f-5766-48e2-995e-c6e4ea970989' class='xr-section-summary' >Indexes: <span>(1)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><ul class='xr-var-list'><li class='xr-var-item'><div class='xr-index-name'><div>year</div></div><div class='xr-index-preview'>PandasIndex</div><div></div><input id='index-f1c94743-15be-477c-b95e-9654af73d8f7' class='xr-index-data-in' type='checkbox'/><label for='index-f1c94743-15be-477c-b95e-9654af73d8f7' title='Show/Hide index repr'><svg class='icon xr-icon-database'><use xlink:href='#icon-database'></use></svg></label><div class='xr-index-data'><pre>PandasIndex(Int64Index([2020, 2025, 2030, 2035, 2040, 2045, 2050, 2055, 2060, 2070, 2080,\n",
-       "            2090, 2100, 2110],\n",
-       "           dtype=&#x27;int64&#x27;, name=&#x27;year&#x27;))</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-cc68c5e1-af30-4380-b10e-ea328f23be74' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-cc68c5e1-af30-4380-b10e-ea328f23be74' class='xr-section-summary'  title='Expand/collapse section'>Attributes: <span>(0)</span></label><div class='xr-section-inline-details'></div><div class='xr-section-details'><dl class='xr-attrs'></dl></div></li></ul></div></div>"
-      ],
-      "text/plain": [
-       "<xarray.DataArray 'value' (year: 14)>\n",
-       "array([1.        , 1.0125    , 1.02518939, 1.03768939, 1.05056818,\n",
-       "       1.05549242, 1.06060606, 1.06060606, 1.06060606, 1.06060606,\n",
-       "       1.06060606, 1.06060606, 1.06060606, 1.06060606])\n",
-       "Coordinates:\n",
-       "    region     <U3 'WEU'\n",
-       "    variables  <U13 'Gas CC'\n",
-       "  * year       (year) int64 2020 2025 2030 2035 2040 ... 2080 2090 2100 2110"
-      ]
-     },
-     "execution_count": 8,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
+   "outputs": [],
    "source": [
-    "ndb.scenarios[0][\"iam data\"].electricity_efficiencies.sel(region=\"WEU\", variables=\"Gas CC\")"
+    "for ds in ndb.scenarios[0][\"database\"]:\n",
+    "    for e in ds[\"exchanges\"]:\n",
+    "        if e[\"name\"] == \"Cadmium, ion\":\n",
+    "            print(ds[\"name\"], ds[\"location\"], e[\"input\"])"
    ]
   },
   {
diff --git a/docs/extract.rst b/docs/extract.rst
index ae0a436a..8dc8915e 100644
--- a/docs/extract.rst
+++ b/docs/extract.rst
@@ -577,7 +577,10 @@ The new datasets introduced are listed in the table below (only production datas
   hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, with CCS, at gasification plant    CH
   hydrogen production, gaseous, 25 bar, from gasification of woody biomass in entrained flow gasifier, at gasification plant              CH
   hydrogen production, gaseous, 30 bar, from hard coal gasification and reforming, at coal gasification plant                             RER
-  hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity                                                     RER
+  hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity                                                      RER
+  hydrogen production, gaseous, 20 bar, from AEC electrolysis, from grid electricity                                                      RER
+  hydrogen production, gaseous, 1 bar, from SOEC electrolysis, from grid electricity                                                      RER
+  hydrogen production, gaseous, 1 bar, from SOEC electrolysis, with steam input, from grid electricity                                    RER
   hydrogen production, gaseous, 25 bar, from thermochemical water splitting, at solar tower                                               RER
   hydrogen production, gaseous, 100 bar, from methane pyrolysis                                                                           RER
  ======================================================================================================================================= ===========
diff --git a/premise/data/additional_inventories/lci-Carma-CCS.xlsx b/premise/data/additional_inventories/lci-Carma-CCS.xlsx
index d1b05799..388de35a 100644
Binary files a/premise/data/additional_inventories/lci-Carma-CCS.xlsx and b/premise/data/additional_inventories/lci-Carma-CCS.xlsx differ
diff --git a/premise/data/additional_inventories/lci-hydrogen-electrolysis.xlsx b/premise/data/additional_inventories/lci-hydrogen-electrolysis.xlsx
index 8bc5ea6c..e07cff4c 100644
Binary files a/premise/data/additional_inventories/lci-hydrogen-electrolysis.xlsx and b/premise/data/additional_inventories/lci-hydrogen-electrolysis.xlsx differ
diff --git a/premise/data/additional_inventories/lci-synfuels-from-FT-from-electrolysis.xlsx b/premise/data/additional_inventories/lci-synfuels-from-FT-from-electrolysis.xlsx
index d32119a1..ce69f2af 100644
Binary files a/premise/data/additional_inventories/lci-synfuels-from-FT-from-electrolysis.xlsx and b/premise/data/additional_inventories/lci-synfuels-from-FT-from-electrolysis.xlsx differ
diff --git a/premise/data/additional_inventories/lci-synfuels-from-methanol-from-cement-plant.xlsx b/premise/data/additional_inventories/lci-synfuels-from-methanol-from-cement-plant.xlsx
index db850453..e16261d1 100644
Binary files a/premise/data/additional_inventories/lci-synfuels-from-methanol-from-cement-plant.xlsx and b/premise/data/additional_inventories/lci-synfuels-from-methanol-from-cement-plant.xlsx differ
diff --git a/premise/data/additional_inventories/lci-synfuels-from-methanol-from-electrolysis.xlsx b/premise/data/additional_inventories/lci-synfuels-from-methanol-from-electrolysis.xlsx
index 4c0ef8f0..74d8d69a 100644
Binary files a/premise/data/additional_inventories/lci-synfuels-from-methanol-from-electrolysis.xlsx and b/premise/data/additional_inventories/lci-synfuels-from-methanol-from-electrolysis.xlsx differ
diff --git a/premise/data/additional_inventories/lci-syngas.xlsx b/premise/data/additional_inventories/lci-syngas.xlsx
index 9811a407..5cf12691 100644
Binary files a/premise/data/additional_inventories/lci-syngas.xlsx and b/premise/data/additional_inventories/lci-syngas.xlsx differ
diff --git a/premise/data/fuels/hydrogen_activities.yml b/premise/data/fuels/hydrogen_activities.yml
index cecc3a30..53f5ad9f 100644
--- a/premise/data/fuels/hydrogen_activities.yml
+++ b/premise/data/fuels/hydrogen_activities.yml
@@ -1,5 +1,5 @@
 from electrolysis:
-  name: hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity
+  name: hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity
   var: hydrogen, electrolysis
   feedstock name: electricity, low voltage
   feedstock unit: kilowatt hour
diff --git a/premise/electricity.py b/premise/electricity.py
index 55963352..8db65cd2 100644
--- a/premise/electricity.py
+++ b/premise/electricity.py
@@ -1964,6 +1964,9 @@ def create_missing_power_plant_datasets(self) -> None:
                         if "input" in e:
                             del e["input"]
 
+                    ds["comment"] = "This dataset is a proxy dataset for a power plant. " \
+                                    "It is used to create missing power plant datasets."
+
                 self.database.extend(new_datasets.values())
 
         mapping = InventorySet(self.database)
diff --git a/premise/iam_variables_mapping/crops_variables.yaml b/premise/iam_variables_mapping/crops_variables.yaml
index a8daf429..16fe6aed 100644
--- a/premise/iam_variables_mapping/crops_variables.yaml
+++ b/premise/iam_variables_mapping/crops_variables.yaml
@@ -10,6 +10,9 @@ sugar:
     remind:
       temperate: sugarbeet
       tropical: sugarcane
+    message:
+      temperate: sugarbeet
+      tropical: sugarcane
   land_use:
     image: Land Use|Marginal|Biomass|Sugar
   land_use_change:
@@ -22,6 +25,9 @@ oil:
     remind:
       temperate: rapeseed
       tropical: palm oil
+    message:
+      temperate: rapeseed
+      tropical: palm oil
   land_use:
     image: Land Use|Marginal|Biomass|OilCrop
   land_use_change:
@@ -34,6 +40,9 @@ wood:
     remind:
       temperate: poplar
       tropical: eucalyptus
+    message:
+      temperate: poplar
+      tropical: eucalyptus
   land_use:
     image: Land Use|Marginal|Biomass|Woody
   land_use_change:
@@ -46,6 +55,9 @@ grass:
     remind:
       temperate: switchgrass
       tropical: miscanthus
+    message:
+      temperate: switchgrass
+      tropical: miscanthus
   land_use:
     image: Land Use|Marginal|Biomass|Grassy
   land_use_change:
@@ -58,6 +70,9 @@ grain:
     remind:
       temperate: corn
       tropical: corn
+    message:
+      temperate: corn
+      tropical: corn
   land_use:
     image: Land Use|Marginal|Biomass|Maize
   land_use_change:
diff --git a/premise/iam_variables_mapping/fuels_variables.yaml b/premise/iam_variables_mapping/fuels_variables.yaml
index 166e3235..c7be27c9 100644
--- a/premise/iam_variables_mapping/fuels_variables.yaml
+++ b/premise/iam_variables_mapping/fuels_variables.yaml
@@ -444,7 +444,7 @@ hydrogen, electrolysis:
     remind: Tech|Hydrogen|Electricity|Efficiency
   ecoinvent_aliases:
     fltr:
-      - hydrogen production, gaseous, 200 bar, from PEM electrolysis, from grid electricity
+      - hydrogen production, gaseous, 30 bar, from PEM electrolysis, from grid electricity
 
 hydrogen, solar:
   lhv: 120
diff --git a/premise/inventory_imports.py b/premise/inventory_imports.py
index 063f539c..8191a009 100644
--- a/premise/inventory_imports.py
+++ b/premise/inventory_imports.py
@@ -559,6 +559,7 @@ def add_biosphere_links(self, delete_missing: bool = False) -> None:
                             assert (
                                 key in self.biosphere_dict
                             ), f"Could not find a biosphere flow for {key}."
+                            y["name"] = new_key[0]
                         else:
                             print(key)
                             continue
@@ -568,6 +569,7 @@ def add_biosphere_links(self, delete_missing: bool = False) -> None:
                         self.biosphere_dict[key],
                     )
 
+
     def lower_case_technosphere_exchanges(self) -> None:
         blakclist = [
             "NOx",
diff --git a/premise/transformation.py b/premise/transformation.py
index 6bc77806..e568555b 100644
--- a/premise/transformation.py
+++ b/premise/transformation.py
@@ -553,6 +553,8 @@ def fetch_proxies(
         :param relink: if `relink`, exchanges from the datasets will be relinked to
         the most geographically-appropriate providers from the database. This is computer-intensive.
         :param regions: regions to create proxy datasets for. if None, all regions are considered.
+        :param delete_original_dataset: if True, delete original datasets from the database.
+        :param empty_original_activity: if True, empty original activities from exchanges.
         :return: dictionary with IAM regions as keys, proxy datasets as values.
         """
 
@@ -592,10 +594,10 @@ def fetch_proxies(
                 if "input" in d_act[region]:
                     del d_act[region]["input"]
 
-                if production_variable:
+                if production_variable is not None:
                     # Add `production volume` field
                     if isinstance(production_variable, str):
-                        production_variable = [production_variable]
+                        production_variable = [production_variable, ]
 
                     if all(
                         i in self.iam_data.production_volumes.variables