diff --git a/dev/Untitled1.ipynb b/dev/Untitled1.ipynb
index 06fcf5c9..9a50fef5 100644
--- a/dev/Untitled1.ipynb
+++ b/dev/Untitled1.ipynb
@@ -26,19 +26,11 @@
   {
    "cell_type": "code",
    "execution_count": 3,
-   "id": "776096ec-6e11-42ba-9604-4876ae234207",
+   "id": "36f6ad96-f512-48c5-80e8-b36276d42b43",
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Inventory cache cleared!\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "clear_inventory_cache()"
+    "# clear_inventory_cache()"
    ]
   },
   {
@@ -51,7 +43,7 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "premise v.(2, 1, 1, 'dev2')\n",
+      "premise v.(2, 1, 1, 'dev4')\n",
       "+------------------------------------------------------------------+\n",
       "| Warning                                                          |\n",
       "+------------------------------------------------------------------+\n",
@@ -87,564 +79,6 @@
       "NewDatabase(..., quiet=True)\n",
       "- Extracting source database\n",
       "- Extracting inventories\n",
-      "Cannot find cached inventories. Will create them now for next time...\n",
-      "Importing default inventories...\n",
-      "\n",
-      "Extracted 1 worksheets in 0.10 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",
-      "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 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.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.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.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.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",
-      "Could not find a biosphere flow for ('Iron, 72% in magnetite, 14% in crude ore', 'natural resource', 'in ground', 'kilogram') in lci-vanadium.xlsx. Exchange deleted.\n",
-      "Could not find a biosphere flow for ('TiO2, 54% in ilmenite, 18% in crude ore, in ground', 'natural resource', 'in ground', 'kilogram') in lci-vanadium.xlsx. Exchange deleted.\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.38 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% puri |     fluorspar, 97% purity      |   GLO    | lci-PV.xlsx |\n",
-      "| metallization paste production | metallization paste, back side |   RER    | lci-PV.xlsx |\n",
-      "| metallization paste production | metallization paste, back side |   RER    | lci-PV.xlsx |\n",
-      "| metallization paste production | metallization paste, front sid |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic module production | photovoltaic module, building- |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic module production | photovoltaic module, building- |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic mounting system p | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic mounting system p | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic mounting system p | photovoltaic mounting system,  |   RER    | lci-PV.xlsx |\n",
-      "| photovoltaic panel factory con |   photovoltaic panel factory   |   GLO    | lci-PV.xlsx |\n",
-      "|  polyvinylfluoride production  |       polyvinylfluoride        |    US    | lci-PV.xlsx |\n",
-      "| polyvinylfluoride production,  | polyvinylfluoride, dispersion  |    US    | lci-PV.xlsx |\n",
-      "| polyvinylfluoride, film produc |    polyvinylfluoride, film     |    US    | lci-PV.xlsx |\n",
-      "| silicon production, metallurgi |  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",
-      "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",
-      "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",
-      "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 ce | carbon dioxide, captured and r |   RER    | lci-synfuels-from-methanol-fro |\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",
-      "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",
-      "| hydrogen production, coal gasi | hydrogen, gaseous, low pressur |   RoW    | lci-hydrogen-coal-gasification |\n",
-      "| methanol production, coal gasi |            methanol            |   RoW    | lci-hydrogen-coal-gasification |\n",
-      "+--------------------------------+--------------------------------+----------+--------------------------------+\n",
-      "Extracted 1 worksheets in 0.00 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",
-      "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",
-      "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",
-      "| hydrogen production, steam met | hydrogen, gaseous, low pressur |   RER    | lci-hydrogen-smr-atr-natgas.xl |\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.00 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",
-      "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 production facility,  | methanol production facility,  |   RER    | lci-synfuels-from-methanol-fro |\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 5 worksheets in 0.54 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.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.00 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.07 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",
-      "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",
-      "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.04 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",
-      "Remove uncertainty data.\n",
-      "Extracted 39 worksheets in 0.36 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.21 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.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",
-      "Applying strategy: migrate_datasets\n",
-      "Applying strategy: migrate_exchanges\n",
-      "Remove uncertainty data.\n",
-      "Extracted 1 worksheets in 1.23 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",
-      "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",
       "- Fetching IAM data\n",
       "Done!\n"
      ]
@@ -656,9 +90,11 @@
     "        #{\"model\":\"remind\", \"pathway\":\"SSP2-Base\", \"year\":2050},\n",
     "        #{\"model\":\"remind\", \"pathway\":\"SSP2-Base\", \"year\":2010},\n",
     "        #{\"model\":\"image\", \"pathway\":\"SSP2-Base\", \"year\":2020},\n",
-    "        {\"model\":\"remind\", \"pathway\":\"SSP2-Base\", \"year\":2028},\n",
-    "        #{\"model\":\"remind\", \"pathway\":\"SSP2-Base\", \"year\":2040},\n",
-    "        #{\"model\":\"image\", \"pathway\":\"SSP2-Base\", \"year\":2050},\n",
+    "        #{\"model\":\"remind\", \"pathway\":\"SSP2-Base\", \"year\":2050},\n",
+    "        {\"model\":\"remind\", \"pathway\":\"SSP2-PkBudg1150\", \"year\":2050},\n",
+    "        #{\"model\":\"image\", \"pathway\":\"SSP2-RCP26\", \"year\":2040},\n",
+    "        #{\"model\":\"image\", \"pathway\":\"SSP2-RCP26\", \"year\":2060},\n",
+    "        #{\"model\":\"image\", \"pathway\":\"SSP2-RCP19\", \"year\":2050},\n",
     "        #{\"model\":\"image\", \"pathway\":\"SSP2-Base\", \"year\":2050},\n",
     "    ],\n",
     "    source_db=\"ecoinvent-3.10-cutoff\", # <-- name of the database in the BW2 project. Must be a string.\n",
@@ -668,14 +104,6 @@
     ")"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "0f71d709-497d-4454-9545-aafd07387bdf",
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": 5,
@@ -686,7 +114,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Processing scenarios: 100%|█████████████| 1/1 [01:06<00:00, 66.21s/it]"
+      "Processing scenarios: 100%|█████████████| 1/1 [00:08<00:00,  8.58s/it]"
      ]
     },
     {
@@ -706,12 +134,75 @@
     }
    ],
    "source": [
-    "ndb.update()"
+    "ndb.update(\"battery\")"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 6,
+   "id": "d423f5a1-7bd5-4d0e-8e1f-38634dc80d1a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Generate change report.\n",
+      "Report saved under /Users/romain/GitHub/premise/dev.\n"
+     ]
+    }
+   ],
+   "source": [
+    "ndb.generate_change_report()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "id": "3b0e71e7-2fbb-4247-abcf-60ebb1909d4a",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "gearbox, for lorry 201.6\n",
+      "transmission, for lorry 291.2\n",
+      "treatment of used lorry, 40 metric ton -1\n",
+      "market for power distribution unit, for electric passenger car 4\n",
+      "assembly operation, for lorry 29223.50287857302\n",
+      "market for converter, for electric passenger car 25\n",
+      "market for inverter, for electric passenger car 41.19999946653843\n",
+      "suspension, for lorry 3440\n",
+      "power electronics, for lorry 265\n",
+      "tires and wheels, for lorry 1422\n",
+      "market for battery management system, for Li-ion battery 125.73132358067981\n",
+      "glider lightweighting 268.7599962415552\n",
+      "cabin, for lorry 1153\n",
+      "other components, for electric lorry 1059\n",
+      "maintenance, lorry 40 metric ton 1\n",
+      "frame, blanks and saddle, for lorry 5539\n",
+      "market for electric motor, electric passenger car 600\n",
+      "market for used Li-ion battery -314.32832768712774\n",
+      "retarder, for lorry 67.2\n",
+      "market for battery cell, Li-ion, NMC622 188.597004106448\n",
+      "heavy duty truck, battery electric, NMC-622 battery, 40t gross weight, long haul 1\n"
+     ]
+    }
+   ],
+   "source": [
+    "from premise.utils import load_database\n",
+    "ndb.scenarios[0] = load_database(ndb.scenarios[0])\n",
+    "\n",
+    "for ds in ndb.scenarios[0][\"database\"]:\n",
+    "    if ds[\"name\"] == \"heavy duty truck, battery electric, NMC-622 battery, 40t gross weight, long haul\":\n",
+    "        for e in ds[\"exchanges\"]:\n",
+    "            print(e[\"name\"], e[\"amount\"])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
    "id": "dff4efb1-69ab-4bd5-8d52-4038df180a85",
    "metadata": {},
    "outputs": [
@@ -730,7 +221,7 @@
      "text": [
       "Writing activities to SQLite3 database:\n",
       "0% [##############################] 100% | ETA: 00:00:00\n",
-      "Total time elapsed: 00:00:32\n"
+      "Total time elapsed: 00:00:36\n"
      ]
     },
     {
@@ -738,11 +229,16 @@
      "output_type": "stream",
      "text": [
       "Title: Writing activities to SQLite3 database:\n",
-      "  Started: 07/01/2024 17:19:47\n",
-      "  Finished: 07/01/2024 17:20:20\n",
-      "  Total time elapsed: 00:00:32\n",
-      "  CPU %: 94.20\n",
-      "  Memory %: 15.94\n"
+      "  Started: 07/13/2024 20:50:02\n",
+      "  Finished: 07/13/2024 20:50:39\n",
+      "  Total time elapsed: 00:00:36\n",
+      "  CPU %: 90.50\n",
+      "  Memory %: 11.02\n",
+      "Created database: ei_cutoff_3.10_remind_SSP2-PkBudg1150_2050 2024-07-13\n",
+      "Generate scenario report.\n",
+      "Report saved under /Users/romain/GitHub/premise/dev/export/scenario_report.\n",
+      "Generate change report.\n",
+      "Report saved under /Users/romain/GitHub/premise/dev.\n"
      ]
     }
    ],
@@ -752,197 +248,408 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "id": "a3b56b3f-9583-4c90-ad21-551c5530e27c",
    "metadata": {},
    "outputs": [
     {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "aluminium, primary, liquid\n",
-      "cooling energy, at -25 °c\n",
-      "1,1-dimethylcyclopentane\n",
-      "aluminium, primary, liquid\n",
-      "cooling energy, at -45 °c\n",
-      "cooling energy, at -45 °c\n",
-      "cooling energy, at -25 °c\n",
-      "fraction 8 from naphtha separation\n",
-      "fraction 8 from naphtha separation\n",
-      "fraction 1 from naphtha separation\n",
-      "2,3-dimethylbutane\n",
-      "heptane\n",
-      "fraction 7 from naphtha separation\n",
-      "2,3-dimethylbutane\n",
-      "cooling energy, at -55 °c\n",
-      "heptane\n",
-      "electricity, low voltage\n",
-      "cooling energy, at -55 °c\n",
-      "cooling energy, at -15 °c\n",
-      "2-methylpentane\n",
-      "sawnwood, paraná pine, dried (u=10%)\n",
-      "hexane\n",
-      "hexane\n",
-      "residual wood, dry\n",
-      "formaldehyde\n",
-      "sawlog and veneer log, paraná pine, measured as solid wood under bark\n",
-      "cooling energy, at -25 °c\n",
-      "cooling energy, at -100 °c\n",
-      "ventilation duct, elbow 90°, steel, 100x50 mm\n",
-      "cooling energy, at -160 °c\n",
-      "cooling energy, at -15 °c\n",
-      "cooling energy, at -45 °c\n",
-      "steam, in chemical industry\n",
-      "ventilation duct, elbow 90°, steel, 100x50 mm\n",
-      "cooling energy, at -100 °c\n",
-      "sawnwood, paraná pine, dried (u=10%)\n",
-      "residual wood, dry\n",
-      "aluminium, primary, liquid\n",
-      "sawnwood, paraná pine, dried (u=10%)\n",
-      "sawlog and veneer log, paraná pine, measured as solid wood under bark\n",
-      "fraction 1 from naphtha separation\n",
-      "cooling energy, at -100 °c\n",
-      "sawlog and veneer log, paraná pine, measured as solid wood under bark\n",
-      "aluminium, primary, liquid\n",
-      "steam, in chemical industry\n",
-      "sawnwood, paraná pine, dried (u=10%)\n",
-      "2-methylpentane\n",
-      "sawnwood, paraná pine, dried (u=10%)\n",
-      "cooling energy, at -160 °c\n",
-      "fraction 7 from naphtha separation\n",
-      "ventilation duct, elbow 90°, steel, 100x50 mm\n",
-      "electricity, low voltage\n",
-      "1,1-dimethylcyclopentane\n",
-      "aluminium, primary, liquid\n",
-      "sawlog and veneer log, paraná pine, measured as solid wood under bark\n",
-      "formaldehyde\n",
-      "methylcyclopentane\n",
-      "methylcyclohexane\n",
-      "methylcyclopentane\n",
-      "methylcyclohexane\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "electricity, high voltage\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "natural gas, high pressure\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, passenger car\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, freight, lorry\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n",
-      "transport, passenger bus\n"
-     ]
+     "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; (region: 13)&gt; Size: 104B\n",
+       "array([0.24319538, 0.11075869, 0.37354394, 0.1023092 , 0.41335137,\n",
+       "       0.10468423, 0.19437585, 0.19803933, 0.10542634, 0.1051091 ,\n",
+       "       0.09484875, 0.39999575, 0.14865214])\n",
+       "Coordinates:\n",
+       "  * region     (region) object 104B &#x27;CAZ&#x27; &#x27;CHA&#x27; &#x27;EUR&#x27; ... &#x27;SSA&#x27; &#x27;USA&#x27; &#x27;World&#x27;\n",
+       "    year       int64 8B 2050\n",
+       "    variables  &lt;U6 24B &#x27;cement&#x27;</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'>region</span>: 13</li></ul></div><ul class='xr-sections'><li class='xr-section-item'><div class='xr-array-wrap'><input id='section-f602e43c-d79c-429e-9ec5-379dea27c84e' class='xr-array-in' type='checkbox' checked><label for='section-f602e43c-d79c-429e-9ec5-379dea27c84e' 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>0.2432 0.1108 0.3735 0.1023 0.4134 ... 0.1051 0.09485 0.4 0.1487</span></div><div class='xr-array-data'><pre>array([0.24319538, 0.11075869, 0.37354394, 0.1023092 , 0.41335137,\n",
+       "       0.10468423, 0.19437585, 0.19803933, 0.10542634, 0.1051091 ,\n",
+       "       0.09484875, 0.39999575, 0.14865214])</pre></div></div></li><li class='xr-section-item'><input id='section-76d18dfd-3edb-4c62-9d10-a45e6b21e369' class='xr-section-summary-in' type='checkbox'  checked><label for='section-76d18dfd-3edb-4c62-9d10-a45e6b21e369' 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 class='xr-has-index'>region</span></div><div class='xr-var-dims'>(region)</div><div class='xr-var-dtype'>object</div><div class='xr-var-preview xr-preview'>&#x27;CAZ&#x27; &#x27;CHA&#x27; &#x27;EUR&#x27; ... &#x27;USA&#x27; &#x27;World&#x27;</div><input id='attrs-b7437c28-1a31-4bc4-b0d4-7082f5122190' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-b7437c28-1a31-4bc4-b0d4-7082f5122190' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-770b5715-8c37-4964-948c-6051a2cefbd7' class='xr-var-data-in' type='checkbox'><label for='data-770b5715-8c37-4964-948c-6051a2cefbd7' 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;CAZ&#x27;, &#x27;CHA&#x27;, &#x27;EUR&#x27;, &#x27;IND&#x27;, &#x27;JPN&#x27;, &#x27;LAM&#x27;, &#x27;MEA&#x27;, &#x27;NEU&#x27;, &#x27;OAS&#x27;, &#x27;REF&#x27;,\n",
+       "       &#x27;SSA&#x27;, &#x27;USA&#x27;, &#x27;World&#x27;], dtype=object)</pre></div></li><li class='xr-var-item'><div class='xr-var-name'><span>year</span></div><div class='xr-var-dims'>()</div><div class='xr-var-dtype'>int64</div><div class='xr-var-preview xr-preview'>2050</div><input id='attrs-fdd9de87-bb6c-4cdd-94c8-5834bf5ad0d5' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-fdd9de87-bb6c-4cdd-94c8-5834bf5ad0d5' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-6c1c6d7a-9470-45c9-8589-f91b1778cdc5' class='xr-var-data-in' type='checkbox'><label for='data-6c1c6d7a-9470-45c9-8589-f91b1778cdc5' 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(2050)</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;U6</div><div class='xr-var-preview xr-preview'>&#x27;cement&#x27;</div><input id='attrs-95259748-6c7b-499a-8459-3cab307c1f5d' class='xr-var-attrs-in' type='checkbox' disabled><label for='attrs-95259748-6c7b-499a-8459-3cab307c1f5d' title='Show/Hide attributes'><svg class='icon xr-icon-file-text2'><use xlink:href='#icon-file-text2'></use></svg></label><input id='data-440f804c-f6ef-4671-b92b-9fe6de93e75e' class='xr-var-data-in' type='checkbox'><label for='data-440f804c-f6ef-4671-b92b-9fe6de93e75e' 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;cement&#x27;, dtype=&#x27;&lt;U6&#x27;)</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-94c57ce9-ac59-4e3a-ade9-e2f859e7cb61' class='xr-section-summary-in' type='checkbox'  ><label for='section-94c57ce9-ac59-4e3a-ade9-e2f859e7cb61' 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>region</div></div><div class='xr-index-preview'>PandasIndex</div><div></div><input id='index-8bbd4778-01fe-49ee-84fa-b9fd1d5a0110' class='xr-index-data-in' type='checkbox'/><label for='index-8bbd4778-01fe-49ee-84fa-b9fd1d5a0110' 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(Index([&#x27;CAZ&#x27;, &#x27;CHA&#x27;, &#x27;EUR&#x27;, &#x27;IND&#x27;, &#x27;JPN&#x27;, &#x27;LAM&#x27;, &#x27;MEA&#x27;, &#x27;NEU&#x27;, &#x27;OAS&#x27;, &#x27;REF&#x27;,\n",
+       "       &#x27;SSA&#x27;, &#x27;USA&#x27;, &#x27;World&#x27;],\n",
+       "      dtype=&#x27;object&#x27;, name=&#x27;region&#x27;))</pre></div></li></ul></div></li><li class='xr-section-item'><input id='section-c441cfa1-afb7-48bb-ae55-5f001e6db7fb' class='xr-section-summary-in' type='checkbox' disabled ><label for='section-c441cfa1-afb7-48bb-ae55-5f001e6db7fb' 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' (region: 13)> Size: 104B\n",
+       "array([0.24319538, 0.11075869, 0.37354394, 0.1023092 , 0.41335137,\n",
+       "       0.10468423, 0.19437585, 0.19803933, 0.10542634, 0.1051091 ,\n",
+       "       0.09484875, 0.39999575, 0.14865214])\n",
+       "Coordinates:\n",
+       "  * region     (region) object 104B 'CAZ' 'CHA' 'EUR' ... 'SSA' 'USA' 'World'\n",
+       "    year       int64 8B 2050\n",
+       "    variables  <U6 24B 'cement'"
+      ]
+     },
+     "execution_count": 8,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
-    "for x in ndb.scenarios[1][\"unmatched category flows\"]:\n",
-    "    print(x[1])"
+    "ndb.scenarios[0][\"iam data\"].carbon_capture_rate.sel(variables=\"cement\", year=2050)"
    ]
   },
   {
@@ -11587,7 +11294,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.13"
+   "version": "3.11.8"
   }
  },
  "nbformat": 4,
diff --git a/docs/extract.rst b/docs/extract.rst
index 1b755a8b..91fc7035 100644
--- a/docs/extract.rst
+++ b/docs/extract.rst
@@ -896,9 +896,10 @@ When using ecoinvent 3.8 as a database, *premise* imports new inventories for li
 NMC-111, NMC-6222 NMC-811 and NCA Lithium-ion battery inventories are originally
 from Dai_ et al. 2019. They have been adapted to ecoinvent by Crenna_ et al, 2021.
 LFP and LTO Lithium-ion battery inventories are from  Schmidt_ et al. 2019.
-Li-S battery inventories are from Wickerts_ et al. 2023.
-Li-O2 battery inventories are from Wang_ et al. 2020.
-Finally, SIB battery inventories are from Zhang22_ et al. 2024.
+Li-S (Lithium-sulfur) battery inventories are from Wickerts_ et al. 2023.
+Li-O2 (Lithium-air) battery inventories are from Wang_ et al. 2020.
+Finally, SIB (Sodium-ion) battery inventories are from Zhang22_ et al. 2024.
+Ecoinvent provides also inventories for LMO (Lithium Maganese Oxide) batteries.
 
 They introduce the following datasets:
 
diff --git a/docs/transform.rst b/docs/transform.rst
index ac694a56..8166747f 100644
--- a/docs/transform.rst
+++ b/docs/transform.rst
@@ -4,6 +4,33 @@ TRANSFORM
 A series of transformations are applied to the Life Cycle Inventory (LCI) database to align process performance
 and technology market shares with the outputs from the Integrated Assessment Model (IAM) scenario.
 
+Battery
+"""""""
+
+Inventories for several battery technologies are provided in *premise*.
+
+*premise* adjusts the mass of battery packs throughout the database
+to reflect progress in cell energy density.
+
+| Battery Type | 2020 (kWh/kg)        | 2050 Target (kWh/kg) |
+|--------------|----------------------|----------------------|
+| NMC111       | 0.150                | 0.200                |
+| NMC622       | 0.200                | 0.350                |
+| NMC811       | 0.220                | 0.500                |
+| NCA          | 0.280                | 0.350                |
+| LFP          | 0.140                | 0.250                |
+| LTO          | 0.080                | 0.150                |
+| LMO          | 0.130                | 0.200                |
+| Li-O2        | 0.240                | 0.500                |
+| BoP          | 0.2                  | 0.5                  |
+
+For example, in 2050, the mass of NMC811 batteries (cells and Balance of Plant) is expected to
+be 2.3 times lower.
+The report of changes will show the new mass of battery packs in the database.
+
+The target values used for scaling can be modified by the user.
+The YAML file is located in the premise/data/battery/energy_density.yaml.
+
 Biomass
 """""""
 
diff --git a/premise/battery.py b/premise/battery.py
new file mode 100644
index 00000000..3f8e4b32
--- /dev/null
+++ b/premise/battery.py
@@ -0,0 +1,153 @@
+"""
+module to adjust the battery inputs to reflect progress in
+terms of cell energy density.
+
+"""
+
+import yaml
+
+from .filesystem_constants import DATA_DIR
+from .logger import create_logger
+from .transformation import BaseTransformation, IAMDataCollection, List, np, ws
+
+logger = create_logger("battery")
+
+
+def load_cell_energy_density():
+    """
+    Load cell energy density data.
+    """
+    with open(DATA_DIR / "battery/energy_density.yaml", "r") as file:
+        data = yaml.load(file, Loader=yaml.FullLoader)
+
+    result = {}
+    for key, value in data.items():
+        names = value['ecoinvent_aliases']['name']
+        if isinstance(names, list):
+            for name in names:
+                result[name] = value['target']
+        else:
+            result[names] = value['target']
+
+    return result
+
+
+def _update_battery(scenario, version, system_model):
+    battery = Battery(
+        database=scenario["database"],
+        iam_data=scenario["iam data"],
+        model=scenario["model"],
+        pathway=scenario["pathway"],
+        year=scenario["year"],
+        version=version,
+        system_model=system_model,
+        cache=scenario.get("cache"),
+        index=scenario.get("index"),
+    )
+
+    battery.adjust_battery_mass()
+
+    scenario["database"] = battery.database
+    scenario["index"] = battery.index
+    scenario["cache"] = battery.cache
+
+    return scenario
+
+
+class Battery(BaseTransformation):
+    """
+    Class that modifies the battery market to reflect progress
+    in terms of cell energy density.
+
+    """
+
+    def __init__(
+        self,
+        database: List[dict],
+        iam_data: IAMDataCollection,
+        model: str,
+        pathway: str,
+        year: int,
+        version: str,
+        system_model: str,
+        cache: dict = None,
+        index: dict = None,
+    ) -> None:
+        super().__init__(
+            database,
+            iam_data,
+            model,
+            pathway,
+            year,
+            version,
+            system_model,
+            cache,
+            index,
+        )
+        self.system_model = system_model
+
+    def adjust_battery_mass(self) -> None:
+        """
+        Adjust vehicle components (e.g., battery).
+        Adjust the battery mass to reflect progress in battery technology.
+        Specifically, we adjust the battery mass to reflect progress in
+        terms of cell energy density.
+        We leave the density unchanged after 2050.
+        """
+
+        energy_density = load_cell_energy_density()
+
+        filters = [ws.contains("name", x) for x in energy_density]
+
+        for ds in ws.get_many(
+            self.database,
+            ws.exclude(
+                ws.either(
+                    *[
+                        ws.contains("name", x)
+                        for x in [
+                            "market for battery",
+                            "battery production",
+                            "battery cell production",
+                            "cell module production",
+                        ]
+                    ]
+                )
+            ),
+        ):
+
+            for exc in ws.technosphere(ds, ws.either(*filters)):
+                name = [x for x in energy_density if x in exc["name"]][0]
+
+                scaling_factor = energy_density[name][2020] / np.clip(
+                    np.interp(
+                        self.year,
+                        list(energy_density[name].keys()),
+                        list(energy_density[name].values()),
+                    ),
+                    0.1,
+                    0.5,
+                )
+
+                if "log parameters" not in ds:
+                    ds["log parameters"] = {}
+
+                ds["log parameters"]["battery input"] = exc["name"]
+                ds["log parameters"]["old battery mass"] = exc["amount"]
+                exc["amount"] *= scaling_factor
+                ds["log parameters"]["new battery mass"] = exc["amount"]
+
+                self.write_log(ds, status="modified")
+
+    def write_log(self, dataset, status="created"):
+        """
+        Write log file.
+        """
+
+        logger.info(
+            f"{status}|{self.model}|{self.scenario}|{self.year}|"
+            f"{dataset['name']}|{dataset['location']}|"
+            f"{dataset.get('log parameters', {}).get('battery input', '')}|"
+            f"{dataset.get('log parameters', {}).get('old battery mass', '')}|"
+            f"{dataset.get('log parameters', {}).get('new battery mass', '')}"
+        )
diff --git a/premise/data/additional_inventories/lci-batteries-LiO2.xlsx b/premise/data/additional_inventories/lci-batteries-LiO2.xlsx
index d2b338f0..af786c2c 100644
Binary files a/premise/data/additional_inventories/lci-batteries-LiO2.xlsx and b/premise/data/additional_inventories/lci-batteries-LiO2.xlsx differ
diff --git a/premise/data/battery/energy_density.yaml b/premise/data/battery/energy_density.yaml
new file mode 100644
index 00000000..707041c5
--- /dev/null
+++ b/premise/data/battery/energy_density.yaml
@@ -0,0 +1,78 @@
+# Battery cell energy densities, in kWh/kg cell
+---
+
+NMC111:
+  ecoinvent_aliases:
+    name:
+     - market for battery cell, Li-ion, NMC111
+     - market for battery, Li-ion, NMC111, rechargeable, prismatic
+  target:
+    2020: 0.150
+    2050: 0.200
+
+NMC622:
+  ecoinvent_aliases:
+    name:
+     - market for battery cell, Li-ion, NMC622
+     - market for battery, Li-ion, NMC622, rechargeable, prismatic
+  target:
+    2020: 0.200
+    2050: 0.350
+
+NMC811:
+  ecoinvent_aliases:
+    name:
+    - market for battery cell, Li-ion, NMC811
+    - market for battery, Li-ion, NMC811, rechargeable, prismatic
+  target:
+    2020: 0.220
+    2050: 0.500
+
+NCA:
+  ecoinvent_aliases:
+    name:
+     - market for battery cell, Li-ion, NCA
+     - market for battery, Li-ion, NCA, rechargeable, prismatic
+  target:
+      2020: 0.280
+      2050: 0.350
+
+LFP:
+  ecoinvent_aliases:
+    name:
+      - market for battery cell, Li-ion, LFP
+      - market for battery, Li-ion, LFP, rechargeable, prismatic
+  target:
+      2020: 0.140
+      2050: 0.250
+
+LTO:
+  ecoinvent_aliases:
+    name: market for battery cell, Li-ion, LTO
+  target:
+      2020: 0.080
+      2050: 0.150
+
+LMO:
+  ecoinvent_aliases:
+    name:
+      - market for battery cell, Li-ion, LiMn2O4
+      - market for battery, Li-ion, LiMn2O4, rechargeable, prismatic
+
+  target:
+      2020: 0.130
+      2050: 0.200
+
+Li-O2:
+  ecoinvent_aliases:
+    name: market for battery, Li-oxygen, Li-O2
+  target:
+      2020: 0.24
+      2050: 0.50
+
+BoP:
+  ecoinvent_aliases:
+    name: market for battery management system
+  target:
+      2020: 0.2
+      2050: 0.5
diff --git a/premise/data/utils/logging/logconfig.yaml b/premise/data/utils/logging/logconfig.yaml
index 71b3ad7d..1732f9b2 100644
--- a/premise/data/utils/logging/logconfig.yaml
+++ b/premise/data/utils/logging/logconfig.yaml
@@ -72,6 +72,14 @@ handlers:
     formatter: simple
     mode: a
 
+  file_battery:
+    class: logging.FileHandler
+    level: INFO
+    filename: "export/logs/premise_battery.log"
+    encoding: utf8
+    formatter: simple
+    mode: a
+
   file_emissions:
     class: logging.FileHandler
     level: INFO
@@ -132,6 +140,11 @@ loggers:
     handlers: [ file_fuel ]
     propagate: False
 
+  battery:
+    level: INFO
+    handlers: [ file_battery ]
+    propagate: False
+
   heat:
     level: INFO
     handlers: [ file_heat ]
diff --git a/premise/data/utils/logging/reporting.yaml b/premise/data/utils/logging/reporting.yaml
index d5901cf6..b4bc4854 100644
--- a/premise/data/utils/logging/reporting.yaml
+++ b/premise/data/utils/logging/reporting.yaml
@@ -462,6 +462,49 @@ premise_heat:
         unit: kg CO2/reference flow
     tab: Heat
 
+premise_battery:
+    columns:
+      timestamp:
+        name: timestamp
+        description: Timestamp of the log entry
+      module:
+        name: module
+        description: Module name
+      level:
+        name: level
+        description: Log level
+      status:
+        name: status
+        description: Status of the dataset
+      model:
+        name: model
+        description: IAM model name
+      pathway:
+        name: pathway
+        description: Pathway name
+      year:
+        name: year
+        description: Year
+      dataset:
+        name: dataset
+        description: Dataset name
+      region:
+        name: region
+        description: Region name
+      battery input:
+        name: Battery provider
+        description: Name of the battery provider
+        unit: unitless
+      old battery mass:
+        name: Old battery mass
+        description: Mass of the battery before adjustment
+        unit: kg
+      new battery mass:
+        name: New battery mass
+        description: Mass of the battery after adjustment
+        unit: kg
+    tab: Battery
+
 premise_emissions:
     columns:
       timestamp:
diff --git a/premise/data_collection.py b/premise/data_collection.py
index 8f71da8c..4f143f30 100644
--- a/premise/data_collection.py
+++ b/premise/data_collection.py
@@ -949,7 +949,12 @@ def __fetch_market_data(
 
         # check if values of input_vars are strings or lists
         if any(isinstance(x, list) for x in input_vars.values()):
-            vars = list(chain.from_iterable(input_vars.values()))
+            vars = [
+                item
+                for sublist in input_vars.values()
+                for item in (sublist if isinstance(sublist, list) else [sublist])
+            ]
+
         else:
             vars = list(input_vars.values())
 
@@ -966,7 +971,12 @@ def __fetch_market_data(
             return None
 
         if any(isinstance(x, list) for x in input_vars.values()):
-            rev_input_vars = {x: k for k, v in input_vars.items() for x in v}
+            rev_input_vars = {
+                v: k
+                for k, val in input_vars.items()
+                for v in (val if isinstance(val, list) else [val])
+            }
+
         else:
             rev_input_vars = {v: k for k, v in input_vars.items()}
 
@@ -994,6 +1004,9 @@ def __fetch_market_data(
         # fill NaNs with zeros
         market_data = market_data.fillna(0)
 
+        # remove attrs
+        market_data.attrs = {}
+
         return market_data
 
     def get_iam_efficiencies(
@@ -1012,6 +1025,7 @@ def get_iam_efficiencies(
         :param efficiency_labels: The efficiency labels to use.
         :param production_labels: The production labels to use.
         :param energy_labels: The energy labels to use.
+        :param use_absolute_efficiency: If True, the efficiency is considered as absolute.
 
         :return: a multidimensional array with sector's technologies market
         share for a given year, for all regions.
@@ -1057,7 +1071,6 @@ def get_iam_efficiencies(
         elif production_labels and energy_labels:
             eff_data = xr.DataArray(dims=["variables"], coords={"variables": []})
             for k, v in production_labels.items():
-
                 # check that each element of energy.values() is in data.variables.values
                 # knowing that energy.values() is a list of lists
                 # and that each element of prod.values() is in data.variables.values
diff --git a/premise/iam_variables_mapping/electricity_variables.yaml b/premise/iam_variables_mapping/electricity_variables.yaml
index b3f75482..d2e9c3dd 100644
--- a/premise/iam_variables_mapping/electricity_variables.yaml
+++ b/premise/iam_variables_mapping/electricity_variables.yaml
@@ -1,7 +1,7 @@
 Biogas CHP:
   ecoinvent_aliases:
     fltr:
-    - heat and power co-generation, biogas, gas engine
+      - heat and power co-generation, biogas, gas engine
     mask:
       reference product: heat
   ecoinvent_fuel_aliases:
diff --git a/premise/new_database.py b/premise/new_database.py
index c03e45b6..4d5c4cc8 100644
--- a/premise/new_database.py
+++ b/premise/new_database.py
@@ -16,6 +16,7 @@
 from tqdm import tqdm
 
 from . import __version__
+from .battery import _update_battery
 from .biomass import _update_biomass
 from .cement import _update_cement
 from .clean_datasets import DatabaseCleaner
@@ -865,6 +866,10 @@ def update(self, sectors: [str, list, None] = None) -> None:
             "steel": {"func": _update_steel, "args": (self.version, self.system_model)},
             "fuels": {"func": _update_fuels, "args": (self.version, self.system_model)},
             "heat": {"func": _update_heat, "args": (self.version, self.system_model)},
+            "battery": {
+                "func": _update_battery,
+                "args": (self.version, self.system_model),
+            },
             "emissions": {
                 "func": _update_emissions,
                 "args": (self.version, self.system_model, self.gains_scenario),
diff --git a/premise/report.py b/premise/report.py
index 0bac1598..616b160e 100644
--- a/premise/report.py
+++ b/premise/report.py
@@ -382,7 +382,7 @@ def generate_summary_report(scenarios: list, filename: Path) -> None:
         },
     }
 
-    with open(REPORT_METADATA_FILEPATH, "r", encoding="utf-8") as stream:
+    with open(REPORT_METADATA_FILEPATH, encoding="utf-8") as stream:
         metadata = yaml.safe_load(stream)
 
     workbook = openpyxl.Workbook()
@@ -423,7 +423,7 @@ def generate_summary_report(scenarios: list, filename: Path) -> None:
                 )
 
                 if "CCS" in sector and iam_data is not None:
-                    iam_data = iam_data * 100
+                    iam_data *= 100
 
                 if iam_data is None:
                     continue
@@ -536,6 +536,7 @@ def generate_change_report(source, version, source_type, system_model):
         "premise_electricity",
         "premise_fuel",
         "premise_heat",
+        "premise_battery",
         "premise_transport",
         "premise_steel",
         "premise_metal",
diff --git a/premise/transport.py b/premise/transport.py
index e27104d4..a11c858e 100644
--- a/premise/transport.py
+++ b/premise/transport.py
@@ -4,7 +4,6 @@
 IAM data, and integrate them into the database.
 """
 
-import re
 import uuid
 from typing import Any, Dict, List, Union
 
@@ -12,7 +11,6 @@
 import xarray as xr
 import yaml
 from wurst import searching as ws
-from wurst import transformations as wt
 
 from .filesystem_constants import DATA_DIR, IAM_OUTPUT_DIR, INVENTORY_DIR
 from .inventory_imports import VariousVehicles