diff --git a/notebooks/bug-fix/failure-analysis.ipynb b/notebooks/bug-fix/failure-analysis.ipynb
index b153f86c6..f3423369a 100644
--- a/notebooks/bug-fix/failure-analysis.ipynb
+++ b/notebooks/bug-fix/failure-analysis.ipynb
@@ -5826,7 +5826,7 @@
     "\n",
     "from utils import DATASET_PATH\n",
     "\n",
-    "from bcbench.dataset import load_dataset_entries\n",
+    "from bcbench.dataset import BugFixEntry\n",
     "\n",
     "# Extract AL object types from gold patch filenames.\n",
     "# AL files usually follow <Name>.<ObjectType>.al (for example, SalesPost.Codeunit.al).\n",
@@ -5841,7 +5841,7 @@
     "    return sorted(object_types)\n",
     "\n",
     "\n",
-    "dataset_entries = load_dataset_entries(DATASET_PATH)\n",
+    "dataset_entries = BugFixEntry.load(DATASET_PATH)\n",
     "gold_object_types = {entry.instance_id: extract_al_object_types_from_patch(entry.patch) for entry in dataset_entries}\n",
     "\n",
     "task_df = (\n",
diff --git a/notebooks/bug-fix/overview.ipynb b/notebooks/bug-fix/overview.ipynb
index 9bd0599fd..49211055d 100644
--- a/notebooks/bug-fix/overview.ipynb
+++ b/notebooks/bug-fix/overview.ipynb
@@ -116,10 +116,10 @@
     "import pandas as pd\n",
     "\n",
     "from bcbench.config import get_config\n",
-    "from bcbench.dataset import DatasetEntry, load_dataset_entries\n",
+    "from bcbench.dataset import BugFixEntry\n",
     "\n",
     "_config = get_config()\n",
-    "bcbench_dataset: list[DatasetEntry] = load_dataset_entries(_config.paths.dataset_path)\n",
+    "bcbench_dataset: list[BugFixEntry] = BugFixEntry.load(_config.paths.dataset_dir / \"bcbench.jsonl\")\n",
     "\n",
     "dataset_df = pd.DataFrame(\n",
     "    [\n",
diff --git a/notebooks/dataset.ipynb b/notebooks/dataset.ipynb
index 3f2c3382b..0fbd01e77 100644
--- a/notebooks/dataset.ipynb
+++ b/notebooks/dataset.ipynb
@@ -16,11 +16,11 @@
    ],
    "source": [
     "from bcbench.config import get_config\n",
-    "from bcbench.dataset import DatasetEntry, load_dataset_entries\n",
+    "from bcbench.dataset import BugFixEntry\n",
     "\n",
     "_config = get_config()\n",
     "\n",
-    "bcbench_dataset: list[DatasetEntry] = load_dataset_entries(_config.paths.dataset_path)\n",
+    "bcbench_dataset: list[BugFixEntry] = BugFixEntry.load(_config.paths.dataset_dir / \"bcbench.jsonl\")\n",
     "\n",
     "print(f\"Total number of instances: {len(bcbench_dataset)}\")"
    ]
diff --git a/notebooks/test-generation/overview.ipynb b/notebooks/test-generation/overview.ipynb
index 9744dcacd..053e78c8b 100644
--- a/notebooks/test-generation/overview.ipynb
+++ b/notebooks/test-generation/overview.ipynb
@@ -175,10 +175,10 @@
     "import pandas as pd\n",
     "\n",
     "from bcbench.config import get_config\n",
-    "from bcbench.dataset import DatasetEntry, load_dataset_entries\n",
+    "from bcbench.dataset import BugFixEntry\n",
     "\n",
     "_config = get_config()\n",
-    "bcbench_dataset: list[DatasetEntry] = load_dataset_entries(_config.paths.dataset_path)\n",
+    "bcbench_dataset: list[BugFixEntry] = BugFixEntry.load(_config.paths.dataset_dir / \"bcbench.jsonl\")\n",
     "\n",
     "dataset_df = pd.DataFrame(\n",
     "    [\n",
diff --git a/pyproject.toml b/pyproject.toml
index e00138488..ef34cf1d3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bcbench"
-version = "0.4.0"
+version = "0.5.0"
 description = "Benchmarking tool for Business Central (AL) ecosystem, inspired by SWE-Bench"
 readme = "README.md"
 requires-python = ">=3.13"
diff --git a/uv.lock b/uv.lock
index a810fd4b6..9038807b2 100644
--- a/uv.lock
+++ b/uv.lock
@@ -142,7 +142,7 @@ wheels = [
 
 [[package]]
 name = "bcbench"
-version = "0.4.0"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "jsonschema" },