diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2d0e9261..f461f088 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,10 +1,13 @@
-FROM python:3.9-slim@sha256:5f0192a4f58a6ce99f732fe05e3b3d00f12ae62e183886bca3ebe3d202686c7f
+ARG PY_VER=3.11
+ARG DISTRO=bullseye
+FROM mcr.microsoft.com/devcontainers/python:${PY_VER}-${DISTRO}
 
-ENV PATH /usr/local/bin:$PATH
-ENV PYTHON_VERSION 3.9.17
+# Avoid warnings by switching to noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+USER root
 
 RUN \
-    adduser --system --disabled-password --shell /bin/bash vscode && \
     # install docker
     apt-get update && \
     apt-get install ca-certificates curl gnupg lsb-release -y && \
@@ -45,4 +48,5 @@ ENV EPHYS_ROOT_DATA_DIR /workspaces/element-array-ephys/example_data
 ENV DATABASE_PREFIX neuro_
 
 USER vscode
-CMD bash -c "sudo rm /var/run/docker.pid; sudo dockerd"
\ No newline at end of file
+
+CMD bash -c "sudo rm /var/run/docker.pid; sudo dockerd"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index bf939e88..1c062f18 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,8 +22,8 @@
 		},
 		"vscode": {
 			"extensions": [
-				"ms-python.python@2023.8.0",
-				"ms-toolsai.jupyter@2023.3.1201040234"
+				"ms-python.python@2025.6.1",
+				"ms-toolsai.jupyter@2025.4.1"
 			]
 		}
 	}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a0a85cd..93b08501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 Observes [Semantic Versioning](https://semver.org/spec/v2.0.0.html) standard and
  [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) convention.
 
+## [0.4.4] - 2025-06-06
+
++ Update - Update params in test/tutorial
++ Fix - Moved KiloSort's template_features  to additional_files 
+
 ## [0.4.3] - 2025-06-03
 
 + Update - Use `Spikeinterface` official released versions (instead of install directly from source)
diff --git a/notebooks/tutorial.ipynb b/notebooks/tutorial.ipynb
index 09d41f44..f022f6fc 100644
--- a/notebooks/tutorial.ipynb
+++ b/notebooks/tutorial.ipynb
@@ -88,8 +88,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "[2024-03-21 20:57:39,371][INFO]: Connecting root@fakeservices.datajoint.io:3306\n",
-      "[2024-03-21 20:57:39,378][INFO]: Connected root@fakeservices.datajoint.io:3306\n"
+      "[2025-06-09 17:50:59,598][INFO]: DataJoint 0.14.4 connected to root@fakeservices.datajoint.io:3306\n"
      ]
     },
     {
@@ -122,7 +121,15 @@
    "cell_type": "code",
    "execution_count": 3,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "[2025-06-09 17:50:59,755][WARNING]: lab.Project and related tables will be removed in a future version of Element Lab. Please use the project schema.\n"
+     ]
+    }
+   ],
    "source": [
     "from tests.tutorial_pipeline import lab, subject, session, probe, ephys"
    ]
@@ -143,433 +150,452 @@
     {
      "data": {
       "image/svg+xml": [
-       "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"822pt\" height=\"595pt\" viewBox=\"0.00 0.00 822.00 595.00\">\n",
+       "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"977pt\" height=\"595pt\" viewBox=\"0.00 0.00 977.00 595.00\">\n",
        "<g id=\"graph0\" class=\"graph\" transform=\"scale(1 1) rotate(0) translate(4 591)\">\n",
        "<title>%3</title>\n",
-       "<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-591 818,-591 818,4 -4,4\"/>\n",
-       "<!-- ephys.WaveformSet.Waveform -->\n",
+       "<polygon fill=\"white\" stroke=\"transparent\" points=\"-4,4 -4,-591 973,-591 973,4 -4,4\"/>\n",
+       "<!-- ephys.LFP -->\n",
        "<g id=\"node1\" class=\"node\">\n",
-       "<title>ephys.WaveformSet.Waveform</title>\n",
-       "<g id=\"a_node1\"><a xlink:title=\"→ ephys.WaveformSet\r→ ephys.CuratedClustering.Unit\r→ probe.ElectrodeConfig.Electrode\r------------------------------\rwaveform_mean        \rwaveforms=null       \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"814,-19 662,-19 662,0 814,0 814,-19\"/>\n",
-       "<text text-anchor=\"middle\" x=\"738\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.WaveformSet.Waveform</text>\n",
+       "<title>ephys.LFP</title>\n",
+       "<g id=\"a_node1\"><a xlink:title=\"→ ephys.EphysRecording\r------------------------------\rlfp_sampling_rate    \rlfp_time_stamps      \rlfp_mean             \r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"383\" cy=\"-285.5\" rx=\"46.5\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"383\" y=\"-282.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.LFP</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- probe.ElectrodeConfig -->\n",
+       "<!-- ephys.LFP.Electrode -->\n",
+       "<g id=\"node17\" class=\"node\">\n",
+       "<title>ephys.LFP.Electrode</title>\n",
+       "<g id=\"a_node17\"><a xlink:title=\"→ ephys.LFP\r→ probe.ElectrodeConfig.Electrode\r------------------------------\rlfp                  \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"539.5,-224 432.5,-224 432.5,-205 539.5,-205 539.5,-224\"/>\n",
+       "<text text-anchor=\"middle\" x=\"486\" y=\"-212\" font-family=\"arial\" font-size=\"10.00\">ephys.LFP.Electrode</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- ephys.LFP&#45;&gt;ephys.LFP.Electrode -->\n",
+       "<g id=\"edge1\" class=\"edge\">\n",
+       "<title>ephys.LFP-&gt;ephys.LFP.Electrode</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M404.84,-269.87C425.63,-255.94 456.19,-235.47 473.27,-224.03\"/>\n",
+       "</g>\n",
+       "<!-- ephys.EphysRecording.EphysFile -->\n",
        "<g id=\"node2\" class=\"node\">\n",
-       "<title>probe.ElectrodeConfig</title>\n",
-       "<g id=\"a_node2\"><a xlink:title=\"electrode_config_hash \r------------------------------\r→ probe.ProbeType\relectrode_config_name \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"632.5,-445 519.5,-445 519.5,-410 632.5,-410 632.5,-445\"/>\n",
-       "<text text-anchor=\"start\" x=\"527.5\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ElectrodeConfig</text>\n",
+       "<title>ephys.EphysRecording.EphysFile</title>\n",
+       "<g id=\"a_node2\"><a xlink:title=\"→ ephys.EphysRecording\rfile_path            \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"319,-295 155,-295 155,-276 319,-276 319,-295\"/>\n",
+       "<text text-anchor=\"start\" x=\"163\" y=\"-284\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.EphysRecording.EphysFile</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.EphysRecording -->\n",
+       "<!-- ephys.ClusteringTask -->\n",
        "<g id=\"node3\" class=\"node\">\n",
-       "<title>ephys.EphysRecording</title>\n",
-       "<g id=\"a_node3\"><a xlink:title=\"→ ephys.ProbeInsertion\r------------------------------\r→ probe.ElectrodeConfig\r→ ephys.AcquisitionSoftware\rsampling_rate        \rrecording_datetime   \rrecording_duration   \r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"402\" cy=\"-356.5\" rx=\"88.25\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"402\" y=\"-353.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.EphysRecording</text>\n",
+       "<title>ephys.ClusteringTask</title>\n",
+       "<g id=\"a_node3\"><a xlink:title=\"→ ephys.EphysRecording\r→ ephys.ClusteringParamSet\r------------------------------\rclustering_output_dir=&quot;&quot; \rtask_mode=&quot;load&quot;     \r\">\n",
+       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"136.5,-303 5.5,-303 5.5,-268 136.5,-268 136.5,-303\"/>\n",
+       "<text text-anchor=\"middle\" x=\"71\" y=\"-282.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"darkgreen\">ephys.ClusteringTask</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- probe.ElectrodeConfig&#45;&gt;ephys.EphysRecording -->\n",
-       "<g id=\"edge1\" class=\"edge\">\n",
-       "<title>probe.ElectrodeConfig-&gt;ephys.EphysRecording</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M534.32,-409.97C505.47,-398.53 467.38,-383.43 439.49,-372.36\"/>\n",
+       "<!-- ephys.Clustering -->\n",
+       "<g id=\"node8\" class=\"node\">\n",
+       "<title>ephys.Clustering</title>\n",
+       "<g id=\"a_node8\"><a xlink:title=\"→ ephys.ClusteringTask\r------------------------------\rclustering_time      \rpackage_version=&quot;&quot;   \r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"261\" cy=\"-214.5\" rx=\"66.75\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"261\" y=\"-211.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.Clustering</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- ephys.ClusteringTask&#45;&gt;ephys.Clustering -->\n",
+       "<g id=\"edge2\" class=\"edge\">\n",
+       "<title>ephys.ClusteringTask-&gt;ephys.Clustering</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M116.51,-267.97C149.23,-256.09 192.81,-240.27 223.52,-229.11\"/>\n",
+       "</g>\n",
+       "<!-- probe.ElectrodeConfig -->\n",
+       "<g id=\"node4\" class=\"node\">\n",
+       "<title>probe.ElectrodeConfig</title>\n",
+       "<g id=\"a_node4\"><a xlink:title=\"electrode_config_hash \r------------------------------\r→ probe.ProbeType\relectrode_config_name \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"599.5,-445 486.5,-445 486.5,-410 599.5,-410 599.5,-445\"/>\n",
+       "<text text-anchor=\"start\" x=\"494.5\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ElectrodeConfig</text>\n",
+       "</a>\n",
+       "</g>\n",
        "</g>\n",
        "<!-- probe.ElectrodeConfig.Electrode -->\n",
-       "<g id=\"node5\" class=\"node\">\n",
+       "<g id=\"node13\" class=\"node\">\n",
        "<title>probe.ElectrodeConfig.Electrode</title>\n",
-       "<g id=\"a_node5\"><a xlink:title=\"→ probe.ElectrodeConfig\r→ probe.ProbeType.Electrode\r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"666,-366 508,-366 508,-347 666,-347 666,-366\"/>\n",
-       "<text text-anchor=\"middle\" x=\"587\" y=\"-354\" font-family=\"arial\" font-size=\"10.00\">probe.ElectrodeConfig.Electrode</text>\n",
+       "<g id=\"a_node13\"><a xlink:title=\"→ probe.ElectrodeConfig\r→ probe.ProbeType.Electrode\r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"712,-366 554,-366 554,-347 712,-347 712,-366\"/>\n",
+       "<text text-anchor=\"middle\" x=\"633\" y=\"-354\" font-family=\"arial\" font-size=\"10.00\">probe.ElectrodeConfig.Electrode</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
        "<!-- probe.ElectrodeConfig&#45;&gt;probe.ElectrodeConfig.Electrode -->\n",
-       "<g id=\"edge2\" class=\"edge\">\n",
+       "<g id=\"edge3\" class=\"edge\">\n",
        "<title>probe.ElectrodeConfig-&gt;probe.ElectrodeConfig.Electrode</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M578.66,-409.8C580.85,-396.08 583.86,-377.19 585.6,-366.27\"/>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M564.79,-409.8C582.68,-396.08 607.32,-377.19 621.57,-366.27\"/>\n",
        "</g>\n",
-       "<!-- ephys.LFP -->\n",
-       "<g id=\"node6\" class=\"node\">\n",
-       "<title>ephys.LFP</title>\n",
-       "<g id=\"a_node6\"><a xlink:title=\"→ ephys.EphysRecording\r------------------------------\rlfp_sampling_rate    \rlfp_time_stamps      \rlfp_mean             \r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"256\" cy=\"-285.5\" rx=\"46.5\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"256\" y=\"-282.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.LFP</text>\n",
+       "<!-- ephys.EphysRecording -->\n",
+       "<g id=\"node24\" class=\"node\">\n",
+       "<title>ephys.EphysRecording</title>\n",
+       "<g id=\"a_node24\"><a xlink:title=\"→ ephys.ProbeInsertion\r------------------------------\r→ probe.ElectrodeConfig\r→ ephys.AcquisitionSoftware\rsampling_rate        \rrecording_datetime   \rrecording_duration   \r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"402\" cy=\"-356.5\" rx=\"88.25\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"402\" y=\"-353.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.EphysRecording</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.EphysRecording&#45;&gt;ephys.LFP -->\n",
-       "<g id=\"edge3\" class=\"edge\">\n",
-       "<title>ephys.EphysRecording-&gt;ephys.LFP</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M369.6,-340.19C343.89,-328.04 308.34,-311.23 283.89,-299.68\"/>\n",
+       "<!-- probe.ElectrodeConfig&#45;&gt;ephys.EphysRecording -->\n",
+       "<g id=\"edge4\" class=\"edge\">\n",
+       "<title>probe.ElectrodeConfig-&gt;ephys.EphysRecording</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M509.23,-409.97C486.25,-398.73 456.06,-383.95 433.56,-372.95\"/>\n",
        "</g>\n",
-       "<!-- ephys.ClusteringTask -->\n",
-       "<g id=\"node12\" class=\"node\">\n",
-       "<title>ephys.ClusteringTask</title>\n",
-       "<g id=\"a_node12\"><a xlink:title=\"→ ephys.EphysRecording\r→ ephys.ClusteringParamSet\r------------------------------\rclustering_output_dir=&quot;&quot; \rtask_mode=&quot;load&quot;     \r\">\n",
-       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"183.5,-303 52.5,-303 52.5,-268 183.5,-268 183.5,-303\"/>\n",
-       "<text text-anchor=\"middle\" x=\"118\" y=\"-282.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"darkgreen\">ephys.ClusteringTask</text>\n",
+       "<!-- ephys.InsertionLocation -->\n",
+       "<g id=\"node5\" class=\"node\">\n",
+       "<title>ephys.InsertionLocation</title>\n",
+       "<g id=\"a_node5\"><a xlink:title=\"→ ephys.ProbeInsertion\r------------------------------\r→ `neuro_lab`.`#skull_reference`\rap_location          \rml_location          \rdepth                \rtheta=null           \rphi=null             \rbeta=null            \r\">\n",
+       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"295.5,-374 152.5,-374 152.5,-339 295.5,-339 295.5,-374\"/>\n",
+       "<text text-anchor=\"middle\" x=\"224\" y=\"-353.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"darkgreen\">ephys.InsertionLocation</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.EphysRecording&#45;&gt;ephys.ClusteringTask -->\n",
-       "<g id=\"edge4\" class=\"edge\">\n",
-       "<title>ephys.EphysRecording-&gt;ephys.ClusteringTask</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M348.58,-342.52C301.82,-331.16 233.73,-314.62 183.66,-302.45\"/>\n",
+       "<!-- subject.Subject -->\n",
+       "<g id=\"node6\" class=\"node\">\n",
+       "<title>subject.Subject</title>\n",
+       "<g id=\"a_node6\"><a xlink:title=\"subject              \r------------------------------\rsubject_nickname=&quot;&quot;  \rsex                  \rsubject_birth_date   \rsubject_description=&quot;&quot; \r\">\n",
+       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"301,-587 203,-587 203,-552 301,-552 301,-587\"/>\n",
+       "<text text-anchor=\"start\" x=\"211\" y=\"-567.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">subject.Subject</text>\n",
+       "</a>\n",
        "</g>\n",
-       "<!-- ephys.EphysRecording.EphysFile -->\n",
-       "<g id=\"node15\" class=\"node\">\n",
-       "<title>ephys.EphysRecording.EphysFile</title>\n",
-       "<g id=\"a_node15\"><a xlink:title=\"→ ephys.EphysRecording\rfile_path            \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"484,-295 320,-295 320,-276 484,-276 484,-295\"/>\n",
-       "<text text-anchor=\"start\" x=\"328\" y=\"-284\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.EphysRecording.EphysFile</text>\n",
+       "</g>\n",
+       "<!-- session.Session -->\n",
+       "<g id=\"node14\" class=\"node\">\n",
+       "<title>session.Session</title>\n",
+       "<g id=\"a_node14\"><a xlink:title=\"→ subject.Subject\rsession_datetime     \r------------------------------\rsession_id=null      \r\">\n",
+       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"304,-516 200,-516 200,-481 304,-481 304,-516\"/>\n",
+       "<text text-anchor=\"start\" x=\"208\" y=\"-496.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">session.Session</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.EphysRecording&#45;&gt;ephys.EphysRecording.EphysFile -->\n",
+       "<!-- subject.Subject&#45;&gt;session.Session -->\n",
        "<g id=\"edge5\" class=\"edge\">\n",
-       "<title>ephys.EphysRecording-&gt;ephys.EphysRecording.EphysFile</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M402,-338.8C402,-325.08 402,-306.19 402,-295.27\"/>\n",
+       "<title>subject.Subject-&gt;session.Session</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M252,-551.8C252,-540.95 252,-526.87 252,-516.05\"/>\n",
        "</g>\n",
-       "<!-- ephys.ClusteringParamSet -->\n",
-       "<g id=\"node4\" class=\"node\">\n",
-       "<title>ephys.ClusteringParamSet</title>\n",
-       "<g id=\"a_node4\"><a xlink:title=\"paramset_idx         \r------------------------------\r→ ephys.ClusteringMethod\rparamset_desc        \rparam_set_hash       \rparams               \rUNIQUE INDEX (param_set_hash)\r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"134,-374 0,-374 0,-339 134,-339 134,-374\"/>\n",
-       "<text text-anchor=\"start\" x=\"8\" y=\"-355\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusteringParamSet</text>\n",
+       "<!-- ephys.ProbeInsertion -->\n",
+       "<g id=\"node7\" class=\"node\">\n",
+       "<title>ephys.ProbeInsertion</title>\n",
+       "<g id=\"a_node7\"><a xlink:title=\"→ session.Session\rinsertion_number     \r------------------------------\r→ probe.Probe\r\">\n",
+       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"317,-445 187,-445 187,-410 317,-410 317,-445\"/>\n",
+       "<text text-anchor=\"start\" x=\"195\" y=\"-425.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">ephys.ProbeInsertion</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.ClusteringParamSet&#45;&gt;ephys.ClusteringTask -->\n",
+       "<!-- ephys.ProbeInsertion&#45;&gt;ephys.InsertionLocation -->\n",
        "<g id=\"edge6\" class=\"edge\">\n",
-       "<title>ephys.ClusteringParamSet-&gt;ephys.ClusteringTask</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M79.35,-338.8C87.36,-327.95 97.77,-313.87 105.77,-303.05\"/>\n",
+       "<title>ephys.ProbeInsertion-&gt;ephys.InsertionLocation</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M245.22,-409.8C240.82,-398.95 235.11,-384.87 230.72,-374.05\"/>\n",
        "</g>\n",
-       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.WaveformSet.Waveform -->\n",
+       "<!-- ephys.ProbeInsertion&#45;&gt;ephys.EphysRecording -->\n",
        "<g id=\"edge7\" class=\"edge\">\n",
-       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.WaveformSet.Waveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M609.61,-346.91C651.73,-329.26 738,-284.67 738,-215.5 738,-215.5 738,-215.5 738,-142.5 738,-95.98 738,-40.24 738,-19.15\"/>\n",
+       "<title>ephys.ProbeInsertion-&gt;ephys.EphysRecording</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M287.93,-409.97C312.46,-398.69 344.72,-383.85 368.67,-372.83\"/>\n",
        "</g>\n",
-       "<!-- ephys.LFP.Electrode -->\n",
-       "<g id=\"node16\" class=\"node\">\n",
-       "<title>ephys.LFP.Electrode</title>\n",
-       "<g id=\"a_node16\"><a xlink:title=\"→ ephys.LFP\r→ probe.ElectrodeConfig.Electrode\r------------------------------\rlfp                  \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"309.5,-224 202.5,-224 202.5,-205 309.5,-205 309.5,-224\"/>\n",
-       "<text text-anchor=\"middle\" x=\"256\" y=\"-212\" font-family=\"arial\" font-size=\"10.00\">ephys.LFP.Electrode</text>\n",
+       "<!-- ephys.CuratedClustering -->\n",
+       "<g id=\"node18\" class=\"node\">\n",
+       "<title>ephys.CuratedClustering</title>\n",
+       "<g id=\"a_node18\"><a xlink:title=\"→ ephys.Clustering\r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"515\" cy=\"-143.5\" rx=\"93.25\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"515\" y=\"-140.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.CuratedClustering</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.LFP.Electrode -->\n",
+       "<!-- ephys.Clustering&#45;&gt;ephys.CuratedClustering -->\n",
        "<g id=\"edge8\" class=\"edge\">\n",
-       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.LFP.Electrode</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M578.88,-346.86C559.94,-326.9 512.93,-278.47 493,-268 434.8,-237.42 359.53,-224.61 309.6,-219.28\"/>\n",
+       "<title>ephys.Clustering-&gt;ephys.CuratedClustering</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M305.53,-201.4C349.92,-189.34 418,-170.85 464.4,-158.24\"/>\n",
+       "</g>\n",
+       "<!-- ephys.QualityMetrics.Waveform -->\n",
+       "<g id=\"node9\" class=\"node\">\n",
+       "<title>ephys.QualityMetrics.Waveform</title>\n",
+       "<g id=\"a_node9\"><a xlink:title=\"→ ephys.QualityMetrics\r→ ephys.CuratedClustering.Unit\r------------------------------\ramplitude=null       \rduration=null        \rhalfwidth=null       \rpt_ratio=null        \rrepolarization_slope=null \rrecovery_slope=null  \rspread=null          \rvelocity_above=null  \rvelocity_below=null  \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"444,-19 288,-19 288,0 444,0 444,-19\"/>\n",
+       "<text text-anchor=\"middle\" x=\"366\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.QualityMetrics.Waveform</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- ephys.ClusterQualityLabel -->\n",
+       "<g id=\"node10\" class=\"node\">\n",
+       "<title>ephys.ClusterQualityLabel</title>\n",
+       "<g id=\"a_node10\"><a xlink:title=\"cluster_quality_label \r------------------------------\rcluster_quality_description \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"830.5,-161 699.5,-161 699.5,-126 830.5,-126 830.5,-161\"/>\n",
+       "<text text-anchor=\"start\" x=\"707.5\" y=\"-142\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusterQualityLabel</text>\n",
+       "</a>\n",
+       "</g>\n",
        "</g>\n",
        "<!-- ephys.CuratedClustering.Unit -->\n",
-       "<g id=\"node18\" class=\"node\">\n",
+       "<g id=\"node12\" class=\"node\">\n",
        "<title>ephys.CuratedClustering.Unit</title>\n",
-       "<g id=\"a_node18\"><a xlink:title=\"→ ephys.CuratedClustering\runit                 \r------------------------------\r→ probe.ElectrodeConfig.Electrode\r→ ephys.ClusterQualityLabel\rspike_count          \rspike_times          \rspike_sites          \rspike_depths=null    \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"502,-82 356,-82 356,-63 502,-63 502,-82\"/>\n",
-       "<text text-anchor=\"start\" x=\"364\" y=\"-71\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.CuratedClustering.Unit</text>\n",
+       "<g id=\"a_node12\"><a xlink:title=\"→ ephys.CuratedClustering\runit                 \r------------------------------\r→ probe.ElectrodeConfig.Electrode\r→ ephys.ClusterQualityLabel\rspike_count          \rspike_times          \rspike_sites          \rspike_depths=null    \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"691,-82 545,-82 545,-63 691,-63 691,-82\"/>\n",
+       "<text text-anchor=\"start\" x=\"553\" y=\"-71\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.CuratedClustering.Unit</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.CuratedClustering.Unit -->\n",
+       "<!-- ephys.ClusterQualityLabel&#45;&gt;ephys.CuratedClustering.Unit -->\n",
        "<g id=\"edge9\" class=\"edge\">\n",
-       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.CuratedClustering.Unit</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M587.31,-346.92C588.05,-314.35 586.59,-196.55 531,-126 513.37,-103.63 483.61,-89.87 460.77,-82.08\"/>\n",
-       "</g>\n",
-       "<!-- ephys.LFP&#45;&gt;ephys.LFP.Electrode -->\n",
-       "<g id=\"edge10\" class=\"edge\">\n",
-       "<title>ephys.LFP-&gt;ephys.LFP.Electrode</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M256,-267.8C256,-254.08 256,-235.19 256,-224.27\"/>\n",
+       "<title>ephys.ClusterQualityLabel-&gt;ephys.CuratedClustering.Unit</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M729.79,-125.97C700.4,-112.18 659.68,-93.06 636.37,-82.12\"/>\n",
        "</g>\n",
        "<!-- ephys.WaveformSet -->\n",
-       "<g id=\"node7\" class=\"node\">\n",
+       "<g id=\"node11\" class=\"node\">\n",
        "<title>ephys.WaveformSet</title>\n",
-       "<g id=\"a_node7\"><a xlink:title=\"→ ephys.CuratedClustering\r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"598\" cy=\"-72.5\" rx=\"77.5\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"598\" y=\"-69.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.WaveformSet</text>\n",
+       "<g id=\"a_node11\"><a xlink:title=\"→ ephys.CuratedClustering\r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"787\" cy=\"-72.5\" rx=\"77.5\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"787\" y=\"-69.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.WaveformSet</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- ephys.WaveformSet.Waveform -->\n",
+       "<g id=\"node16\" class=\"node\">\n",
+       "<title>ephys.WaveformSet.Waveform</title>\n",
+       "<g id=\"a_node16\"><a xlink:title=\"→ ephys.WaveformSet\r→ ephys.CuratedClustering.Unit\r→ probe.ElectrodeConfig.Electrode\r------------------------------\rwaveform_mean        \rwaveforms=null       \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"969,-19 817,-19 817,0 969,0 969,-19\"/>\n",
+       "<text text-anchor=\"middle\" x=\"893\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.WaveformSet.Waveform</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
        "<!-- ephys.WaveformSet&#45;&gt;ephys.WaveformSet.Waveform -->\n",
-       "<g id=\"edge11\" class=\"edge\">\n",
+       "<g id=\"edge10\" class=\"edge\">\n",
        "<title>ephys.WaveformSet-&gt;ephys.WaveformSet.Waveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M631.89,-56.73C658.92,-44.96 695.84,-28.87 718.24,-19.11\"/>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M814.02,-55.95C834.39,-44.23 861.55,-28.6 878.13,-19.06\"/>\n",
        "</g>\n",
        "<!-- ephys.WaveformSet.PeakWaveform -->\n",
-       "<g id=\"node22\" class=\"node\">\n",
+       "<g id=\"node19\" class=\"node\">\n",
        "<title>ephys.WaveformSet.PeakWaveform</title>\n",
-       "<g id=\"a_node22\"><a xlink:title=\"→ ephys.WaveformSet\r→ ephys.CuratedClustering.Unit\r------------------------------\rpeak_electrode_waveform \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"643.5,-19 468.5,-19 468.5,0 643.5,0 643.5,-19\"/>\n",
-       "<text text-anchor=\"middle\" x=\"556\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.WaveformSet.PeakWaveform</text>\n",
+       "<g id=\"a_node19\"><a xlink:title=\"→ ephys.WaveformSet\r→ ephys.CuratedClustering.Unit\r------------------------------\rpeak_electrode_waveform \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"798.5,-19 623.5,-19 623.5,0 798.5,0 798.5,-19\"/>\n",
+       "<text text-anchor=\"middle\" x=\"711\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.WaveformSet.PeakWaveform</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
        "<!-- ephys.WaveformSet&#45;&gt;ephys.WaveformSet.PeakWaveform -->\n",
-       "<g id=\"edge12\" class=\"edge\">\n",
+       "<g id=\"edge11\" class=\"edge\">\n",
        "<title>ephys.WaveformSet-&gt;ephys.WaveformSet.PeakWaveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M586.74,-55.15C578.77,-43.58 568.4,-28.51 561.97,-19.17\"/>\n",
-       "</g>\n",
-       "<!-- session.Session -->\n",
-       "<g id=\"node8\" class=\"node\">\n",
-       "<title>session.Session</title>\n",
-       "<g id=\"a_node8\"><a xlink:title=\"→ subject.Subject\rsession_datetime     \r------------------------------\rsession_id=null      \r\">\n",
-       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"315,-516 211,-516 211,-481 315,-481 315,-516\"/>\n",
-       "<text text-anchor=\"start\" x=\"219\" y=\"-496.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">session.Session</text>\n",
-       "</a>\n",
-       "</g>\n",
-       "</g>\n",
-       "<!-- ephys.ProbeInsertion -->\n",
-       "<g id=\"node27\" class=\"node\">\n",
-       "<title>ephys.ProbeInsertion</title>\n",
-       "<g id=\"a_node27\"><a xlink:title=\"→ session.Session\rinsertion_number     \r------------------------------\r→ probe.Probe\r\">\n",
-       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"328,-445 198,-445 198,-410 328,-410 328,-445\"/>\n",
-       "<text text-anchor=\"start\" x=\"206\" y=\"-425.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">ephys.ProbeInsertion</text>\n",
-       "</a>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M767.03,-55.47C752.61,-43.89 733.67,-28.69 721.92,-19.26\"/>\n",
        "</g>\n",
+       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.QualityMetrics.Waveform -->\n",
+       "<g id=\"edge12\" class=\"edge\">\n",
+       "<title>ephys.CuratedClustering.Unit-&gt;ephys.QualityMetrics.Waveform</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M582.7,-62.95C534.74,-51.35 449.51,-30.71 401.47,-19.09\"/>\n",
        "</g>\n",
-       "<!-- session.Session&#45;&gt;ephys.ProbeInsertion -->\n",
+       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.WaveformSet.Waveform -->\n",
        "<g id=\"edge13\" class=\"edge\">\n",
-       "<title>session.Session-&gt;ephys.ProbeInsertion</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M263,-480.8C263,-469.95 263,-455.87 263,-445.05\"/>\n",
-       "</g>\n",
-       "<!-- subject.Subject -->\n",
-       "<g id=\"node9\" class=\"node\">\n",
-       "<title>subject.Subject</title>\n",
-       "<g id=\"a_node9\"><a xlink:title=\"subject              \r------------------------------\rsubject_nickname=&quot;&quot;  \rsex                  \rsubject_birth_date   \rsubject_description=&quot;&quot; \r\">\n",
-       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"312,-587 214,-587 214,-552 312,-552 312,-587\"/>\n",
-       "<text text-anchor=\"start\" x=\"222\" y=\"-567.4\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"12.00\" fill=\"darkgreen\">subject.Subject</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<title>ephys.CuratedClustering.Unit-&gt;ephys.WaveformSet.Waveform</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M656.53,-62.95C708.86,-51.35 801.87,-30.71 854.29,-19.09\"/>\n",
        "</g>\n",
-       "<!-- subject.Subject&#45;&gt;session.Session -->\n",
+       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.WaveformSet.PeakWaveform -->\n",
        "<g id=\"edge14\" class=\"edge\">\n",
-       "<title>subject.Subject-&gt;session.Session</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M263,-551.8C263,-540.95 263,-526.87 263,-516.05\"/>\n",
+       "<title>ephys.CuratedClustering.Unit-&gt;ephys.WaveformSet.PeakWaveform</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M631.32,-62.76C649.1,-51.1 680.39,-30.58 698,-19.03\"/>\n",
        "</g>\n",
-       "<!-- ephys.AcquisitionSoftware -->\n",
-       "<g id=\"node10\" class=\"node\">\n",
-       "<title>ephys.AcquisitionSoftware</title>\n",
-       "<g id=\"a_node10\"><a xlink:title=\"acq_software         \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"479.5,-445 346.5,-445 346.5,-410 479.5,-410 479.5,-445\"/>\n",
-       "<text text-anchor=\"start\" x=\"354.5\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.AcquisitionSoftware</text>\n",
+       "<!-- ephys.QualityMetrics.Cluster -->\n",
+       "<g id=\"node20\" class=\"node\">\n",
+       "<title>ephys.QualityMetrics.Cluster</title>\n",
+       "<g id=\"a_node20\"><a xlink:title=\"→ ephys.QualityMetrics\r→ ephys.CuratedClustering.Unit\r------------------------------\rfiring_rate=null     \rsnr=null             \rpresence_ratio=null  \risi_violation=null   \rnumber_violation=null \ramplitude_cutoff=null \risolation_distance=null \rl_ratio=null         \rd_prime=null         \rnn_hit_rate=null     \rnn_miss_rate=null    \rsilhouette_score=null \rmax_drift=null       \rcumulative_drift=null \rcontamination_rate=null \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"605.5,-19 462.5,-19 462.5,0 605.5,0 605.5,-19\"/>\n",
+       "<text text-anchor=\"middle\" x=\"534\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.QualityMetrics.Cluster</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.AcquisitionSoftware&#45;&gt;ephys.EphysRecording -->\n",
+       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.QualityMetrics.Cluster -->\n",
        "<g id=\"edge15\" class=\"edge\">\n",
-       "<title>ephys.AcquisitionSoftware-&gt;ephys.EphysRecording</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M410.34,-409.8C408.61,-398.95 406.36,-384.87 404.64,-374.05\"/>\n",
-       "</g>\n",
-       "<!-- ephys.ClusteringMethod -->\n",
-       "<g id=\"node11\" class=\"node\">\n",
-       "<title>ephys.ClusteringMethod</title>\n",
-       "<g id=\"a_node11\"><a xlink:title=\"clustering_method    \r------------------------------\rclustering_method_desc \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"128,-445 6,-445 6,-410 128,-410 128,-445\"/>\n",
-       "<text text-anchor=\"start\" x=\"14\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusteringMethod</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<title>ephys.CuratedClustering.Unit-&gt;ephys.QualityMetrics.Cluster</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M605.96,-62.76C589.91,-51.1 561.65,-30.58 545.74,-19.03\"/>\n",
        "</g>\n",
-       "<!-- ephys.ClusteringMethod&#45;&gt;ephys.ClusteringParamSet -->\n",
+       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.CuratedClustering.Unit -->\n",
        "<g id=\"edge16\" class=\"edge\">\n",
-       "<title>ephys.ClusteringMethod-&gt;ephys.ClusteringParamSet</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M67,-409.8C67,-398.95 67,-384.87 67,-374.05\"/>\n",
-       "</g>\n",
-       "<!-- ephys.Clustering -->\n",
-       "<g id=\"node23\" class=\"node\">\n",
-       "<title>ephys.Clustering</title>\n",
-       "<g id=\"a_node23\"><a xlink:title=\"→ ephys.ClusteringTask\r------------------------------\rclustering_time      \rpackage_version=&quot;&quot;   \r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"118\" cy=\"-214.5\" rx=\"66.75\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"118\" y=\"-211.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.Clustering</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.CuratedClustering.Unit</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M633.64,-346.96C634.38,-336.57 635.56,-318.51 636,-303 638.46,-216.71 623.96,-112.65 619.36,-82.24\"/>\n",
        "</g>\n",
-       "<!-- ephys.ClusteringTask&#45;&gt;ephys.Clustering -->\n",
+       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.WaveformSet.Waveform -->\n",
        "<g id=\"edge17\" class=\"edge\">\n",
-       "<title>ephys.ClusteringTask-&gt;ephys.Clustering</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M118,-267.8C118,-256.95 118,-242.87 118,-232.05\"/>\n",
-       "</g>\n",
-       "<!-- probe.ProbeType -->\n",
-       "<g id=\"node13\" class=\"node\">\n",
-       "<title>probe.ProbeType</title>\n",
-       "<g id=\"a_node13\"><a xlink:title=\"probe_type           \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"706,-587 616,-587 616,-552 706,-552 706,-587\"/>\n",
-       "<text text-anchor=\"start\" x=\"624\" y=\"-568\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ProbeType</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.WaveformSet.Waveform</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M708.9,-346.95C785.64,-333.59 893,-299.83 893,-215.5 893,-215.5 893,-215.5 893,-142.5 893,-95.98 893,-40.24 893,-19.15\"/>\n",
        "</g>\n",
-       "<!-- probe.ProbeType&#45;&gt;probe.ElectrodeConfig -->\n",
+       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.LFP.Electrode -->\n",
        "<g id=\"edge18\" class=\"edge\">\n",
-       "<title>probe.ProbeType-&gt;probe.ElectrodeConfig</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M624.2,-551.79C609.56,-543.22 594.07,-531.32 585,-516 572.09,-494.18 572.14,-463.87 573.77,-445.25\"/>\n",
+       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.LFP.Electrode</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M633.48,-346.92C633.95,-329.83 632.62,-291.21 613,-268 593.05,-244.4 560.79,-231.25 533.77,-224\"/>\n",
        "</g>\n",
-       "<!-- probe.Probe -->\n",
-       "<g id=\"node14\" class=\"node\">\n",
-       "<title>probe.Probe</title>\n",
-       "<g id=\"a_node14\"><a xlink:title=\"probe                \r------------------------------\r→ probe.ProbeType\rprobe_comment=&quot;&quot;     \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"481.5,-516 412.5,-516 412.5,-481 481.5,-481 481.5,-516\"/>\n",
-       "<text text-anchor=\"start\" x=\"420.5\" y=\"-497\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.Probe</text>\n",
+       "<!-- ephys.EphysRecording.Channel -->\n",
+       "<g id=\"node26\" class=\"node\">\n",
+       "<title>ephys.EphysRecording.Channel</title>\n",
+       "<g id=\"a_node26\"><a xlink:title=\"→ ephys.EphysRecording\rchannel_idx          \r------------------------------\r→ probe.ElectrodeConfig.Electrode\rchannel_name=&quot;&quot;      \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"604.5,-295 447.5,-295 447.5,-276 604.5,-276 604.5,-295\"/>\n",
+       "<text text-anchor=\"start\" x=\"455.5\" y=\"-284\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.EphysRecording.Channel</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- probe.ProbeType&#45;&gt;probe.Probe -->\n",
+       "<!-- probe.ElectrodeConfig.Electrode&#45;&gt;ephys.EphysRecording.Channel -->\n",
        "<g id=\"edge19\" class=\"edge\">\n",
-       "<title>probe.ProbeType-&gt;probe.Probe</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M615.88,-553.95C575.78,-541.02 518.01,-522.4 481.51,-510.63\"/>\n",
+       "<title>probe.ElectrodeConfig.Electrode-&gt;ephys.EphysRecording.Channel</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M619.45,-346.76C598.87,-333.49 559.96,-308.4 539.44,-295.17\"/>\n",
        "</g>\n",
-       "<!-- probe.ProbeType.Electrode -->\n",
-       "<g id=\"node19\" class=\"node\">\n",
-       "<title>probe.ProbeType.Electrode</title>\n",
-       "<g id=\"a_node19\"><a xlink:title=\"→ probe.ProbeType\relectrode            \r------------------------------\rshank                \rshank_col            \rshank_row            \rx_coord=null         \ry_coord=null         \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"728,-508 594,-508 594,-489 728,-489 728,-508\"/>\n",
-       "<text text-anchor=\"start\" x=\"602\" y=\"-497\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ProbeType.Electrode</text>\n",
-       "</a>\n",
+       "<!-- session.Session&#45;&gt;ephys.ProbeInsertion -->\n",
+       "<g id=\"edge20\" class=\"edge\">\n",
+       "<title>session.Session-&gt;ephys.ProbeInsertion</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M252,-480.8C252,-469.95 252,-455.87 252,-445.05\"/>\n",
        "</g>\n",
+       "<!-- ephys.QualityMetrics -->\n",
+       "<g id=\"node15\" class=\"node\">\n",
+       "<title>ephys.QualityMetrics</title>\n",
+       "<g id=\"a_node15\"><a xlink:title=\"→ ephys.CuratedClustering\r\">\n",
+       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"447\" cy=\"-72.5\" rx=\"80\" ry=\"17.5\"/>\n",
+       "<text text-anchor=\"middle\" x=\"447\" y=\"-69.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.QualityMetrics</text>\n",
+       "</a>\n",
        "</g>\n",
-       "<!-- probe.ProbeType&#45;&gt;probe.ProbeType.Electrode -->\n",
-       "<g id=\"edge20\" class=\"edge\">\n",
-       "<title>probe.ProbeType-&gt;probe.ProbeType.Electrode</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M661,-551.8C661,-538.08 661,-519.19 661,-508.27\"/>\n",
        "</g>\n",
-       "<!-- probe.Probe&#45;&gt;ephys.ProbeInsertion -->\n",
+       "<!-- ephys.QualityMetrics&#45;&gt;ephys.QualityMetrics.Waveform -->\n",
        "<g id=\"edge21\" class=\"edge\">\n",
-       "<title>probe.Probe-&gt;ephys.ProbeInsertion</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M412.39,-484.52C382.62,-473.36 339.49,-457.18 307.22,-445.08\"/>\n",
-       "</g>\n",
-       "<!-- ephys.CuratedClustering -->\n",
-       "<g id=\"node17\" class=\"node\">\n",
-       "<title>ephys.CuratedClustering</title>\n",
-       "<g id=\"a_node17\"><a xlink:title=\"→ ephys.Clustering\r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"429\" cy=\"-143.5\" rx=\"93.25\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"429\" y=\"-140.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.CuratedClustering</text>\n",
-       "</a>\n",
+       "<title>ephys.QualityMetrics-&gt;ephys.QualityMetrics.Waveform</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M425.72,-55.47C410.34,-43.89 390.16,-28.69 377.64,-19.26\"/>\n",
        "</g>\n",
+       "<!-- ephys.QualityMetrics&#45;&gt;ephys.QualityMetrics.Cluster -->\n",
+       "<g id=\"edge22\" class=\"edge\">\n",
+       "<title>ephys.QualityMetrics-&gt;ephys.QualityMetrics.Cluster</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M469.86,-55.47C486.37,-43.89 508.05,-28.69 521.5,-19.26\"/>\n",
        "</g>\n",
        "<!-- ephys.CuratedClustering&#45;&gt;ephys.WaveformSet -->\n",
-       "<g id=\"edge22\" class=\"edge\">\n",
+       "<g id=\"edge23\" class=\"edge\">\n",
        "<title>ephys.CuratedClustering-&gt;ephys.WaveformSet</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M466.09,-127.36C494.65,-115.69 533.91,-99.67 562.16,-88.13\"/>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M568.09,-129.03C617.25,-116.56 689.79,-98.16 737.71,-86\"/>\n",
        "</g>\n",
        "<!-- ephys.CuratedClustering&#45;&gt;ephys.CuratedClustering.Unit -->\n",
-       "<g id=\"edge23\" class=\"edge\">\n",
+       "<g id=\"edge24\" class=\"edge\">\n",
        "<title>ephys.CuratedClustering-&gt;ephys.CuratedClustering.Unit</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M429,-125.8C429,-112.08 429,-93.19 429,-82.27\"/>\n",
-       "</g>\n",
-       "<!-- ephys.QualityMetrics -->\n",
-       "<g id=\"node24\" class=\"node\">\n",
-       "<title>ephys.QualityMetrics</title>\n",
-       "<g id=\"a_node24\"><a xlink:title=\"→ ephys.CuratedClustering\r\">\n",
-       "<ellipse fill=\"#00007f\" fill-opacity=\"0.250980\" stroke=\"#00007f\" stroke-opacity=\"0.250980\" cx=\"258\" cy=\"-72.5\" rx=\"80\" ry=\"17.5\"/>\n",
-       "<text text-anchor=\"middle\" x=\"258\" y=\"-69.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"#00007f\" fill-opacity=\"0.627451\">ephys.QualityMetrics</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M538.89,-126.5C559.57,-112.64 588.69,-93.14 605.22,-82.06\"/>\n",
        "</g>\n",
        "<!-- ephys.CuratedClustering&#45;&gt;ephys.QualityMetrics -->\n",
-       "<g id=\"edge24\" class=\"edge\">\n",
-       "<title>ephys.CuratedClustering-&gt;ephys.QualityMetrics</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M391.47,-127.36C362.57,-115.69 322.85,-99.67 294.27,-88.13\"/>\n",
-       "</g>\n",
-       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.WaveformSet.Waveform -->\n",
        "<g id=\"edge25\" class=\"edge\">\n",
-       "<title>ephys.CuratedClustering.Unit-&gt;ephys.WaveformSet.Waveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M471.13,-62.98C483.93,-60.4 498.04,-57.57 511,-55 574.62,-42.36 648.31,-27.96 694.05,-19.05\"/>\n",
+       "<title>ephys.CuratedClustering-&gt;ephys.QualityMetrics</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M498.88,-126.15C488.05,-115.15 473.81,-100.71 463,-89.73\"/>\n",
        "</g>\n",
-       "<!-- ephys.QualityMetrics.Waveform -->\n",
-       "<g id=\"node20\" class=\"node\">\n",
-       "<title>ephys.QualityMetrics.Waveform</title>\n",
-       "<g id=\"a_node20\"><a xlink:title=\"→ ephys.QualityMetrics\r→ ephys.CuratedClustering.Unit\r------------------------------\ramplitude            \rduration             \rhalfwidth=null       \rpt_ratio=null        \rrepolarization_slope=null \rrecovery_slope=null  \rspread=null          \rvelocity_above=null  \rvelocity_below=null  \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"450,-19 294,-19 294,0 450,0 450,-19\"/>\n",
-       "<text text-anchor=\"middle\" x=\"372\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.QualityMetrics.Waveform</text>\n",
+       "<!-- probe.Probe -->\n",
+       "<g id=\"node21\" class=\"node\">\n",
+       "<title>probe.Probe</title>\n",
+       "<g id=\"a_node21\"><a xlink:title=\"probe                \r------------------------------\r→ probe.ProbeType\rprobe_comment=&quot;&quot;     \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"452.5,-516 383.5,-516 383.5,-481 452.5,-481 452.5,-516\"/>\n",
+       "<text text-anchor=\"start\" x=\"391.5\" y=\"-497\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.Probe</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.QualityMetrics.Waveform -->\n",
+       "<!-- probe.Probe&#45;&gt;ephys.ProbeInsertion -->\n",
        "<g id=\"edge26\" class=\"edge\">\n",
-       "<title>ephys.CuratedClustering.Unit-&gt;ephys.QualityMetrics.Waveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M420.83,-62.76C410,-51.16 390.98,-30.81 380.15,-19.22\"/>\n",
+       "<title>probe.Probe-&gt;ephys.ProbeInsertion</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M383.2,-483.04C356.49,-471.93 319.58,-456.59 291.71,-445\"/>\n",
        "</g>\n",
-       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.WaveformSet.PeakWaveform -->\n",
+       "<!-- ephys.ClusteringParamSet -->\n",
+       "<g id=\"node22\" class=\"node\">\n",
+       "<title>ephys.ClusteringParamSet</title>\n",
+       "<g id=\"a_node22\"><a xlink:title=\"paramset_idx         \r------------------------------\r→ ephys.ClusteringMethod\rparamset_desc        \rparam_set_hash       \rparams               \rUNIQUE INDEX (param_set_hash)\r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"134,-374 0,-374 0,-339 134,-339 134,-374\"/>\n",
+       "<text text-anchor=\"start\" x=\"8\" y=\"-355\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusteringParamSet</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- ephys.ClusteringParamSet&#45;&gt;ephys.ClusteringTask -->\n",
        "<g id=\"edge27\" class=\"edge\">\n",
-       "<title>ephys.CuratedClustering.Unit-&gt;ephys.WaveformSet.PeakWaveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M446.93,-62.89C471.13,-51.26 514.01,-30.67 538.16,-19.07\"/>\n",
+       "<title>ephys.ClusteringParamSet-&gt;ephys.ClusteringTask</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M67.97,-338.8C68.6,-327.95 69.41,-313.87 70.04,-303.05\"/>\n",
        "</g>\n",
-       "<!-- ephys.QualityMetrics.Cluster -->\n",
-       "<g id=\"node25\" class=\"node\">\n",
-       "<title>ephys.QualityMetrics.Cluster</title>\n",
-       "<g id=\"a_node25\"><a xlink:title=\"→ ephys.QualityMetrics\r→ ephys.CuratedClustering.Unit\r------------------------------\rfiring_rate=null     \rsnr=null             \rpresence_ratio=null  \risi_violation=null   \rnumber_violation=null \ramplitude_cutoff=null \risolation_distance=null \rl_ratio=null         \rd_prime=null         \rnn_hit_rate=null     \rnn_miss_rate=null    \rsilhouette_score=null \rmax_drift=null       \rcumulative_drift=null \rcontamination_rate=null \r\">\n",
-       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"275.5,-19 132.5,-19 132.5,0 275.5,0 275.5,-19\"/>\n",
-       "<text text-anchor=\"middle\" x=\"204\" y=\"-7\" font-family=\"arial\" font-size=\"10.00\">ephys.QualityMetrics.Cluster</text>\n",
+       "<!-- ephys.AcquisitionSoftware -->\n",
+       "<g id=\"node23\" class=\"node\">\n",
+       "<title>ephys.AcquisitionSoftware</title>\n",
+       "<g id=\"a_node23\"><a xlink:title=\"acq_software         \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"468.5,-445 335.5,-445 335.5,-410 468.5,-410 468.5,-445\"/>\n",
+       "<text text-anchor=\"start\" x=\"343.5\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.AcquisitionSoftware</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.CuratedClustering.Unit&#45;&gt;ephys.QualityMetrics.Cluster -->\n",
+       "<!-- ephys.AcquisitionSoftware&#45;&gt;ephys.EphysRecording -->\n",
        "<g id=\"edge28\" class=\"edge\">\n",
-       "<title>ephys.CuratedClustering.Unit-&gt;ephys.QualityMetrics.Cluster</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M397.24,-62.89C354.36,-51.26 278.4,-30.67 235.6,-19.07\"/>\n",
+       "<title>ephys.AcquisitionSoftware-&gt;ephys.EphysRecording</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M402,-409.8C402,-398.95 402,-384.87 402,-374.05\"/>\n",
        "</g>\n",
-       "<!-- probe.ProbeType.Electrode&#45;&gt;probe.ElectrodeConfig.Electrode -->\n",
+       "<!-- ephys.EphysRecording&#45;&gt;ephys.LFP -->\n",
        "<g id=\"edge29\" class=\"edge\">\n",
-       "<title>probe.ProbeType.Electrode-&gt;probe.ElectrodeConfig.Electrode</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M660.77,-488.71C659.99,-472.23 656.6,-436.03 642,-410 631.67,-391.58 612.77,-375.68 600.04,-366.34\"/>\n",
-       "</g>\n",
-       "<!-- ephys.ClusterQualityLabel -->\n",
-       "<g id=\"node21\" class=\"node\">\n",
-       "<title>ephys.ClusterQualityLabel</title>\n",
-       "<g id=\"a_node21\"><a xlink:title=\"cluster_quality_label \r------------------------------\rcluster_quality_description \r\">\n",
-       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"709.5,-161 578.5,-161 578.5,-126 709.5,-126 709.5,-161\"/>\n",
-       "<text text-anchor=\"start\" x=\"586.5\" y=\"-142\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusterQualityLabel</text>\n",
-       "</a>\n",
-       "</g>\n",
+       "<title>ephys.EphysRecording-&gt;ephys.LFP</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M397.4,-338.8C394.41,-327.95 390.54,-313.87 387.56,-303.05\"/>\n",
        "</g>\n",
-       "<!-- ephys.ClusterQualityLabel&#45;&gt;ephys.CuratedClustering.Unit -->\n",
+       "<!-- ephys.EphysRecording&#45;&gt;ephys.EphysRecording.EphysFile -->\n",
        "<g id=\"edge30\" class=\"edge\">\n",
-       "<title>ephys.ClusterQualityLabel-&gt;ephys.CuratedClustering.Unit</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M592.5,-125.97C549.39,-112.14 489.62,-92.95 455.57,-82.03\"/>\n",
+       "<title>ephys.EphysRecording-&gt;ephys.EphysRecording.EphysFile</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M365.79,-340.36C332.59,-326.47 284.6,-306.4 257.55,-295.09\"/>\n",
        "</g>\n",
-       "<!-- ephys.Clustering&#45;&gt;ephys.CuratedClustering -->\n",
+       "<!-- ephys.EphysRecording&#45;&gt;ephys.ClusteringTask -->\n",
        "<g id=\"edge31\" class=\"edge\">\n",
-       "<title>ephys.Clustering-&gt;ephys.CuratedClustering</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M167.28,-202.57C222.69,-190.27 312.56,-170.33 371.23,-157.32\"/>\n",
+       "<title>ephys.EphysRecording-&gt;ephys.ClusteringTask</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M342.46,-343.54C290.55,-333.05 213.23,-317.29 146,-303 143,-302.36 139.93,-301.71 136.84,-301.04\"/>\n",
        "</g>\n",
-       "<!-- ephys.QualityMetrics&#45;&gt;ephys.QualityMetrics.Waveform -->\n",
+       "<!-- ephys.EphysRecording&#45;&gt;ephys.EphysRecording.Channel -->\n",
        "<g id=\"edge32\" class=\"edge\">\n",
-       "<title>ephys.QualityMetrics-&gt;ephys.QualityMetrics.Waveform</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M286.77,-56.11C308.67,-44.39 338,-28.69 355.92,-19.1\"/>\n",
+       "<title>ephys.EphysRecording-&gt;ephys.EphysRecording.Channel</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M430.14,-339.84C455,-326.01 490.35,-306.34 510.45,-295.15\"/>\n",
        "</g>\n",
-       "<!-- ephys.QualityMetrics&#45;&gt;ephys.QualityMetrics.Cluster -->\n",
+       "<!-- probe.ProbeType.Electrode -->\n",
+       "<g id=\"node25\" class=\"node\">\n",
+       "<title>probe.ProbeType.Electrode</title>\n",
+       "<g id=\"a_node25\"><a xlink:title=\"→ probe.ProbeType\relectrode            \r------------------------------\rshank                \rshank_col            \rshank_row            \rx_coord=null         \ry_coord=null         \r\">\n",
+       "<polygon fill=\"transparent\" stroke=\"transparent\" points=\"700,-508 566,-508 566,-489 700,-489 700,-508\"/>\n",
+       "<text text-anchor=\"start\" x=\"574\" y=\"-497\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ProbeType.Electrode</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- probe.ProbeType.Electrode&#45;&gt;probe.ElectrodeConfig.Electrode -->\n",
        "<g id=\"edge33\" class=\"edge\">\n",
-       "<title>ephys.QualityMetrics-&gt;ephys.QualityMetrics.Cluster</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M243.53,-55.15C233.28,-43.58 219.94,-28.51 211.68,-19.17\"/>\n",
+       "<title>probe.ProbeType.Electrode-&gt;probe.ElectrodeConfig.Electrode</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M633,-488.74C633,-463.6 633,-391.39 633,-366.25\"/>\n",
        "</g>\n",
-       "<!-- ephys.InsertionLocation -->\n",
-       "<g id=\"node26\" class=\"node\">\n",
-       "<title>ephys.InsertionLocation</title>\n",
-       "<g id=\"a_node26\"><a xlink:title=\"→ ephys.ProbeInsertion\r------------------------------\r→ `neuro_lab`.`#skull_reference`\rap_location          \rml_location          \rdepth                \rtheta=null           \rphi=null             \rbeta=null            \r\">\n",
-       "<polygon fill=\"#00ff00\" fill-opacity=\"0.188235\" stroke=\"#00ff00\" stroke-opacity=\"0.188235\" points=\"295.5,-374 152.5,-374 152.5,-339 295.5,-339 295.5,-374\"/>\n",
-       "<text text-anchor=\"middle\" x=\"224\" y=\"-353.4\" font-family=\"arial\" font-size=\"12.00\" fill=\"darkgreen\">ephys.InsertionLocation</text>\n",
+       "<!-- ephys.ClusteringMethod -->\n",
+       "<g id=\"node27\" class=\"node\">\n",
+       "<title>ephys.ClusteringMethod</title>\n",
+       "<g id=\"a_node27\"><a xlink:title=\"clustering_method    \r------------------------------\rclustering_method_desc \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"128,-445 6,-445 6,-410 128,-410 128,-445\"/>\n",
+       "<text text-anchor=\"start\" x=\"14\" y=\"-426\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">ephys.ClusteringMethod</text>\n",
        "</a>\n",
        "</g>\n",
        "</g>\n",
-       "<!-- ephys.ProbeInsertion&#45;&gt;ephys.EphysRecording -->\n",
+       "<!-- ephys.ClusteringMethod&#45;&gt;ephys.ClusteringParamSet -->\n",
        "<g id=\"edge34\" class=\"edge\">\n",
-       "<title>ephys.ProbeInsertion-&gt;ephys.EphysRecording</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M296.29,-409.97C318.94,-398.73 348.71,-383.95 370.88,-372.95\"/>\n",
+       "<title>ephys.ClusteringMethod-&gt;ephys.ClusteringParamSet</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M67,-409.8C67,-398.95 67,-384.87 67,-374.05\"/>\n",
        "</g>\n",
-       "<!-- ephys.ProbeInsertion&#45;&gt;ephys.InsertionLocation -->\n",
+       "<!-- probe.ProbeType -->\n",
+       "<g id=\"node28\" class=\"node\">\n",
+       "<title>probe.ProbeType</title>\n",
+       "<g id=\"a_node28\"><a xlink:title=\"probe_type           \r\">\n",
+       "<polygon fill=\"#000000\" fill-opacity=\"0.125490\" stroke=\"transparent\" points=\"583,-587 493,-587 493,-552 583,-552 583,-587\"/>\n",
+       "<text text-anchor=\"start\" x=\"501\" y=\"-568\" font-family=\"arial\" text-decoration=\"underline\" font-size=\"10.00\">probe.ProbeType</text>\n",
+       "</a>\n",
+       "</g>\n",
+       "</g>\n",
+       "<!-- probe.ProbeType&#45;&gt;probe.ElectrodeConfig -->\n",
        "<g id=\"edge35\" class=\"edge\">\n",
-       "<title>ephys.ProbeInsertion-&gt;ephys.InsertionLocation</title>\n",
-       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"2\" stroke-opacity=\"0.250980\" d=\"M253.56,-409.8C247.43,-398.95 239.47,-384.87 233.35,-374.05\"/>\n",
+       "<title>probe.ProbeType-&gt;probe.ElectrodeConfig</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M538.59,-551.89C539.56,-524.95 541.45,-472.02 542.41,-445.09\"/>\n",
+       "</g>\n",
+       "<!-- probe.ProbeType&#45;&gt;probe.Probe -->\n",
+       "<g id=\"edge36\" class=\"edge\">\n",
+       "<title>probe.ProbeType-&gt;probe.Probe</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-dasharray=\"5,2\" stroke-opacity=\"0.250980\" d=\"M509.26,-551.97C490.4,-541.13 465.82,-527 446.92,-516.13\"/>\n",
+       "</g>\n",
+       "<!-- probe.ProbeType&#45;&gt;probe.ProbeType.Electrode -->\n",
+       "<g id=\"edge37\" class=\"edge\">\n",
+       "<title>probe.ProbeType-&gt;probe.ProbeType.Electrode</title>\n",
+       "<path fill=\"none\" stroke=\"#000000\" stroke-width=\"0.75\" stroke-opacity=\"0.250980\" d=\"M561,-551.8C580,-538 606.2,-518.97 621.19,-508.08\"/>\n",
        "</g>\n",
        "</g>\n",
        "</svg>"
       ],
       "text/plain": [
-       "<datajoint.diagram.Diagram at 0x7fe2a05197f0>"
+       "<datajoint.diagram.Diagram at 0x7ac04aedacd0>"
       ]
      },
      "execution_count": 4,
@@ -1772,8 +1798,25 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "EphysRecording: 100%|██████████| 1/1 [00:00<00:00,  1.69it/s]\n"
+      "EphysRecording:   0%|          | 0/1 [00:00<?, ?it/s]"
+     ]
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "EphysRecording: 100%|██████████| 1/1 [00:01<00:00,  1.18s/it]\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "{'success_count': 1, 'error_list': []}"
+      ]
+     },
+     "execution_count": 21,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -2050,7 +2093,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 26,
    "metadata": {},
    "outputs": [
     {
@@ -2130,7 +2173,7 @@
        "            <tbody> <tr> <td>0</td>\n",
        "<td>kilosort2</td>\n",
        "<td>Spike sorting using Kilosort2</td>\n",
-       "<td>de78cee1-526f-319e-b6d5-8a2ba04963d8</td>\n",
+       "<td>1be14ec5-8c8a-6d86-e766-f31042931575</td>\n",
        "<td>=BLOB=</td> </tr> </tbody>\n",
        "        </table>\n",
        "        \n",
@@ -2140,45 +2183,57 @@
       "text/plain": [
        "*paramset_idx  clustering_met paramset_desc  param_set_hash params    \n",
        "+------------+ +------------+ +------------+ +------------+ +--------+\n",
-       "0              kilosort2      Spike sorting  de78cee1-526f- =BLOB=    \n",
+       "0              kilosort2      Spike sorting  1be14ec5-8c8a- =BLOB=    \n",
        " (Total: 1)"
       ]
      },
-     "execution_count": 24,
+     "execution_count": 26,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "# insert clustering task manually\n",
-    "params_ks = {\n",
-    "    \"fs\": 30000,\n",
-    "    \"fshigh\": 150,\n",
+    "params = {}\n",
+    "params[\"SI_PREPROCESSING_METHOD\"] = \"CatGT\"\n",
+    "params[\"SI_SORTING_PARAMS\"] = {\n",
     "    \"minfr_goodchannels\": 0.1,\n",
-    "    \"Th\": [10, 4],\n",
     "    \"lam\": 10,\n",
     "    \"AUCsplit\": 0.9,\n",
     "    \"minFR\": 0.02,\n",
     "    \"momentum\": [20, 400],\n",
     "    \"sigmaMask\": 30,\n",
-    "    \"ThPr\": 8,\n",
-    "    \"spkTh\": -6,\n",
-    "    \"reorder\": 1,\n",
-    "    \"nskip\": 25,\n",
-    "    \"GPU\": 1,\n",
-    "    \"Nfilt\": 1024,\n",
     "    \"nfilt_factor\": 4,\n",
     "    \"ntbuff\": 64,\n",
-    "    \"whiteningRange\": 32,\n",
-    "    \"nSkipCov\": 25,\n",
     "    \"scaleproc\": 200,\n",
     "    \"nPCs\": 3,\n",
-    "    \"useRAM\": 0,\n",
     "}\n",
+    "params[\"SI_POSTPROCESSING_PARAMS\"] = {\n",
+    "    \"extensions\": {\n",
+    "        \"random_spikes\": {},\n",
+    "        \"waveforms\": {},\n",
+    "        \"templates\": {},\n",
+    "        \"noise_levels\": {},\n",
+    "        # \"amplitude_scalings\": {},\n",
+    "        \"correlograms\": {},\n",
+    "        \"isi_histograms\": {},\n",
+    "        \"principal_components\": {\"n_components\": 5, \"mode\": \"by_channel_local\"},\n",
+    "        \"spike_amplitudes\": {},\n",
+    "        \"spike_locations\": {},\n",
+    "        \"template_metrics\": {\"include_multi_channel_metrics\": True},\n",
+    "        \"template_similarity\": {},\n",
+    "        \"unit_locations\": {},\n",
+    "        \"quality_metrics\": {},\n",
+    "    },\n",
+    "    \"job_kwargs\": {\"n_jobs\": 0.8, \"chunk_duration\": \"1s\"},\n",
+    "    \"export_to_phy\": True,\n",
+    "    \"export_report\": True,\n",
+    "}\n",
+    "\n",
     "ephys.ClusteringParamSet.insert_new_params(\n",
     "    clustering_method=\"kilosort2\",\n",
     "    paramset_idx=0,\n",
-    "    params=params_ks,\n",
+    "    params=params,\n",
     "    paramset_desc=\"Spike sorting using Kilosort2\",\n",
     ")\n",
     "ephys.ClusteringParamSet()"
@@ -2198,7 +2253,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 27,
    "metadata": {},
    "outputs": [
     {
@@ -2214,7 +2269,7 @@
        "task_mode=\"load\"     : enum('load','trigger')       # 'load': load computed analysis results, 'trigger': trigger computation"
       ]
      },
-     "execution_count": 25,
+     "execution_count": 27,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -2240,7 +2295,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 28,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2265,15 +2320,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 29,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Clustering: 100%|██████████| 1/1 [00:00<00:00,  9.05it/s]\n"
+      "Clustering: 100%|██████████| 1/1 [00:00<00:00,  2.73it/s]\n"
      ]
+    },
+    {
+     "data": {
+      "text/plain": [
+       "{'success_count': 1, 'error_list': []}"
+      ]
+     },
+     "execution_count": 29,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -2292,18 +2357,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "CuratedClustering:   0%|          | 0/1 [00:00<?, ?it/s]/workspaces/element-array-ephys/element_array_ephys/readers/kilosort.py:172: RuntimeWarning: invalid value encountered in divide\n",
-      "  self._data[\"spike_depths\"] = np.sum(\n",
-      "CuratedClustering: 100%|██████████| 1/1 [00:13<00:00, 13.87s/it]\n",
-      "LFP: 100%|██████████| 1/1 [00:30<00:00, 30.32s/it]\n",
-      "WaveformSet: 100%|██████████| 1/1 [00:24<00:00, 24.81s/it]\n"
+      "CuratedClustering:   0%|          | 0/1 [00:00<?, ?it/s]/workspaces/element-array-ephys/element_array_ephys/readers/kilosort.py:175: RuntimeWarning: invalid value encountered in divide\n",
+      "  self._data[\"spike_depths\"] = np.sum(\n"
      ]
     }
    ],
@@ -2341,7 +2403,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 29,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2361,7 +2423,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -2402,7 +2464,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 31,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2416,7 +2478,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -2448,7 +2510,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 33,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -2460,7 +2522,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 34,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -2674,7 +2736,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 35,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {
@@ -2750,7 +2812,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "element-dlc",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -2764,7 +2826,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.18"
+   "version": "3.11.12"
   },
   "orig_nbformat": 4
  },
diff --git a/setup.py b/setup.py
index bdf14374..0a5846cb 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 
 setup(
     name=pkg_name.replace("_", "-"),
-    python_requires=">=3.7, <3.11",
+    python_requires=">=3.7, <3.12",
     version=__version__,  # noqa F821
     description="Extracellular Array Electrophysiology DataJoint Element",
     long_description=long_description,
diff --git a/tests/conftest.py b/tests/conftest.py
index 9a191749..cf9d69f9 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -105,35 +105,47 @@ def populate_lfp(pipeline, insert_upstreams):
 @pytest.fixture(scope="session")
 def insert_clustering_task(pipeline, populate_ephys_recording):
     ephys = pipeline["ephys"]
-    params_ks = {
-        "fs": 30000,
-        "fshigh": 150,
+    params = {}
+    params["SI_PREPROCESSING_METHOD"] = "CatGT"
+    params["SI_SORTING_PARAMS"] = {
         "minfr_goodchannels": 0.1,
-        "Th": [10, 4],
         "lam": 10,
         "AUCsplit": 0.9,
         "minFR": 0.02,
         "momentum": [20, 400],
         "sigmaMask": 30,
-        "ThPr": 8,
-        "spkTh": -6,
-        "reorder": 1,
-        "nskip": 25,
-        "GPU": 1,
-        "Nfilt": 1024,
         "nfilt_factor": 4,
         "ntbuff": 64,
-        "whiteningRange": 32,
-        "nSkipCov": 25,
         "scaleproc": 200,
         "nPCs": 3,
-        "useRAM": 0,
     }
+    params["SI_POSTPROCESSING_PARAMS"] = {
+        "extensions": {
+            "random_spikes": {},
+            "waveforms": {},
+            "templates": {},
+            "noise_levels": {},
+            # "amplitude_scalings": {},
+            "correlograms": {},
+            "isi_histograms": {},
+            "principal_components": {"n_components": 5, "mode": "by_channel_local"},
+            "spike_amplitudes": {},
+            "spike_locations": {},
+            "template_metrics": {"include_multi_channel_metrics": True},
+            "template_similarity": {},
+            "unit_locations": {},
+            "quality_metrics": {},
+        },
+        "job_kwargs": {"n_jobs": 0.8, "chunk_duration": "1s"},
+        "export_to_phy": True,
+        "export_report": True,
+    }
+
     ephys.ClusteringParamSet.insert_new_params(
-        clustering_method="kilosort2",
+        clustering_method="kilosort2.5",
+        paramset_desc="Default parameter set for Kilosort2.0 with SpikeInterface",
+        params=params,
         paramset_idx=0,
-        params=params_ks,
-        paramset_desc="Spike sorting using Kilosort2",
     )
 
     session_key = dict(subject="subject5", session_datetime="2023-01-01 00:00:00")