diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..5bf500b
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+  # GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      actions:
+        patterns:
+          - "*"
+  # Python
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/release-python.yml b/.github/workflows/release-python.yml
new file mode 100644
index 0000000..519ef9d
--- /dev/null
+++ b/.github/workflows/release-python.yml
@@ -0,0 +1,99 @@
+name: Python Wheels
+
+on:
+  push:
+    branches: ["main"]
+    tags:
+      - "**"
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: wheels-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash -eux {0}
+
+jobs:
+
+  build_dist:
+    name: Build Distribution Files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - uses: actions/setup-python@v5
+        with:
+          # Build sdist on lowest supported Python
+          python-version: '3.9'
+
+      - name: Install build
+        run: |
+          python -m pip install build
+
+      - name: build the dist files
+        run: |
+          python -m build .
+
+      - name: Upload the dist files
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ github.run_id }}
+          path: ./dist/*.*
+
+  test_dist:
+    needs: [build_dist]
+    name: Test Distribution Files
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - uses: actions/setup-python@v5
+        with:
+          # Build sdist on lowest supported Python
+          python-version: '3.9'
+
+      - name: Download the dists
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-${{ github.run_id }}
+          path: dist/
+
+      - name: Test the sdist
+        run: |
+          cd dist
+          pip install *.tar.gz
+          python -c "import flask_pymongo"
+          pip uninstall -y flask_pymongo
+
+      - name: Test the wheel
+        run: |
+          cd dist
+          pip install *.whl
+          python -c "import flask_pymongo"
+          pip uninstall -y flask_pymongo
+
+  publish:
+    # https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/#publishing-the-distribution-to-pypi
+    needs: [test_dist]
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+    - name: Download the dists
+      uses: actions/download-artifact@v4
+      with:
+        name: dist-${{ github.run_id }}
+        path: dist/
+    - name: Publish distribution 📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
new file mode 100644
index 0000000..583dbca
--- /dev/null
+++ b/.github/workflows/test-python.yml
@@ -0,0 +1,107 @@
+name: Python Tests
+
+on:
+  push:
+      branches: ["main"]
+  pull_request:
+
+concurrency:
+  group: tests-${{ github.ref }}
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash -eux {0}
+
+env:
+  MIN_PYTHON: "3.9"
+  MIN_MONGODB: "4.0"
+  MAX_MONGODB: "8.0"
+
+jobs:
+  static:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+        fetch-depth: 0
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        python-version: ${{ matrix.python-version }}
+    - uses: extractions/setup-just@v3
+    - run: just install
+    - run: just lint
+    - run: just docs
+    - run: just doctest
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+      fail-fast: false
+    name: CPython ${{ matrix.python-version }}-${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
+      - uses: extractions/setup-just@v3
+      - name: Start MongoDB on Linux
+        if: ${{ startsWith(runner.os, 'Linux') }}
+        uses: supercharge/mongodb-github-action@1.12.0
+        with:
+          mongodb-version: ${{ env.MAX_MONGODB }}
+          mongodb-replica-set: test-rs
+      - name: Start MongoDB on MacOS
+        if: ${{ startsWith(runner.os, 'macOS') }}
+        run: |
+          brew tap mongodb/brew
+          brew install mongodb/brew/mongodb-community@${MAX_MONGODB}
+          brew services start mongodb-community@${MAX_MONGODB}
+      - name: Start MongoDB on Windows
+        if: ${{ startsWith(runner.os, 'Windows') }}
+        shell: powershell
+        run: |
+          mkdir data
+          mongod --remove
+          mongod --install --dbpath=$(pwd)/data --logpath=$PWD/mongo.log
+          net start MongoDB
+      - run: just install
+      - run: just test
+
+  build-min:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+        fetch-depth: 0
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        python-version: ${{ env.MIN_PYTHON }}
+    - uses: extractions/setup-just@v3
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        enable-cache: true
+        python-version: ${{ env.MIN_PYTHON }}
+    - uses: extractions/setup-just@v3
+    - uses: supercharge/mongodb-github-action@1.12.0
+      with:
+        mongodb-version: ${{ env.MIN_MONGODB }}
+        mongodb-replica-set: test-rs
+    - name: Run unit tests with minimum dependency versions
+      run: |
+        uv sync --python=${MIN_PYTHON} --resolution=lowest-direct
+        just test
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
new file mode 100644
index 0000000..0fbdbd6
--- /dev/null
+++ b/.github/workflows/zizmor.yml
@@ -0,0 +1,32 @@
+name: GitHub Actions Security Analysis with zizmor
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["**"]
+
+jobs:
+  zizmor:
+    name: zizmor latest via Cargo
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Setup Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Get zizmor
+        run: cargo install zizmor
+      - name: Run zizmor
+        run: zizmor --format sarif . > results.sarif
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Upload SARIF file
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: results.sarif
+          category: zizmor
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5c722e9..1808b53 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,22 +1,67 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
-    hooks:
-    -   id: trailing-whitespace
-    -   id: end-of-file-fixer
-    -   id: check-yaml
-    -   id: check-added-large-files
--   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
-    hooks:
-    -   id: ruff
-        args: [ --fix ]
-    -   id: ruff-format
-
--   repo: https://github.com/djlint/djLint
-    rev: v1.36.3
-    hooks:
-      - id: djlint-reformat-django
-      - id: djlint-django
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v5.0.0
+  hooks:
+  - id: check-added-large-files
+  - id: check-case-conflict
+  - id: check-toml
+  - id: check-yaml
+  - id: debug-statements
+  - id: end-of-file-fixer
+  - id: forbid-new-submodules
+  - id: trailing-whitespace
+
+# We use the Python version instead of the original version which seems to require Docker
+# https://github.com/koalaman/shellcheck-precommit
+- repo: https://github.com/shellcheck-py/shellcheck-py
+  rev: v0.10.0.1
+  hooks:
+    - id: shellcheck
+      name: shellcheck
+      args: ["--severity=warning"]
+      stages: [manual]
+
+- repo: https://github.com/sirosen/check-jsonschema
+  rev: 0.31.0
+  hooks:
+    - id: check-github-workflows
+      args: ["--verbose"]
+
+- repo: https://github.com/codespell-project/codespell
+  rev: "v2.3.0"
+  hooks:
+  - id: codespell
+    args: ["-L", "nd"]
+    stages: [manual]
+
+- repo: https://github.com/adamchainz/blacken-docs
+  rev: "1.19.1"
+  hooks:
+    - id: blacken-docs
+      additional_dependencies: [black==24.*]
+
+- repo: https://github.com/pre-commit/pygrep-hooks
+  rev: "v1.10.0"
+  hooks:
+    - id: rst-backticks
+    - id: rst-directive-colons
+    - id: rst-inline-touching-normal
+
+- repo: https://github.com/hukkin/mdformat
+  rev: 0.7.21
+  hooks:
+  - id: mdformat
+    # Optionally add plugins
+    additional_dependencies:
+    - mdformat-gfm
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.9.1
+  hooks:
+    # Run the linter.
+    - id: ruff
+      args: [ --fix,  --show-fixes ]
+    # Run the formatter.
+    - id: ruff-format
diff --git a/django_mongodb_extensions/debug_toolbar/panels/mql/panel.py b/django_mongodb_extensions/debug_toolbar/panels/mql/panel.py
index 37ad6ca..a1d8647 100644
--- a/django_mongodb_extensions/debug_toolbar/panels/mql/panel.py
+++ b/django_mongodb_extensions/debug_toolbar/panels/mql/panel.py
@@ -58,8 +58,6 @@ def disable_instrumentation(self):
     def generate_stats(self, request, response):
         self.record_stats(
             {
-                "databases": sorted(self._databases.items()),
                 "queries": self._queries,
-                "sql_time": self._sql_time,
             }
         )
diff --git a/django_mongodb_extensions/debug_toolbar/panels/mql/tracking.py b/django_mongodb_extensions/debug_toolbar/panels/mql/tracking.py
index 535ce84..9c9c757 100644
--- a/django_mongodb_extensions/debug_toolbar/panels/mql/tracking.py
+++ b/django_mongodb_extensions/debug_toolbar/panels/mql/tracking.py
@@ -32,10 +32,12 @@ def log(self, op, duration, args, kwargs=None):
         args = ", ".join(repr(arg) for arg in args)
         operation = f"db.{self.collection_name}{op}({args})"
         if self.logger:
+            self.logger._sql_time += duration
             self.logger._queries.append(
                 {
+                    "alias": self.db.alias,
                     "sql": operation,
-                    "time": "%.3f" % duration,
+                    "duration": "%.3f" % duration,
                 }
             )
             self.logger._databases[self.db.alias] = {
diff --git a/django_mongodb_extensions/templates/debug_toolbar/panels/mql.html b/django_mongodb_extensions/templates/debug_toolbar/panels/mql.html
index cb896ba..d12c187 100644
--- a/django_mongodb_extensions/templates/debug_toolbar/panels/mql.html
+++ b/django_mongodb_extensions/templates/debug_toolbar/panels/mql.html
@@ -3,15 +3,15 @@
   {% for alias, info in databases %}
     <li>
       <strong><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ info.rgb_color|join:', ' }})"></span> {{ alias }}</strong>
-      {{ info.time_spent|floatformat:"2" }} ms ({% blocktrans count info.num_queries as num %}{{ num }} query{% plural %}{{ num }} queries{% endblocktrans %}
+      {{ info.time_spent|floatformat:"2" }} ms ({% blocktranslate count num=info.num_queries %}{{ num }} query{% plural %}{{ num }} queries{% endblocktranslate %}
       {% if info.similar_count %}
-        {% blocktrans with count=info.similar_count trimmed %}
+        {% blocktranslate with count=info.similar_count trimmed %}
           including <abbr title="Similar queries are queries with the same SQL, but potentially different parameters.">{{ count }} similar</abbr>
-        {% endblocktrans %}
+        {% endblocktranslate %}
         {% if info.duplicate_count %}
-          {% blocktrans with dupes=info.duplicate_count trimmed %}
+          {% blocktranslate with dupes=info.duplicate_count trimmed %}
             and <abbr title="Duplicate queries are identical to each other: they execute exactly the same SQL and parameters.">{{ dupes }} duplicates</abbr>
-          {% endblocktrans %}
+          {% endblocktranslate %}
         {% endif %}
       {% endif %})
     </li>
@@ -23,24 +23,24 @@
     <colgroup>
       <col>
       <col>
-      <col>
-      <col class="djdt-width-30">
+      {% comment %}<col>{% endcomment %}
       <col>
       <col>
+      {% comment %}<col>{% endcomment %}
     </colgroup>
     <thead>
       <tr>
         <th></th>
-        <th colspan="2">{% trans "Query" %}</th>
-        <th>{% trans "Timeline" %}</th>
-        <th>{% trans "Time (ms)" %}</th>
-        <th>{% trans "Action" %}</th>
+        <th colspan="2">{% translate "Query" %}</th>
+        {% comment %}<th>{% translate "Timeline" %}</th>{% endcomment %}
+        <th>{% translate "Time (ms)" %}</th>
+        {% comment %}<th>{% translate "Action" %}</th>{% endcomment %}
       </tr>
     </thead>
     <tbody>
       {% for query in queries %}
         <tr class="{% if query.is_slow %} djDebugRowWarning{% endif %}" id="sqlMain_{{ forloop.counter }}">
-          <td><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ query.rgb_color|join:', '}})"></span></td>
+          <td><span class="djdt-color" data-djdt-styles="backgroundColor:rgb({{ query.rgb_color|join:', ' }})"></span></td>
           <td class="djdt-toggle">
             <button type="button" class="djToggleSwitch" data-toggle-name="sqlMain" data-toggle-id="{{ forloop.counter }}">+</button>
           </td>
@@ -49,16 +49,17 @@
             {% if query.similar_count %}
               <strong>
                 <span class="djdt-color" data-djdt-styles="backgroundColor:{{ query.similar_color }}"></span>
-                {% blocktrans with count=query.similar_count %}{{ count }} similar queries.{% endblocktrans %}
+                {% blocktranslate with count=query.similar_count %}{{ count }} similar queries.{% endblocktranslate %}
               </strong>
             {% endif %}
             {% if query.duplicate_count %}
               <strong>
                 <span class="djdt-color" data-djdt-styles="backgroundColor:{{ query.duplicate_color }}"></span>
-                {% blocktrans with dupes=query.duplicate_count %}Duplicated {{ dupes }} times.{% endblocktrans %}
+                {% blocktranslate with dupes=query.duplicate_count %}Duplicated {{ dupes }} times.{% endblocktranslate %}
               </strong>
             {% endif %}
           </td>
+          {% comment %}
           <td>
             <svg class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}{% if query.in_trans %} djDebugLineChartInTransaction{% endif %}" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 100 5" preserveAspectRatio="none" aria-label="{{ query.width_ratio }}%">
               <rect x="{{ query.start_offset|unlocalize }}" y="0" height="5" width="{{ query.width_ratio|unlocalize }}" fill="{{ query.trace_color }}" />
@@ -70,9 +71,11 @@
               {% endif %}
             </svg>
           </td>
+          {% endcomment %}
           <td class="djdt-time">
             {{ query.duration|floatformat:"2" }}
           </td>
+          {% comment %}
           <td class="djdt-actions">
             {% if query.params %}
               {% if query.is_select %}
@@ -87,17 +90,18 @@
               {% endif %}
             {% endif %}
           </td>
+          {% endcomment %}
         </tr>
         <tr class="djUnselected {% if query.is_slow %} djDebugRowWarning{% endif %} djToggleDetails_{{ forloop.counter }}" id="sqlDetails_{{ forloop.counter }}">
           <td colspan="2"></td>
           <td colspan="4">
             <div class="djSQLDetailsDiv">
-              <p><strong>{% trans "Connection:" %}</strong> {{ query.alias }}</p>
+              <p><strong>{% translate "Connection:" %}</strong> {{ query.alias }}</p>
               {% if query.iso_level %}
-                <p><strong>{% trans "Isolation level:" %}</strong> {{ query.iso_level }}</p>
+                <p><strong>{% translate "Isolation level:" %}</strong> {{ query.iso_level }}</p>
               {% endif %}
               {% if query.trans_status %}
-                <p><strong>{% trans "Transaction status:" %}</strong> {{ query.trans_status }}</p>
+                <p><strong>{% translate "Transaction status:" %}</strong> {{ query.trans_status }}</p>
               {% endif %}
               {% if query.stacktrace %}
                 <pre class="djdt-stack">{{ query.stacktrace }}</pre>
@@ -120,5 +124,5 @@
     </tbody>
   </table>
 {% else %}
-  <p>{% trans "No MQL queries were recorded during this request." %}</p>
+  <p>{% translate "No SQL queries were recorded during this request." %}</p>
 {% endif %}
diff --git a/justfile b/justfile
index 789b1ea..1270741 100644
--- a/justfile
+++ b/justfile
@@ -1,2 +1,28 @@
+docs_build := "docs/_build"
+sphinx_opts:= "-d " + docs_build + "/doctrees docs"
+
+# Default target executed when no arguments are given.
+[private]
 default:
-    echo 'Hello, world!'
+  @just --list
+
+install:
+    uv sync
+    uv run pre-commit install
+
+test *args:
+	uv run pytest {{args}}
+
+lint:
+	uv run pre-commit run --hook-stage manual --all-files
+
+docs:
+    uv run sphinx-build -T -b html {{sphinx_opts}} {{docs_build}}
+
+doctest:
+    uv run python -m doctest -v examples/wiki/wiki.py
+    uv run sphinx-build -E -b doctest {{sphinx_opts}} {{docs_build}}/doctest
+    uv run sphinx-build -b linkcheck {{sphinx_opts}} {{docs_build}}/linkcheck
+
+typing:
+    uv run mypy --install-types --non-interactive .