diff --git a/README.md b/README.md
index d657a50..c8b1080 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 A demonstration DataJoint pipeline for LC-MS (Liquid Chromatography-Mass Spectrometry) data processing.
 
-This project showcases DataJoint 2.1 best practices with a realistic scientific workflow.
+This project showcases DataJoint 2.3 best practices with a realistic scientific workflow.
 
 ## Pipeline Overview
 
@@ -52,9 +52,9 @@ uv sync --group dev
 
 ## Quick Start
 
-### 1. Configure Database (DataJoint 2.1)
+### 1. Configure Database (DataJoint 2.3)
 
-DataJoint 2.1 uses a layered configuration system. Non-sensitive settings go in `datajoint.json`, while credentials come from secrets or environment variables.
+DataJoint 2.3 uses a layered configuration system. Non-sensitive settings go in `datajoint.json`, while credentials come from secrets or environment variables.
 
 **Configuration sources (in priority order):**
 1. Environment variables (`DJ_HOST`, `DJ_USER`, `DJ_PASS`, etc.)
diff --git a/docs/pipeline.svg b/docs/pipeline.svg
index db68dea..4ff99c1 100644
--- a/docs/pipeline.svg
+++ b/docs/pipeline.svg
@@ -1,193 +1,245 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="914pt" height="239pt" viewBox="0.00 0.00 914.00 239.00">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 235)">
-<polygon fill="white" stroke="none" points="-4,4 -4,-235 910.36,-235 910.36,4 -4,4"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 15.1.0 (20260618.0150)
+ -->
+<!-- Pages: 1 -->
+<svg width="810pt" height="231pt"
+ viewBox="0.00 0.00 810.00 231.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<style>
+@media (prefers-color-scheme: dark) {
+  svg { background-color: #161A21; }
+  polygon[fill="white"] { fill: #161A21; }
+  [fill="#fffde7"] { fill: #3A3620; }
+  [stroke="#c9bc5b"] { stroke: #C9BC5B; }
+  [fill="#6b6420"] { fill: #EBE3A0; }
+  [fill="#e7f3ec"] { fill: #16281F; }
+  [stroke="#2f7d5b"] { stroke: #4FA97F; }
+  [fill="#1b5138"] { fill: #BCE6CF; }
+  [fill="#f2f4f7"] { fill: #242832; }
+  [stroke="#a9b1bd"] { stroke: #8A93A1; }
+  [fill="#495261"] { fill: #C9CFD9; }
+  [fill="#fbeaec"] { fill: #331A1F; }
+  [stroke="#b23a48"] { stroke: #D0687A; }
+  [fill="#7c2430"] { fill: #F3C2CB; }
+  [fill="#e2ecfa"] { fill: #152538; }
+  [stroke="#2a5fa5"] { stroke: #5E92D6; }
+  [fill="#123a6d"] { fill: #C3DAF6; }
+  [fill="#ffffff"] { fill: #1E232C; }
+  [stroke="#9aa6b8"] { stroke: #7B879B; }
+  [fill="#46536b"] { fill: #C4CCDB; }
+  [fill="#edeef0"] { fill: #242730; }
+  [stroke="#808890"] { stroke: #8890A0; }
+  [fill="#404040"] { fill: #C7CDD6; }
+  [stroke="#3a424f"] { stroke: #AEB6C2; stroke-opacity: 0.753; }
+  [stroke="#c77d3a"] { stroke: #D68C4A; stroke-opacity: 0.753; }
+  [fill="#f3f5f8"] { fill: #2A313D; }
+  [stroke="#f3f5f8"] { stroke: #2A313D; }
+  [stroke="gray"] { stroke: #606875; }
+  [fill="gray"] { fill: #8A93A1; }
+}
+</style>
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 227)">
+<polygon fill="white" stroke="none" points="-4,4 -4,-227 806.39,-227 806.39,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>cluster_cluster_subject</title>
-<polygon fill="none" stroke="gray" stroke-dasharray="5,2" points="8,-144 8,-219 193.25,-219 193.25,-144 8,-144"/>
-<text xml:space="preserve" text-anchor="middle" x="100.62" y="-201.7" font-family="Times,serif" font-size="14.00" fill="gray">subject</text>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M20,-142C20,-142 190.3,-142 190.3,-142 196.3,-142 202.3,-148 202.3,-154 202.3,-154 202.3,-203 202.3,-203 202.3,-209 196.3,-215 190.3,-215 190.3,-215 20,-215 20,-215 14,-215 8,-209 8,-203 8,-203 8,-154 8,-154 8,-148 14,-142 20,-142"/>
+<text xml:space="preserve" text-anchor="middle" x="172.93" y="-197.7" font-family="Helvetica,sans-Serif" font-size="14.00" fill="gray">subject</text>
 </g>
 <g id="clust2" class="cluster">
 <title>cluster_cluster_session</title>
-<polygon fill="none" stroke="gray" stroke-dasharray="5,2" points="100.5,-8 100.5,-136 308.25,-136 308.25,-8 100.5,-8"/>
-<text xml:space="preserve" text-anchor="middle" x="204.38" y="-118.7" font-family="Times,serif" font-size="14.00" fill="gray">session</text>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M112.34,-8C112.34,-8 314.52,-8 314.52,-8 320.52,-8 326.52,-14 326.52,-20 326.52,-20 326.52,-122 326.52,-122 326.52,-128 320.52,-134 314.52,-134 314.52,-134 112.34,-134 112.34,-134 106.34,-134 100.34,-128 100.34,-122 100.34,-122 100.34,-20 100.34,-20 100.34,-14 106.34,-8 112.34,-8"/>
+<text xml:space="preserve" text-anchor="middle" x="295.64" y="-116.7" font-family="Helvetica,sans-Serif" font-size="14.00" fill="gray">session</text>
 </g>
 <g id="clust3" class="cluster">
 <title>cluster_cluster_scan</title>
-<polygon fill="none" stroke="gray" stroke-dasharray="5,2" points="328.25,-57 328.25,-223 898.36,-223 898.36,-57 328.25,-57"/>
-<text xml:space="preserve" text-anchor="middle" x="613.31" y="-205.7" font-family="Times,serif" font-size="14.00" fill="gray">scan</text>
+<path fill="none" stroke="gray" stroke-dasharray="5,2" d="M350.52,-15C350.52,-15 782.39,-15 782.39,-15 788.39,-15 794.39,-21 794.39,-27 794.39,-27 794.39,-175 794.39,-175 794.39,-181 788.39,-187 782.39,-187 782.39,-187 350.52,-187 350.52,-187 344.52,-187 338.52,-181 338.52,-175 338.52,-175 338.52,-27 338.52,-27 338.52,-21 344.52,-15 350.52,-15"/>
+<text xml:space="preserve" text-anchor="middle" x="772.14" y="-169.7" font-family="Helvetica,sans-Serif" font-size="14.00" fill="gray">scan</text>
+</g>
+<g id="clust4" class="cluster">
+<title>cluster_cluster_entity_scan_PeakDetection</title>
+<path fill="#f3f5f8" stroke="#f3f5f8" d="M661.96,-23C661.96,-23 774.39,-23 774.39,-23 780.39,-23 786.39,-29 786.39,-35 786.39,-35 786.39,-99 786.39,-99 786.39,-105 780.39,-111 774.39,-111 774.39,-111 661.96,-111 661.96,-111 655.96,-111 649.96,-105 649.96,-99 649.96,-99 649.96,-35 649.96,-35 649.96,-29 655.96,-23 661.96,-23"/>
+</g>
+<g id="clust6" class="cluster">
+<title>cluster_cluster_entity_scan_Acquisition</title>
+<path fill="#f3f5f8" stroke="#f3f5f8" d="M358.52,-23C358.52,-23 446.12,-23 446.12,-23 452.12,-23 458.12,-29 458.12,-35 458.12,-35 458.12,-99 458.12,-99 458.12,-105 452.12,-111 446.12,-111 446.12,-111 358.52,-111 358.52,-111 352.52,-111 346.52,-105 346.52,-99 346.52,-99 346.52,-35 346.52,-35 346.52,-29 352.52,-23 358.52,-23"/>
+</g>
+<g id="clust8" class="cluster">
+<title>cluster_cluster_entity_scan_MassAnalysis</title>
+<path fill="#f3f5f8" stroke="#f3f5f8" d="M500.69,-23C500.69,-23 607.39,-23 607.39,-23 613.39,-23 619.39,-29 619.39,-35 619.39,-35 619.39,-99 619.39,-99 619.39,-105 613.39,-111 607.39,-111 607.39,-111 500.69,-111 500.69,-111 494.69,-111 488.69,-105 488.69,-99 488.69,-99 488.69,-35 488.69,-35 488.69,-29 494.69,-23 500.69,-23"/>
 </g>
 <!-- subject.Subject -->
 <g id="node1" class="node">
 <title>subject.Subject</title>
-<g id="a_node1"><a xlink:title="subject_id           &#13;------------------------------&#13;subject_description=&quot;''&#13;">
-<polygon fill="#00ff00" fill-opacity="0.188235" stroke="#00ff00" stroke-opacity="0.188235" points="72.5,-186.28 16,-186.28 16,-151.72 72.5,-151.72 72.5,-186.28"/>
-<text xml:space="preserve" text-anchor="start" x="24" y="-165.72" font-family="arial" text-decoration="underline" font-size="12.00" fill="darkgreen">Subject</text>
+<g id="a_node1"><a xlink:title="subject_id &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;subject_description=&quot;&#39;&#39;&#13;">
+<path fill="#e7f3ec" stroke="#2f7d5b" d="M60.82,-184.28C60.82,-184.28 27.52,-184.28 27.52,-184.28 21.76,-184.28 16,-178.52 16,-172.76 16,-172.76 16,-161.24 16,-161.24 16,-155.48 21.76,-149.72 27.52,-149.72 27.52,-149.72 60.82,-149.72 60.82,-149.72 66.58,-149.72 72.34,-155.48 72.34,-161.24 72.34,-161.24 72.34,-172.76 72.34,-172.76 72.34,-178.52 66.58,-184.28 60.82,-184.28"/>
+<text xml:space="preserve" text-anchor="start" x="23.92" y="-162.97" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#1b5138">Subject</text>
 </a>
 </g>
 </g>
 <!-- subject.Sample -->
-<g id="node4" class="node">
+<g id="node6" class="node">
 <title>subject.Sample</title>
-<g id="a_node4"><a xlink:title="→ subject.Subject&#13;sample_id            &#13;------------------------------&#13;sample_type          &#13;collection_datetime=null &#13;sample_description=&quot;''&#13;">
-<polygon fill="#00ff00" fill-opacity="0.188235" stroke="#00ff00" stroke-opacity="0.188235" points="185.25,-186.28 128,-186.28 128,-151.72 185.25,-151.72 185.25,-186.28"/>
-<text xml:space="preserve" text-anchor="start" x="136" y="-165.72" font-family="arial" text-decoration="underline" font-size="12.00" fill="darkgreen">Sample</text>
+<g id="a_node6"><a xlink:title="→ subject.Subject&#13;sample_id &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;sample_type &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;collection_datetime=null &#13;sample_description=&quot;&#39;&#39;&#13;">
+<path fill="#e7f3ec" stroke="#2f7d5b" d="M182.78,-184.28C182.78,-184.28 148.73,-184.28 148.73,-184.28 142.97,-184.28 137.21,-178.52 137.21,-172.76 137.21,-172.76 137.21,-161.24 137.21,-161.24 137.21,-155.48 142.97,-149.72 148.73,-149.72 148.73,-149.72 182.78,-149.72 182.78,-149.72 188.55,-149.72 194.31,-155.48 194.31,-161.24 194.31,-161.24 194.31,-172.76 194.31,-172.76 194.31,-178.52 188.55,-184.28 182.78,-184.28"/>
+<text xml:space="preserve" text-anchor="start" x="145.13" y="-162.97" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#1b5138">Sample</text>
 </a>
 </g>
 </g>
 <!-- subject.Subject&#45;&gt;subject.Sample -->
 <g id="edge1" class="edge">
-<title>subject.Subject-&gt;subject.Sample</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M72.82,-169C89.55,-169 110.84,-169 127.64,-169"/>
-</g>
-<!-- session.Instrument -->
-<g id="node2" class="node">
-<title>session.Instrument</title>
-<g id="a_node2"><a xlink:title="instrument_id        &#13;------------------------------&#13;instrument_name      &#13;manufacturer=&quot;''&#13;model=&quot;''&#13;">
-<polygon fill="#000000" fill-opacity="0.125490" stroke="none" points="187.88,-50.28 125.38,-50.28 125.38,-15.72 187.88,-15.72 187.88,-50.28"/>
-<text xml:space="preserve" text-anchor="start" x="133.38" y="-30.5" font-family="arial" text-decoration="underline" font-size="10.00">Instrument</text>
-</a>
-</g>
+<title>subject.Subject&#45;&gt;subject.Sample</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M72.61,-167C91.91,-167 117.67,-167 137.04,-167"/>
 </g>
 <!-- session.Session -->
-<g id="node7" class="node">
+<g id="node2" class="node">
 <title>session.Session</title>
-<g id="a_node7"><a xlink:title="→ subject.Sample&#13;session_idx          &#13;------------------------------&#13;session_datetime     &#13;→ session.Instrument&#13;→ session.AcquisitionMethod&#13;raw_data_path        &#13;session_notes=&quot;''&#13;">
-<polygon fill="#00ff00" fill-opacity="0.188235" stroke="#00ff00" stroke-opacity="0.188235" points="300.25,-103.28 240.75,-103.28 240.75,-68.72 300.25,-68.72 300.25,-103.28"/>
-<text xml:space="preserve" text-anchor="start" x="248.75" y="-82.72" font-family="arial" text-decoration="underline" font-size="12.00" fill="darkgreen">Session</text>
+<g id="a_node2"><a xlink:title="→ subject.Sample&#13;session_idx &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;session_datetime &#160;&#160;&#160;&#160;&#13;→ session.Instrument&#13;→ session.AcquisitionMethod&#13;raw_data_path &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;session_notes=&quot;&#39;&#39;&#13;">
+<path fill="#e7f3ec" stroke="#2f7d5b" d="M307,-103.28C307,-103.28 270.7,-103.28 270.7,-103.28 264.94,-103.28 259.18,-97.52 259.18,-91.76 259.18,-91.76 259.18,-80.24 259.18,-80.24 259.18,-74.48 264.94,-68.72 270.7,-68.72 270.7,-68.72 307,-68.72 307,-68.72 312.76,-68.72 318.52,-74.48 318.52,-80.24 318.52,-80.24 318.52,-91.76 318.52,-91.76 318.52,-97.52 312.76,-103.28 307,-103.28"/>
+<text xml:space="preserve" text-anchor="start" x="267.1" y="-81.97" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#1b5138">Session</text>
 </a>
 </g>
 </g>
-<!-- session.Instrument&#45;&gt;session.Session -->
-<g id="edge3" class="edge">
-<title>session.Instrument-&gt;session.Session</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-dasharray="5,2" stroke-opacity="0.250980" d="M187.61,-47.2C204.05,-54.99 224.33,-64.6 240.6,-72.31"/>
-</g>
 <!-- scan.Acquisition -->
 <g id="node3" class="node">
 <title>scan.Acquisition</title>
-<g id="a_node3"><a xlink:title="→ session.Session&#13;------------------------------&#13;n_scans              &#13;">
-<ellipse fill="#00007f" fill-opacity="0.250980" stroke="#00007f" stroke-opacity="0.250980" cx="385.42" cy="-86" rx="49.17" ry="17.28"/>
-<text xml:space="preserve" text-anchor="middle" x="385.42" y="-81.72" font-family="arial" font-size="12.00" fill="#00007f" fill-opacity="0.627451">Acquisition</text>
+<g id="a_node3"><a xlink:title="→ session.Session&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;n_scans &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;">
+<ellipse fill="#e2ecfa" stroke="#2a5fa5" cx="402.32" cy="-86" rx="47.8" ry="17.28"/>
+<text xml:space="preserve" text-anchor="middle" x="402.32" y="-80.97" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#123a6d">Acquisition</text>
 </a>
 </g>
 </g>
-<!-- scan.Acquisition.Scan -->
-<g id="node6" class="node">
-<title>scan.Acquisition.Scan</title>
-<g id="a_node6"><a xlink:title="→ scan.Acquisition&#13;scan_number          &#13;------------------------------&#13;retention_time       &#13;ms_level             &#13;total_ion_current    &#13;base_peak_mz         &#13;base_peak_intensity  &#13;">
-<polygon fill="none" stroke="none" points="574.31,-85 484.81,-85 484.81,-65 574.31,-65 574.31,-85"/>
-<text xml:space="preserve" text-anchor="start" x="492.81" y="-72.5" font-family="arial" text-decoration="underline" font-size="10.00">Acquisition.Scan</text>
-</a>
-</g>
-</g>
-<!-- scan.Acquisition&#45;&gt;scan.Acquisition.Scan -->
-<g id="edge6" class="edge">
-<title>scan.Acquisition-&gt;scan.Acquisition.Scan</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M433.75,-82.34C450.39,-81.05 468.99,-79.61 485.27,-78.35"/>
+<!-- session.Session&#45;&gt;scan.Acquisition -->
+<g id="edge3" class="edge">
+<title>session.Session&#45;&gt;scan.Acquisition</title>
+<path fill="none" stroke="#3a424f" stroke-width="2" stroke-opacity="0.619608" d="M318.85,-86C329.68,-86 342.29,-86 354.33,-86"/>
 </g>
 <!-- scan.MassAnalysis -->
-<g id="node8" class="node">
+<g id="node4" class="node">
 <title>scan.MassAnalysis</title>
-<g id="a_node8"><a xlink:title="→ scan.Acquisition&#13;">
-<ellipse fill="#00007f" fill-opacity="0.250980" stroke="#00007f" stroke-opacity="0.250980" cx="529.56" cy="-120" rx="58.97" ry="17.28"/>
-<text xml:space="preserve" text-anchor="middle" x="529.56" y="-115.72" font-family="arial" font-size="12.00" fill="#00007f" fill-opacity="0.627451">MassAnalysis</text>
+<g id="a_node4"><a xlink:title="→ scan.Acquisition&#13;">
+<ellipse fill="#e2ecfa" stroke="#2a5fa5" cx="554.04" cy="-86" rx="57.35" ry="17.28"/>
+<text xml:space="preserve" text-anchor="middle" x="554.04" y="-80.97" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#123a6d">MassAnalysis</text>
 </a>
 </g>
 </g>
 <!-- scan.Acquisition&#45;&gt;scan.MassAnalysis -->
 <g id="edge7" class="edge">
-<title>scan.Acquisition-&gt;scan.MassAnalysis</title>
-<path fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.250980" d="M426.77,-95.65C444.26,-99.83 464.81,-104.75 482.85,-109.07"/>
+<title>scan.Acquisition&#45;&gt;scan.MassAnalysis</title>
+<path fill="none" stroke="#3a424f" stroke-width="2" stroke-opacity="0.619608" d="M450.28,-86C464.86,-86 481.09,-86 496.26,-86"/>
 </g>
-<!-- subject.Sample&#45;&gt;session.Session -->
-<g id="edge2" class="edge">
-<title>subject.Sample-&gt;session.Session</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M185.47,-152.78C191.92,-148.78 198.67,-144.37 204.75,-140 220.56,-128.63 237.42,-114.5 249.97,-103.55"/>
+<!-- scan.Acquisition.Scan -->
+<g id="node8" class="node">
+<title>scan.Acquisition.Scan</title>
+<g id="a_node8"><a xlink:title="→ scan.Acquisition&#13;scan_number &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;retention_time &#160;&#160;&#160;&#160;&#160;&#160;&#13;ms_level &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;total_ion_current &#160;&#160;&#160;&#13;base_peak_mz &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;base_peak_intensity &#160;&#13;">
+<path fill="#ffffff" stroke="#9aa6b8" d="M414.86,-50.95C414.86,-50.95 389.78,-50.95 389.78,-50.95 386.47,-50.95 383.15,-47.63 383.15,-44.31 383.15,-44.31 383.15,-37.68 383.15,-37.68 383.15,-34.37 386.47,-31.05 389.78,-31.05 389.78,-31.05 414.86,-31.05 414.86,-31.05 418.18,-31.05 421.49,-34.37 421.49,-37.69 421.49,-37.69 421.49,-44.32 421.49,-44.32 421.49,-47.63 418.18,-50.95 414.86,-50.95"/>
+<text xml:space="preserve" text-anchor="start" x="391.07" y="-38.12" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="10.00" fill="#46536b">Scan</text>
+</a>
 </g>
-<!-- session.AcquisitionMethod -->
+</g>
+<!-- scan.Acquisition&#45;&gt;scan.Acquisition.Scan -->
+<g id="edge6" class="edge">
+<title>scan.Acquisition&#45;&gt;scan.Acquisition.Scan</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M402.32,-68.33C402.32,-62.62 402.32,-56.91 402.32,-51.2"/>
+</g>
+<!-- scan.PeakDetection -->
 <g id="node5" class="node">
-<title>session.AcquisitionMethod</title>
-<g id="a_node5"><a xlink:title="method_id            &#13;------------------------------&#13;method_name          &#13;ionization_mode      &#13;method_description=&quot;''&#13;">
-<polygon fill="#000000" fill-opacity="0.125490" stroke="none" points="204.75,-103.28 108.5,-103.28 108.5,-68.72 204.75,-68.72 204.75,-103.28"/>
-<text xml:space="preserve" text-anchor="start" x="116.5" y="-83.5" font-family="arial" text-decoration="underline" font-size="10.00">AcquisitionMethod</text>
+<title>scan.PeakDetection</title>
+<g id="a_node5"><a xlink:title="→ scan.MassAnalysis&#13;→ scan.PeakDetectionParams&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;total_peaks &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;">
+<ellipse fill="#fbeaec" stroke="#b23a48" cx="718.17" cy="-86" rx="60.21" ry="17.28"/>
+<text xml:space="preserve" text-anchor="middle" x="718.17" y="-80.97" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#7c2430">PeakDetection</text>
 </a>
 </g>
 </g>
-<!-- session.AcquisitionMethod&#45;&gt;session.Session -->
-<g id="edge4" class="edge">
-<title>session.AcquisitionMethod-&gt;session.Session</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-dasharray="5,2" stroke-opacity="0.250980" d="M204.75,-86C216.81,-86 229.43,-86 240.3,-86"/>
+<!-- scan.MassAnalysis&#45;&gt;scan.PeakDetection -->
+<g id="edge10" class="edge">
+<title>scan.MassAnalysis&#45;&gt;scan.PeakDetection</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M611.75,-86C626.54,-86 642.53,-86 657.47,-86"/>
 </g>
 <!-- scan.MassAnalysis.Spectrum -->
 <g id="node9" class="node">
 <title>scan.MassAnalysis.Spectrum</title>
-<g id="a_node9"><a xlink:title="→ scan.MassAnalysis&#13;→ scan.Acquisition.Scan&#13;------------------------------&#13;mz_array             &#13;intensity_array      &#13;">
-<polygon fill="none" stroke="none" points="747.7,-85 625.2,-85 625.2,-65 747.7,-65 747.7,-85"/>
-<text xml:space="preserve" text-anchor="middle" x="686.45" y="-71.5" font-family="arial" font-size="10.00">MassAnalysis.Spectrum</text>
+<g id="a_node9"><a xlink:title="→ scan.MassAnalysis&#13;→ scan.Acquisition.Scan&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;mz_array &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;intensity_array &#160;&#160;&#160;&#160;&#160;&#13;">
+<path fill="#ffffff" stroke="#9aa6b8" d="M576.33,-50.95C576.33,-50.95 531.75,-50.95 531.75,-50.95 528.44,-50.95 525.12,-47.63 525.12,-44.31 525.12,-44.31 525.12,-37.68 525.12,-37.68 525.12,-34.37 528.44,-31.05 531.75,-31.05 531.75,-31.05 576.33,-31.05 576.33,-31.05 579.65,-31.05 582.96,-34.37 582.96,-37.69 582.96,-37.69 582.96,-44.32 582.96,-44.32 582.96,-47.63 579.65,-50.95 576.33,-50.95"/>
+<text xml:space="preserve" text-anchor="middle" x="554.04" y="-37.12" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#46536b">Spectrum</text>
 </a>
 </g>
 </g>
-<!-- scan.Acquisition.Scan&#45;&gt;scan.MassAnalysis.Spectrum -->
-<g id="edge8" class="edge">
-<title>scan.Acquisition.Scan-&gt;scan.MassAnalysis.Spectrum</title>
-<path fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.250980" d="M574.12,-75C590.05,-75 608.36,-75 625.46,-75"/>
-</g>
-<!-- session.Session&#45;&gt;scan.Acquisition -->
-<g id="edge5" class="edge">
-<title>session.Session-&gt;scan.Acquisition</title>
-<path fill="none" stroke="#000000" stroke-width="2" stroke-opacity="0.250980" d="M300.58,-86C311.43,-86 324.05,-86 336.17,-86"/>
-</g>
 <!-- scan.MassAnalysis&#45;&gt;scan.MassAnalysis.Spectrum -->
 <g id="edge9" class="edge">
-<title>scan.MassAnalysis-&gt;scan.MassAnalysis.Spectrum</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M572.48,-107.82C597.12,-100.66 627.88,-91.73 651.08,-84.99"/>
+<title>scan.MassAnalysis&#45;&gt;scan.MassAnalysis.Spectrum</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M554.04,-68.33C554.04,-62.62 554.04,-56.91 554.04,-51.2"/>
 </g>
-<!-- scan.PeakDetection -->
-<g id="node11" class="node">
-<title>scan.PeakDetection</title>
-<g id="a_node11"><a xlink:title="→ scan.MassAnalysis&#13;→ scan.PeakDetectionParams&#13;------------------------------&#13;total_peaks          &#13;">
-<ellipse fill="#ff0000" fill-opacity="0.125490" stroke="#ff0000" stroke-opacity="0.125490" cx="686.45" cy="-120" rx="61.91" ry="17.28"/>
-<text xml:space="preserve" text-anchor="middle" x="686.45" y="-115.72" font-family="arial" font-size="12.00" fill="#7f0000" fill-opacity="0.627451">PeakDetection</text>
+<!-- scan.PeakDetection.Peak -->
+<g id="node10" class="node">
+<title>scan.PeakDetection.Peak</title>
+<g id="a_node10"><a xlink:title="→ scan.PeakDetection&#13;→ scan.MassAnalysis.Spectrum&#13;peak_idx &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;mz &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;intensity &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;snr &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;">
+<path fill="#ffffff" stroke="#9aa6b8" d="M730.71,-50.95C730.71,-50.95 705.63,-50.95 705.63,-50.95 702.32,-50.95 699,-47.63 699,-44.31 699,-44.31 699,-37.68 699,-37.68 699,-34.37 702.32,-31.05 705.63,-31.05 705.63,-31.05 730.71,-31.05 730.71,-31.05 734.03,-31.05 737.34,-34.37 737.34,-37.69 737.34,-37.69 737.34,-44.32 737.34,-44.32 737.34,-47.63 734.03,-50.95 730.71,-50.95"/>
+<text xml:space="preserve" text-anchor="start" x="706.92" y="-38.12" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="10.00" fill="#46536b">Peak</text>
 </a>
 </g>
 </g>
-<!-- scan.MassAnalysis&#45;&gt;scan.PeakDetection -->
-<g id="edge10" class="edge">
-<title>scan.MassAnalysis-&gt;scan.PeakDetection</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M588.68,-120C600.27,-120 612.47,-120 624.16,-120"/>
+<!-- scan.PeakDetection&#45;&gt;scan.PeakDetection.Peak -->
+<g id="edge12" class="edge">
+<title>scan.PeakDetection&#45;&gt;scan.PeakDetection.Peak</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M718.17,-68.33C718.17,-62.62 718.17,-56.91 718.17,-51.2"/>
 </g>
-<!-- scan.PeakDetection.Peak -->
-<g id="node12" class="node">
-<title>scan.PeakDetection.Peak</title>
-<g id="a_node12"><a xlink:title="→ scan.PeakDetection&#13;→ scan.MassAnalysis.Spectrum&#13;peak_idx             &#13;------------------------------&#13;mz                   &#13;intensity            &#13;snr                  &#13;">
-<polygon fill="none" stroke="none" points="890.36,-107 784.36,-107 784.36,-87 890.36,-87 890.36,-107"/>
-<text xml:space="preserve" text-anchor="start" x="792.36" y="-94.5" font-family="arial" text-decoration="underline" font-size="10.00">PeakDetection.Peak</text>
+<!-- subject.Sample&#45;&gt;session.Session -->
+<g id="edge2" class="edge">
+<title>subject.Sample&#45;&gt;session.Session</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M194.65,-154.07C203.95,-149.39 214.22,-143.82 223.18,-138 239.01,-127.72 255.57,-114.34 267.97,-103.73"/>
+</g>
+<!-- session.Instrument -->
+<g id="node7" class="node">
+<title>session.Instrument</title>
+<g id="a_node7"><a xlink:title="instrument_id &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;instrument_name &#160;&#160;&#160;&#160;&#160;&#13;manufacturer=&quot;&#39;&#39;&#13;model=&quot;&#39;&#39;&#13;">
+<path fill="#f2f4f7" stroke="#a9b1bd" d="M189.91,-103.28C189.91,-103.28 141.61,-103.28 141.61,-103.28 135.85,-103.28 130.09,-97.52 130.09,-91.76 130.09,-91.76 130.09,-80.24 130.09,-80.24 130.09,-74.48 135.85,-68.72 141.61,-68.72 141.61,-68.72 189.91,-68.72 189.91,-68.72 195.67,-68.72 201.43,-74.48 201.43,-80.24 201.43,-80.24 201.43,-91.76 201.43,-91.76 201.43,-97.52 195.67,-103.28 189.91,-103.28"/>
+<text xml:space="preserve" text-anchor="start" x="138.01" y="-81.97" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#495261">Instrument</text>
 </a>
 </g>
 </g>
+<!-- session.Instrument&#45;&gt;session.Session -->
+<g id="edge4" class="edge">
+<title>session.Instrument&#45;&gt;session.Session</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-dasharray="5,2" stroke-opacity="0.619608" d="M201.78,-86C219.94,-86 241.86,-86 259.02,-86"/>
+</g>
+<!-- scan.Acquisition.Scan&#45;&gt;scan.MassAnalysis.Spectrum -->
+<g id="edge8" class="edge">
+<title>scan.Acquisition.Scan&#45;&gt;scan.MassAnalysis.Spectrum</title>
+<path fill="none" stroke="#3a424f" stroke-width="2" stroke-opacity="0.619608" d="M421.98,-41C447.77,-41 494.53,-41 524.66,-41"/>
+</g>
 <!-- scan.MassAnalysis.Spectrum&#45;&gt;scan.PeakDetection.Peak -->
 <g id="edge11" class="edge">
-<title>scan.MassAnalysis.Spectrum-&gt;scan.PeakDetection.Peak</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M747.59,-83.88C759.86,-85.7 772.67,-87.59 784.61,-89.35"/>
+<title>scan.MassAnalysis.Spectrum&#45;&gt;scan.PeakDetection.Peak</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M583.28,-41C616.49,-41 670.64,-41 698.82,-41"/>
+</g>
+<!-- session.AcquisitionMethod -->
+<g id="node11" class="node">
+<title>session.AcquisitionMethod</title>
+<g id="a_node11"><a xlink:title="method_id &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;method_name &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;ionization_mode &#160;&#160;&#160;&#160;&#160;&#13;method_description=&quot;&#39;&#39;&#13;">
+<path fill="#f2f4f7" stroke="#a9b1bd" d="M211.66,-50.28C211.66,-50.28 119.86,-50.28 119.86,-50.28 114.1,-50.28 108.34,-44.52 108.34,-38.76 108.34,-38.76 108.34,-27.24 108.34,-27.24 108.34,-21.48 114.1,-15.72 119.86,-15.72 119.86,-15.72 211.66,-15.72 211.66,-15.72 217.42,-15.72 223.18,-21.48 223.18,-27.24 223.18,-27.24 223.18,-38.76 223.18,-38.76 223.18,-44.52 217.42,-50.28 211.66,-50.28"/>
+<text xml:space="preserve" text-anchor="start" x="116.26" y="-28.98" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#495261">AcquisitionMethod</text>
+</a>
+</g>
+</g>
+<!-- session.AcquisitionMethod&#45;&gt;session.Session -->
+<g id="edge5" class="edge">
+<title>session.AcquisitionMethod&#45;&gt;session.Session</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-dasharray="5,2" stroke-opacity="0.619608" d="M207.08,-50.65C224.01,-58.06 243.31,-66.51 258.81,-73.29"/>
 </g>
 <!-- scan.PeakDetectionParams -->
-<g id="node10" class="node">
+<g id="node12" class="node">
 <title>scan.PeakDetectionParams</title>
-<g id="a_node10"><a xlink:title="peak_params_id       &#13;------------------------------&#13;height_factor        &#13;prominence_factor    &#13;min_distance         &#13;peak_params_desc     &#13;">
-<polygon fill="#000000" fill-opacity="0.125490" stroke="none" points="586.69,-190.28 472.44,-190.28 472.44,-155.72 586.69,-155.72 586.69,-190.28"/>
-<text xml:space="preserve" text-anchor="start" x="480.44" y="-170.5" font-family="arial" text-decoration="underline" font-size="10.00">PeakDetectionParams</text>
+<g id="a_node12"><a xlink:title="peak_params_id &#160;&#160;&#160;&#160;&#160;&#160;&#13;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#13;height_factor &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;prominence_factor &#160;&#160;&#160;&#13;min_distance &#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#13;peak_params_desc &#160;&#160;&#160;&#160;&#13;">
+<path fill="#f2f4f7" stroke="#a9b1bd" d="M610.44,-156.28C610.44,-156.28 497.64,-156.28 497.64,-156.28 491.88,-156.28 486.12,-150.52 486.12,-144.76 486.12,-144.76 486.12,-133.24 486.12,-133.24 486.12,-127.48 491.88,-121.72 497.64,-121.72 497.64,-121.72 610.44,-121.72 610.44,-121.72 616.2,-121.72 621.96,-127.48 621.96,-133.24 621.96,-133.24 621.96,-144.76 621.96,-144.76 621.96,-150.52 616.2,-156.28 610.44,-156.28"/>
+<text xml:space="preserve" text-anchor="start" x="494.04" y="-134.97" font-family="Helvetica,sans-Serif" text-decoration="underline" font-size="12.00" fill="#495261">PeakDetectionParams</text>
 </a>
 </g>
 </g>
 <!-- scan.PeakDetectionParams&#45;&gt;scan.PeakDetection -->
-<g id="edge12" class="edge">
-<title>scan.PeakDetectionParams-&gt;scan.PeakDetection</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M580.85,-155.79C602.05,-148.54 626.36,-140.22 646.2,-133.43"/>
-</g>
-<!-- scan.PeakDetection&#45;&gt;scan.PeakDetection.Peak -->
 <g id="edge13" class="edge">
-<title>scan.PeakDetection-&gt;scan.PeakDetection.Peak</title>
-<path fill="none" stroke="#000000" stroke-width="0.75" stroke-opacity="0.250980" d="M741.21,-111.7C755.37,-109.51 770.62,-107.15 784.67,-104.98"/>
+<title>scan.PeakDetectionParams&#45;&gt;scan.PeakDetection</title>
+<path fill="none" stroke="#3a424f" stroke-width="0.75" stroke-opacity="0.619608" d="M609.03,-121.35C631.32,-114.06 656.7,-105.77 677.27,-99.04"/>
 </g>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/pyproject.toml b/pyproject.toml
index 3ffa8b0..ba1f959 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Bio-Informatics",
 ]
 dependencies = [
-    "datajoint[postgres]>=2.1.0",
+    "datajoint[postgres]>=2.3.0",
     "numpy",
     "pandas",
     "scipy",