diff --git a/boefjes/.ci/docker-compose.yml b/boefjes/.ci/docker-compose.yml
index 407d1678336..bf7ee7aeadd 100644
--- a/boefjes/.ci/docker-compose.yml
+++ b/boefjes/.ci/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     command: sh -c 'python -m pytest -v tests/integration'
     depends_on:
       - ci_katalogus-db
+      - ci_katalogus
     env_file:
       - .ci/.env.test
     volumes:
@@ -84,7 +85,7 @@ services:
       - .ci/.env.test
 
   ci_xtdb:
-    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.0.8"
+    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.1.0"
 
   ci_octopoes_api_worker:
     build:
@@ -103,8 +104,15 @@ services:
         hard: 262144
 
   ci_katalogus:
-    image: "docker.io/wiremock/wiremock:2.34.0"
-    volumes:
-      - .ci/wiremock:/home/wiremock
+    build:
+      context: ..
+      dockerfile: boefjes/Dockerfile
+      args:
+        - ENVIRONMENT=dev
+    command: uvicorn boefjes.katalogus.root:app --host 0.0.0.0 --port 8080
+    depends_on:
+      - ci_katalogus-db
     env_file:
       - .ci/.env.test
+    volumes:
+      - .:/app/boefjes
diff --git a/boefjes/.ci/wiremock/mappings/organisations.json b/boefjes/.ci/wiremock/mappings/organisations.json
deleted file mode 100644
index 13124e6222f..00000000000
--- a/boefjes/.ci/wiremock/mappings/organisations.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "request": {
-    "method": "GET",
-    "url": "/v1/organisations"
-  },
-  "response": {
-    "status": 200,
-    "jsonBody": {
-      "_dev": {
-        "id": "_dev",
-        "name": "Development Organisation"
-      }
-    }
-  }
-}
diff --git a/boefjes/boefjes/api.py b/boefjes/boefjes/api.py
index 72ac9ccc96c..8209a14f991 100644
--- a/boefjes/boefjes/api.py
+++ b/boefjes/boefjes/api.py
@@ -2,6 +2,7 @@
 import multiprocessing
 from datetime import datetime, timezone
 from enum import Enum
+from multiprocessing.context import ForkContext, ForkProcess
 from uuid import UUID
 
 import structlog
@@ -13,18 +14,20 @@
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.clients.scheduler_client import SchedulerAPIClient, TaskStatus
 from boefjes.config import settings
+from boefjes.dependencies.plugins import PluginService, get_plugin_service
 from boefjes.job_handler import get_environment_settings, get_octopoes_api_connector
 from boefjes.job_models import BoefjeMeta
-from boefjes.local_repository import LocalPluginRepository, get_local_repository
+from boefjes.models import PluginType
 from boefjes.plugins.models import _default_mime_types
 from octopoes.models import Reference
 from octopoes.models.exception import ObjectNotFoundException
 
 app = FastAPI(title="Boefje API")
 logger = structlog.get_logger(__name__)
+ctx: ForkContext = multiprocessing.get_context("fork")
 
 
-class UvicornServer(multiprocessing.Process):
+class UvicornServer(ForkProcess):
     def __init__(self, config: Config):
         super().__init__()
         self.server = Server(config=config)
@@ -58,7 +61,7 @@ class StatusEnum(str, Enum):
 
 class File(BaseModel):
     name: str | None = None
-    content: str = Field(..., contentEncoding="base64")
+    content: str = Field(json_schema_extra={"contentEncoding": "base64"})
     tags: list[str] | None = None
 
 
@@ -88,14 +91,15 @@ async def root():
 def boefje_input(
     task_id: UUID,
     scheduler_client: SchedulerAPIClient = Depends(get_scheduler_client),
-    local_repository: LocalPluginRepository = Depends(get_local_repository),
+    plugin_service: PluginService = Depends(get_plugin_service),
 ):
     task = get_task(task_id, scheduler_client)
 
     if task.status is not TaskStatus.RUNNING:
         raise HTTPException(status_code=403, detail="Task does not have status running")
 
-    boefje_meta = create_boefje_meta(task, local_repository)
+    plugin = plugin_service.by_plugin_id(task.data.boefje.id, task.data.organization)
+    boefje_meta = create_boefje_meta(task, plugin)
 
     output_url = str(settings.api).rstrip("/") + f"/api/v0/tasks/{task_id}"
     return BoefjeInput(task_id=task_id, output_url=output_url, boefje_meta=boefje_meta)
@@ -107,14 +111,15 @@ def boefje_output(
     boefje_output: BoefjeOutput,
     scheduler_client: SchedulerAPIClient = Depends(get_scheduler_client),
     bytes_client: BytesAPIClient = Depends(get_bytes_client),
-    local_repository: LocalPluginRepository = Depends(get_local_repository),
+    plugin_service: PluginService = Depends(get_plugin_service),
 ):
     task = get_task(task_id, scheduler_client)
 
     if task.status is not TaskStatus.RUNNING:
         raise HTTPException(status_code=403, detail="Task does not have status running")
 
-    boefje_meta = create_boefje_meta(task, local_repository)
+    plugin = plugin_service.by_plugin_id(task.data.boefje.id, task.data.organization)
+    boefje_meta = create_boefje_meta(task, plugin)
     boefje_meta.started_at = task.modified_at
     boefje_meta.ended_at = datetime.now(timezone.utc)
 
@@ -122,7 +127,7 @@ def boefje_output(
     bytes_client.save_boefje_meta(boefje_meta)
 
     if boefje_output.files:
-        mime_types = _default_mime_types(task.data.boefje)
+        mime_types = _default_mime_types(boefje_meta.boefje)
         for file in boefje_output.files:
             raw = base64.b64decode(file.content)
             # when supported, also save file.name to Bytes
@@ -148,15 +153,10 @@ def get_task(task_id, scheduler_client):
     return task
 
 
-def create_boefje_meta(task, local_repository):
-    boefje = task.data.boefje
-    boefje_resource = local_repository.by_id(boefje.id)
-    env_keys = boefje_resource.environment_keys
-    environment = get_environment_settings(task.data, env_keys) if env_keys else {}
-
+def create_boefje_meta(task, plugin: PluginType) -> BoefjeMeta:
     organization = task.data.organization
     input_ooi = task.data.input_ooi
-    arguments = {"oci_arguments": boefje_resource.oci_arguments}
+    arguments = {"oci_arguments": plugin.oci_arguments}
 
     if input_ooi:
         reference = Reference.from_str(input_ooi)
@@ -169,10 +169,10 @@ def create_boefje_meta(task, local_repository):
 
     boefje_meta = BoefjeMeta(
         id=task.id,
-        boefje=boefje,
+        boefje=task.data.boefje,
         input_ooi=input_ooi,
         arguments=arguments,
         organization=organization,
-        environment=environment,
+        environment=get_environment_settings(task.data, plugin.boefje_schema),
     )
     return boefje_meta
diff --git a/boefjes/boefjes/app.py b/boefjes/boefjes/app.py
index 731cbd7e19c..15c3fd2376b 100644
--- a/boefjes/boefjes/app.py
+++ b/boefjes/boefjes/app.py
@@ -1,22 +1,30 @@
-import multiprocessing as mp
+import multiprocessing
 import os
 import signal
 import sys
 import time
+from multiprocessing.context import ForkContext
+from multiprocessing.process import BaseProcess
 from queue import Queue
 
 import structlog
 from httpx import HTTPError
 from pydantic import ValidationError
+from sqlalchemy.orm import sessionmaker
 
 from boefjes.clients.scheduler_client import SchedulerAPIClient, SchedulerClientInterface, Task, TaskStatus
 from boefjes.config import Settings
+from boefjes.dependencies.plugins import PluginService
 from boefjes.job_handler import BoefjeHandler, NormalizerHandler, bytes_api_client
 from boefjes.local import LocalBoefjeJobRunner, LocalNormalizerJobRunner
 from boefjes.local_repository import get_local_repository
 from boefjes.runtime_interfaces import Handler, WorkerManager
+from boefjes.sql.config_storage import create_config_storage
+from boefjes.sql.db import get_engine
+from boefjes.sql.plugin_storage import create_plugin_storage
 
 logger = structlog.get_logger(__name__)
+ctx: ForkContext = multiprocessing.get_context("fork")
 
 
 class SchedulerWorkerManager(WorkerManager):
@@ -31,11 +39,11 @@ def __init__(
         self.scheduler_client = scheduler_client
         self.settings = settings
 
-        manager = mp.Manager()
+        manager = ctx.Manager()
 
         self.task_queue = manager.Queue()  # multiprocessing.Queue() will not work on macOS, see mp.Queue.qsize()
         self.handling_tasks = manager.dict()
-        self.workers: list[mp.Process] = []
+        self.workers: list[BaseProcess] = []
 
         logger.setLevel(log_level)
 
@@ -45,13 +53,13 @@ def run(self, queue_type: WorkerManager.Queue) -> None:
         logger.info("Created worker pool for queue '%s'", queue_type.value)
 
         self.workers = [
-            mp.Process(target=_start_working, args=self._worker_args()) for _ in range(self.settings.pool_size)
+            ctx.Process(target=_start_working, args=self._worker_args()) for _ in range(self.settings.pool_size)
         ]
         for worker in self.workers:
             worker.start()
 
-        signal.signal(signal.SIGINT, lambda signum, _: self.exit(queue_type, signum))
-        signal.signal(signal.SIGTERM, lambda signum, _: self.exit(queue_type, signum))
+        signal.signal(signal.SIGINT, lambda signum, _: self.exit(signum))
+        signal.signal(signal.SIGTERM, lambda signum, _: self.exit(signum))
 
         while True:
             try:
@@ -68,7 +76,7 @@ def run(self, queue_type: WorkerManager.Queue) -> None:
                 # been called yet.
                 if not self.exited:
                     logger.exception("Exiting worker...")
-                    self.exit(queue_type)
+                    self.exit()
 
                 raise
 
@@ -93,18 +101,18 @@ def _fill_queue(self, task_queue: Queue, queue_type: WorkerManager.Queue):
 
         all_queues_empty = True
 
-        for queue_type in queues:
-            logger.debug("Popping from queue %s", queue_type.id)
+        for queue in queues:
+            logger.debug("Popping from queue %s", queue.id)
 
             try:
-                p_item = self.scheduler_client.pop_item(queue_type.id)
+                p_item = self.scheduler_client.pop_item(queue.id)
             except (HTTPError, ValidationError):
                 logger.exception("Popping task from scheduler failed, sleeping 10 seconds")
                 time.sleep(10)
                 continue
 
             if not p_item:
-                logger.debug("Queue %s empty", queue_type.id)
+                logger.debug("Queue %s empty", queue.id)
                 continue
 
             all_queues_empty = False
@@ -153,13 +161,13 @@ def _check_workers(self) -> None:
                 self._cleanup_pending_worker_task(worker)
                 worker.close()
 
-            new_worker = mp.Process(target=_start_working, args=self._worker_args())
+            new_worker = ctx.Process(target=_start_working, args=self._worker_args())
             new_worker.start()
             new_workers.append(new_worker)
 
         self.workers = new_workers
 
-    def _cleanup_pending_worker_task(self, worker: mp.Process) -> None:
+    def _cleanup_pending_worker_task(self, worker: BaseProcess) -> None:
         if worker.pid not in self.handling_tasks:
             logger.debug("No pending task found for Worker[pid=%s, %s]", worker.pid, _format_exit_code(worker.exitcode))
             return
@@ -169,7 +177,7 @@ def _cleanup_pending_worker_task(self, worker: mp.Process) -> None:
         try:
             task = self.scheduler_client.get_task(handling_task_id)
 
-            if task.status is TaskStatus.DISPATCHED:
+            if task.status is TaskStatus.DISPATCHED or task.status is TaskStatus.RUNNING:
                 try:
                     self.scheduler_client.patch_task(task.id, TaskStatus.FAILED)
                     logger.warning("Set status to failed in the scheduler for task[id=%s]", handling_task_id)
@@ -181,7 +189,7 @@ def _cleanup_pending_worker_task(self, worker: mp.Process) -> None:
     def _worker_args(self) -> tuple:
         return self.task_queue, self.item_handler, self.scheduler_client, self.handling_tasks
 
-    def exit(self, queue_type: WorkerManager.Queue, signum: int | None = None):
+    def exit(self, signum: int | None = None):
         try:
             if signum:
                 logger.info("Received %s, exiting", signal.Signals(signum).name)
@@ -191,7 +199,7 @@ def exit(self, queue_type: WorkerManager.Queue, signum: int | None = None):
 
                 for p_item in items:
                     try:
-                        self.scheduler_client.push_item(queue_type.value, p_item)
+                        self.scheduler_client.push_item(p_item)
                     except HTTPError:
                         logger.exception("Rescheduling task failed[id=%s]", p_item.id)
 
@@ -226,7 +234,7 @@ def _format_exit_code(exitcode: int | None) -> str:
 
 
 def _start_working(
-    task_queue: mp.Queue,
+    task_queue: multiprocessing.Queue,
     handler: Handler,
     scheduler_client: SchedulerClientInterface,
     handling_tasks: dict[int, str],
@@ -239,6 +247,7 @@ def _start_working(
         handling_tasks[os.getpid()] = str(p_item.id)
 
         try:
+            scheduler_client.patch_task(p_item.id, TaskStatus.RUNNING)
             handler.handle(p_item.data)
             status = TaskStatus.COMPLETED
         except Exception:  # noqa
@@ -248,17 +257,27 @@ def _start_working(
             raise
         finally:
             try:
-                scheduler_client.patch_task(p_item.id, status)  # Note: implicitly, we have p_item.id == task_id
-                logger.info("Set status to %s in the scheduler for task[id=%s]", status, p_item.data.id)
+                if scheduler_client.get_task(p_item.id).status == TaskStatus.RUNNING:
+                    # The docker runner could have handled this already
+                    scheduler_client.patch_task(p_item.id, status)  # Note that implicitly, we have p_item.id == task_id
+                    logger.info("Set status to %s in the scheduler for task[id=%s]", status, p_item.data.id)
             except HTTPError:
                 logger.exception("Could not patch scheduler task to %s", status.value)
 
 
 def get_runtime_manager(settings: Settings, queue: WorkerManager.Queue, log_level: str) -> WorkerManager:
     local_repository = get_local_repository()
+
+    session = sessionmaker(bind=get_engine())()
+    plugin_service = PluginService(
+        create_plugin_storage(session),
+        create_config_storage(session),
+        local_repository,
+    )
+
     item_handler: Handler
     if queue is WorkerManager.Queue.BOEFJES:
-        item_handler = BoefjeHandler(LocalBoefjeJobRunner(local_repository), local_repository, bytes_api_client)
+        item_handler = BoefjeHandler(LocalBoefjeJobRunner(local_repository), plugin_service, bytes_api_client)
     else:
         item_handler = NormalizerHandler(
             LocalNormalizerJobRunner(local_repository), bytes_api_client, settings.scan_profile_whitelist
diff --git a/boefjes/boefjes/clients/bytes_client.py b/boefjes/boefjes/clients/bytes_client.py
index c2698523183..b96369065c1 100644
--- a/boefjes/boefjes/clients/bytes_client.py
+++ b/boefjes/boefjes/clients/bytes_client.py
@@ -1,5 +1,6 @@
 import typing
 import uuid
+from base64 import b64encode
 from collections.abc import Callable, Set
 from functools import wraps
 from typing import Any
@@ -73,7 +74,7 @@ def _get_token(self) -> str:
 
     @retry_with_login
     def save_boefje_meta(self, boefje_meta: BoefjeMeta) -> None:
-        response = self._session.post("/bytes/boefje_meta", content=boefje_meta.json(), headers=self.headers)
+        response = self._session.post("/bytes/boefje_meta", content=boefje_meta.model_dump_json(), headers=self.headers)
 
         self._verify_response(response)
 
@@ -86,7 +87,9 @@ def get_boefje_meta(self, boefje_meta_id: str) -> BoefjeMeta:
 
     @retry_with_login
     def save_normalizer_meta(self, normalizer_meta: NormalizerMeta) -> None:
-        response = self._session.post("/bytes/normalizer_meta", content=normalizer_meta.json(), headers=self.headers)
+        response = self._session.post(
+            "/bytes/normalizer_meta", content=normalizer_meta.model_dump_json(), headers=self.headers
+        )
 
         self._verify_response(response)
 
@@ -99,17 +102,25 @@ def get_normalizer_meta(self, normalizer_meta_id: uuid.UUID) -> NormalizerMeta:
 
     @retry_with_login
     def save_raw(self, boefje_meta_id: str, raw: str | bytes, mime_types: Set[str] = frozenset()) -> UUID:
-        headers = {"content-type": "application/octet-stream"}
-        headers.update(self.headers)
+        file_name = "raw"  # The name provides a key for all ids returned, so this is arbitrary as we only upload 1 file
+
         response = self._session.post(
             "/bytes/raw",
-            content=raw,
-            headers=headers,
-            params={"mime_types": list(mime_types), "boefje_meta_id": boefje_meta_id},
+            json={
+                "files": [
+                    {
+                        "name": file_name,
+                        "content": b64encode(raw if isinstance(raw, bytes) else raw.encode()).decode(),
+                        "tags": list(mime_types),
+                    }
+                ]
+            },
+            headers=self.headers,
+            params={"boefje_meta_id": str(boefje_meta_id)},
         )
-
         self._verify_response(response)
-        return UUID(response.json()["id"])
+
+        return UUID(response.json()[file_name])
 
     @retry_with_login
     def get_raw(self, raw_data_id: str) -> bytes:
diff --git a/boefjes/boefjes/clients/scheduler_client.py b/boefjes/boefjes/clients/scheduler_client.py
index 5e07d83d0be..bb342001475 100644
--- a/boefjes/boefjes/clients/scheduler_client.py
+++ b/boefjes/boefjes/clients/scheduler_client.py
@@ -42,7 +42,7 @@ class SchedulerClientInterface:
     def get_queues(self) -> list[Queue]:
         raise NotImplementedError()
 
-    def pop_item(self, queue: str) -> Task | None:
+    def pop_item(self, queue_id: str) -> Task | None:
         raise NotImplementedError()
 
     def patch_task(self, task_id: uuid.UUID, status: TaskStatus) -> None:
@@ -51,7 +51,7 @@ def patch_task(self, task_id: uuid.UUID, status: TaskStatus) -> None:
     def get_task(self, task_id: uuid.UUID) -> Task:
         raise NotImplementedError()
 
-    def push_item(self, queue_id: str, p_item: Task) -> None:
+    def push_item(self, p_item: Task) -> None:
         raise NotImplementedError()
 
 
@@ -69,14 +69,14 @@ def get_queues(self) -> list[Queue]:
 
         return TypeAdapter(list[Queue]).validate_json(response.content)
 
-    def pop_item(self, queue: str) -> Task | None:
-        response = self._session.post(f"/queues/{queue}/pop")
+    def pop_item(self, queue_id: str) -> Task | None:
+        response = self._session.post(f"/queues/{queue_id}/pop")
         self._verify_response(response)
 
         return TypeAdapter(Task | None).validate_json(response.content)
 
-    def push_item(self, queue_id: str, p_item: Task) -> None:
-        response = self._session.post(f"/queues/{queue_id}/push", content=p_item.json())
+    def push_item(self, p_item: Task) -> None:
+        response = self._session.post(f"/queues/{p_item.scheduler_id}/push", content=p_item.model_dump_json())
         self._verify_response(response)
 
     def patch_task(self, task_id: uuid.UUID, status: TaskStatus) -> None:
diff --git a/boefjes/boefjes/dependencies/plugins.py b/boefjes/boefjes/dependencies/plugins.py
index ccb3187c0e2..20dc9b7dc65 100644
--- a/boefjes/boefjes/dependencies/plugins.py
+++ b/boefjes/boefjes/dependencies/plugins.py
@@ -16,7 +16,8 @@
 from boefjes.sql.plugin_storage import create_plugin_storage
 from boefjes.storage.interfaces import (
     ConfigStorage,
-    ExistingPluginId,
+    DuplicatePlugin,
+    IntegrityError,
     NotFound,
     PluginNotFound,
     PluginStorage,
@@ -98,7 +99,7 @@ def clone_settings_to_organisation(self, from_organisation: str, to_organisation
             self.set_enabled_by_id(plugin_id, to_organisation, enabled=True)
 
     def upsert_settings(self, settings: dict, organisation_id: str, plugin_id: str):
-        self._assert_settings_match_schema(settings, organisation_id, plugin_id)
+        self._assert_settings_match_schema(settings, plugin_id)
         self._put_boefje(plugin_id)
 
         return self.config_storage.upsert(organisation_id, plugin_id, settings=settings)
@@ -106,30 +107,58 @@ def upsert_settings(self, settings: dict, organisation_id: str, plugin_id: str):
     def create_boefje(self, boefje: Boefje) -> None:
         try:
             self.local_repo.by_id(boefje.id)
-            raise ExistingPluginId(boefje.id)
+            raise DuplicatePlugin("id")
         except KeyError:
-            self.plugin_storage.create_boefje(boefje)
+            try:
+                plugin = self.local_repo.by_name(boefje.name)
+
+                if plugin.type == "boefje":
+                    raise DuplicatePlugin("name")
+                else:
+                    try:
+                        with self.plugin_storage as storage:
+                            storage.create_boefje(boefje)
+                    except IntegrityError as error:
+                        raise DuplicatePlugin(self._translate_duplicate_plugin(error.message))
+            except KeyError:
+                try:
+                    with self.plugin_storage as storage:
+                        storage.create_boefje(boefje)
+                except IntegrityError as error:
+                    raise DuplicatePlugin(self._translate_duplicate_plugin(error.message))
+
+    def _translate_duplicate_plugin(self, error_message):
+        translations = {"boefje_plugin_id": "id", "boefje_name": "name"}
+        return next((value for key, value in translations.items() if key in error_message), None)
 
     def create_normalizer(self, normalizer: Normalizer) -> None:
         try:
             self.local_repo.by_id(normalizer.id)
-            raise ExistingPluginId(normalizer.id)
+            raise DuplicatePlugin("id")
         except KeyError:
-            self.plugin_storage.create_normalizer(normalizer)
+            try:
+                plugin = self.local_repo.by_name(normalizer.name)
+
+                if plugin.types == "normalizer":
+                    raise DuplicatePlugin("name")
+                else:
+                    self.plugin_storage.create_normalizer(normalizer)
+            except KeyError:
+                self.plugin_storage.create_normalizer(normalizer)
 
     def _put_boefje(self, boefje_id: str) -> None:
         """Check existence of a boefje, and insert a database entry if it concerns a local boefje"""
 
         try:
             self.plugin_storage.boefje_by_id(boefje_id)
-        except PluginNotFound:
+        except PluginNotFound as e:
             try:
                 plugin = self.local_repo.by_id(boefje_id)
             except KeyError:
-                raise
+                raise e
 
             if plugin.type != "boefje":
-                raise
+                raise e
             self.plugin_storage.create_boefje(plugin)
 
     def _put_normalizer(self, normalizer_id: str) -> None:
@@ -150,18 +179,13 @@ def _put_normalizer(self, normalizer_id: str) -> None:
     def delete_settings(self, organisation_id: str, plugin_id: str):
         self.config_storage.delete(organisation_id, plugin_id)
 
-        try:
-            self._assert_settings_match_schema({}, organisation_id, plugin_id)
-        except SettingsNotConformingToSchema:
-            logger.warning("Making sure %s is disabled for %s because settings are deleted", plugin_id, organisation_id)
-
-            self.set_enabled_by_id(plugin_id, organisation_id, False)
+        # We don't check the schema anymore because we can provide entries through the global environment as well
 
     def schema(self, plugin_id: str) -> dict | None:
         try:
             boefje = self.plugin_storage.boefje_by_id(plugin_id)
 
-            return boefje.schema
+            return boefje.boefje_schema
         except PluginNotFound:
             return self.local_repo.schema(plugin_id)
 
@@ -184,9 +208,7 @@ def description(self, plugin_id: str, organisation_id: str) -> str:
             return ""
 
     def set_enabled_by_id(self, plugin_id: str, organisation_id: str, enabled: bool):
-        if enabled:
-            all_settings = self.get_all_settings(organisation_id, plugin_id)
-            self._assert_settings_match_schema(all_settings, organisation_id, plugin_id)
+        # We don't check the schema anymore because we can provide entries through the global environment as well
 
         try:
             self._put_boefje(plugin_id)
@@ -195,14 +217,14 @@ def set_enabled_by_id(self, plugin_id: str, organisation_id: str, enabled: bool)
 
         self.config_storage.upsert(organisation_id, plugin_id, enabled=enabled)
 
-    def _assert_settings_match_schema(self, all_settings: dict, organisation_id: str, plugin_id: str):
+    def _assert_settings_match_schema(self, all_settings: dict, plugin_id: str):
         schema = self.schema(plugin_id)
 
         if schema:  # No schema means that there is nothing to assert
             try:
                 validate(instance=all_settings, schema=schema)
             except ValidationError as e:
-                raise SettingsNotConformingToSchema(organisation_id, plugin_id, e.message) from e
+                raise SettingsNotConformingToSchema(plugin_id, e.message) from e
 
     def _set_plugin_enabled(self, plugin: PluginType, organisation_id: str) -> PluginType:
         with contextlib.suppress(KeyError, NotFound):
@@ -211,7 +233,7 @@ def _set_plugin_enabled(self, plugin: PluginType, organisation_id: str) -> Plugi
         return plugin
 
 
-def get_plugin_service(organisation_id: str) -> Iterator[PluginService]:
+def get_plugin_service() -> Iterator[PluginService]:
     def closure(session: Session):
         return PluginService(
             create_plugin_storage(session),
@@ -231,5 +253,6 @@ def get_plugins_filter_parameters(
     ids: list[str] | None = Query(None),
     plugin_type: Literal["boefje", "normalizer", "bit"] | None = None,
     state: bool | None = None,
+    oci_image: str | None = None,
 ) -> FilterParameters:
-    return FilterParameters(q=q, ids=ids, type=plugin_type, state=state)
+    return FilterParameters(q=q, ids=ids, type=plugin_type, state=state, oci_image=oci_image)
diff --git a/boefjes/boefjes/docker_boefjes_runner.py b/boefjes/boefjes/docker_boefjes_runner.py
index f28c64055ae..fd5527acdf8 100644
--- a/boefjes/boefjes/docker_boefjes_runner.py
+++ b/boefjes/boefjes/docker_boefjes_runner.py
@@ -36,7 +36,6 @@ def run(self) -> None:
         stderr_mime_types = boefjes.plugins.models._default_mime_types(self.boefje_meta.boefje)
 
         task_id = self.boefje_meta.id
-        self.scheduler_client.patch_task(task_id, TaskStatus.RUNNING)
         self.boefje_meta.started_at = datetime.now(timezone.utc)
 
         try:
@@ -63,7 +62,11 @@ def run(self) -> None:
                 # have to raise exception to prevent _start_working function from setting status to completed
                 raise RuntimeError("Boefje did not call output API endpoint")
         except ContainerError as e:
-            logger.exception("Container error")
+            logger.error(
+                "Container for task %s failed and returned exit status %d, stderr saved to bytes",
+                task_id,
+                e.exit_status,
+            )
 
             # save container log (stderr) to bytes
             self.bytes_api_client.login()
@@ -75,9 +78,9 @@ def run(self) -> None:
                 logger.error("Failed to save boefje meta to bytes, continuing anyway")
             self.bytes_api_client.save_raw(task_id, e.stderr, stderr_mime_types)
             self.scheduler_client.patch_task(task_id, TaskStatus.FAILED)
-            # have to raise exception to prevent _start_working function from setting status to completed
-            raise e
-        except (APIError, ImageNotFound) as e:
-            logger.exception("API error or image not found")
+        except ImageNotFound:
+            logger.error("Docker image %s not found", self.boefje_resource.oci_image)
+            self.scheduler_client.patch_task(task_id, TaskStatus.FAILED)
+        except APIError as e:
+            logger.error("Docker API error: %s", e)
             self.scheduler_client.patch_task(task_id, TaskStatus.FAILED)
-            raise e
diff --git a/boefjes/boefjes/job_handler.py b/boefjes/boefjes/job_handler.py
index a7e0d4feca1..038842a4090 100644
--- a/boefjes/boefjes/job_handler.py
+++ b/boefjes/boefjes/job_handler.py
@@ -7,14 +7,17 @@
 import httpx
 import structlog
 from httpx import HTTPError
+from jsonschema.exceptions import ValidationError
+from jsonschema.validators import validate
 
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.config import settings
+from boefjes.dependencies.plugins import PluginService
 from boefjes.docker_boefjes_runner import DockerBoefjesRunner
 from boefjes.job_models import BoefjeMeta, NormalizerMeta
-from boefjes.local_repository import LocalPluginRepository
 from boefjes.plugins.models import _default_mime_types
 from boefjes.runtime_interfaces import BoefjeJobRunner, Handler, NormalizerJobRunner
+from boefjes.storage.interfaces import SettingsNotConformingToSchema
 from octopoes.api.models import Affirmation, Declaration, Observation
 from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.models import Reference, ScanLevel
@@ -35,7 +38,7 @@ def get_octopoes_api_connector(org_code: str) -> OctopoesAPIConnector:
     return OctopoesAPIConnector(str(settings.octopoes_api), org_code)
 
 
-def get_environment_settings(boefje_meta: BoefjeMeta, environment_keys: list[str]) -> dict[str, str]:
+def get_environment_settings(boefje_meta: BoefjeMeta, schema: dict | None = None) -> dict[str, str]:
     try:
         katalogus_api = str(settings.katalogus_api).rstrip("/")
         response = httpx.get(
@@ -43,47 +46,63 @@ def get_environment_settings(boefje_meta: BoefjeMeta, environment_keys: list[str
             timeout=30,
         )
         response.raise_for_status()
-        environment = response.json()
-
-        # Add prefixed BOEFJE_* global environment variables
-        for key, value in os.environ.items():
-            if key.startswith("BOEFJE_"):
-                katalogus_key = key.split("BOEFJE_", 1)[1]
-                # Only pass the environment variable if it is not explicitly set through the katalogus,
-                # if and only if they are defined in boefje.json
-                if katalogus_key in environment_keys and katalogus_key not in environment:
-                    environment[katalogus_key] = value
-
-        return {k: str(v) for k, v in environment.items() if k in environment_keys}
     except HTTPError:
         logger.exception("Error getting environment settings")
         raise
 
+    allowed_keys = schema.get("properties", []) if schema else []
+    new_env = {
+        key.split("BOEFJE_", 1)[1]: value
+        for key, value in os.environ.items()
+        if key.startswith("BOEFJE_") and key in allowed_keys
+    }
+
+    settings_from_katalogus = response.json()
+
+    for key, value in settings_from_katalogus.items():
+        if key in allowed_keys:
+            new_env[key] = value
+
+    # The schema, besides dictating that a boefje cannot run if it is not matched, also provides an extra safeguard:
+    # it is possible to inject code if arguments are passed that "escape" the call to a tool. Hence, we should enforce
+    # the schema somewhere and make the schema as strict as possible.
+    if schema is not None:
+        try:
+            validate(instance=new_env, schema=schema)
+        except ValidationError as e:
+            raise SettingsNotConformingToSchema(boefje_meta.boefje.id, e.message) from e
+
+    return new_env
+
 
 class BoefjeHandler(Handler):
     def __init__(
         self,
         job_runner: BoefjeJobRunner,
-        local_repository: LocalPluginRepository,
+        plugin_service: PluginService,
         bytes_client: BytesAPIClient,
     ):
         self.job_runner = job_runner
-        self.local_repository = local_repository
+        self.plugin_service = plugin_service
         self.bytes_client = bytes_client
 
     def handle(self, boefje_meta: BoefjeMeta) -> None:
         logger.info("Handling boefje %s[task_id=%s]", boefje_meta.boefje.id, str(boefje_meta.id))
 
         # Check if this boefje is container-native, if so, continue using the Docker boefjes runner
-        boefje_resource = self.local_repository.by_id(boefje_meta.boefje.id)
-        if boefje_resource.oci_image:
+        plugin = self.plugin_service.by_plugin_id(boefje_meta.boefje.id, boefje_meta.organization)
+
+        if plugin.type != "boefje":
+            raise ValueError("Plugin id does not belong to a boefje")
+
+        if plugin.oci_image:
             logger.info(
                 "Delegating boefje %s[task_id=%s] to Docker runner with OCI image [%s]",
                 boefje_meta.boefje.id,
                 str(boefje_meta.id),
-                boefje_resource.oci_image,
+                plugin.oci_image,
             )
-            docker_runner = DockerBoefjesRunner(boefje_resource, boefje_meta)
+            docker_runner = DockerBoefjesRunner(plugin, boefje_meta)
             return docker_runner.run()
 
         if boefje_meta.input_ooi:
@@ -97,18 +116,14 @@ def handle(self, boefje_meta: BoefjeMeta) -> None:
 
             boefje_meta.arguments["input"] = ooi.serialize()
 
-        env_keys = boefje_resource.environment_keys
-
-        boefje_meta.runnable_hash = boefje_resource.runnable_hash
-        boefje_meta.environment = get_environment_settings(boefje_meta, env_keys) if env_keys else {}
-
-        mime_types = _default_mime_types(boefje_meta.boefje)
+        boefje_meta.runnable_hash = plugin.runnable_hash
+        boefje_meta.environment = get_environment_settings(boefje_meta, plugin.boefje_schema)
 
         logger.info("Starting boefje %s[%s]", boefje_meta.boefje.id, str(boefje_meta.id))
 
         boefje_meta.started_at = datetime.now(timezone.utc)
 
-        boefje_results: list[tuple[set, bytes | str]]
+        boefje_results: list[tuple[set, bytes | str]] = []
 
         try:
             boefje_results = self.job_runner.run(boefje_meta, boefje_meta.environment)
@@ -135,7 +150,9 @@ def handle(self, boefje_meta: BoefjeMeta) -> None:
                             )
                         else:
                             valid_mimetypes.add(mimetype)
-                    raw_file_id = self.bytes_client.save_raw(boefje_meta.id, output, mime_types.union(valid_mimetypes))
+                    raw_file_id = self.bytes_client.save_raw(
+                        boefje_meta.id, output, _default_mime_types(boefje_meta.boefje).union(valid_mimetypes)
+                    )
                     logger.info(
                         "Saved raw file %s for boefje %s[%s]", raw_file_id, boefje_meta.boefje.id, boefje_meta.id
                     )
@@ -209,6 +226,23 @@ def handle(self, normalizer_meta: NormalizerMeta) -> None:
                     )
                 )
 
+            if (
+                normalizer_meta.raw_data.boefje_meta.input_ooi  # No input OOI means no deletion propagation
+                and not (results.observations or results.declarations or results.affirmations)
+            ):
+                # There were no results found, which we still need to signal to Octopoes for deletion propagation
+
+                connector.save_observation(
+                    Observation(
+                        method=normalizer_meta.normalizer.id,
+                        source=Reference.from_str(normalizer_meta.raw_data.boefje_meta.input_ooi),
+                        source_method=normalizer_meta.raw_data.boefje_meta.boefje.id,
+                        task_id=normalizer_meta.id,
+                        valid_time=normalizer_meta.raw_data.boefje_meta.ended_at,
+                        result=[],
+                    )
+                )
+
             corrected_scan_profiles = []
             for profile in results.scan_profiles:
                 profile.level = ScanLevel(
diff --git a/boefjes/boefjes/katalogus/plugins.py b/boefjes/boefjes/katalogus/plugins.py
index 134243ad963..87065119feb 100644
--- a/boefjes/boefjes/katalogus/plugins.py
+++ b/boefjes/boefjes/katalogus/plugins.py
@@ -1,8 +1,11 @@
 import datetime
 from functools import partial
 
+import structlog
+from croniter import croniter
 from fastapi import APIRouter, Body, Depends, HTTPException, status
 from fastapi.responses import FileResponse, JSONResponse, Response
+from jsonschema.exceptions import SchemaError
 from jsonschema.validators import Draft202012Validator
 from pydantic import BaseModel, Field, field_validator
 
@@ -15,7 +18,7 @@
 from boefjes.katalogus.organisations import check_organisation_exists
 from boefjes.models import FilterParameters, PaginationParameters, PluginType
 from boefjes.sql.plugin_storage import get_plugin_storage
-from boefjes.storage.interfaces import PluginStorage
+from boefjes.storage.interfaces import DuplicatePlugin, IntegrityError, NotAllowed, PluginStorage
 
 router = APIRouter(
     prefix="/organisations/{organisation_id}",
@@ -23,6 +26,8 @@
     dependencies=[Depends(check_organisation_exists)],
 )
 
+logger = structlog.get_logger(__name__)
+
 
 # check if query matches plugin id, name or description
 def _plugin_matches_query(plugin: PluginType, query: str) -> bool:
@@ -65,6 +70,10 @@ def list_plugins(
     if filter_params.state is not None:
         plugins = filter(lambda x: x.enabled is filter_params.state, plugins)
 
+    # filter plugins by oci_image
+    if filter_params.oci_image is not None:
+        plugins = filter(lambda x: x.type == "boefje" and x.oci_image == filter_params.oci_image, plugins)
+
     # filter plugins by scan level for boefje plugins
     plugins = list(filter(lambda x: x.type != "boefje" or x.scan_level >= filter_params.scan_level, plugins))
 
@@ -90,14 +99,17 @@ def get_plugin(
 
 @router.post("/plugins", status_code=status.HTTP_201_CREATED)
 def add_plugin(plugin: PluginType, plugin_service: PluginService = Depends(get_plugin_service)):
-    with plugin_service as service:
-        plugin.static = False  # Creation through the API implies that these cannot be static
+    try:
+        with plugin_service as service:
+            plugin.static = False  # Creation through the API implies that these cannot be static
 
-        if plugin.type == "boefje":
-            return service.create_boefje(plugin)
+            if plugin.type == "boefje":
+                return service.create_boefje(plugin)
 
-        if plugin.type == "normalizer":
-            return service.create_normalizer(plugin)
+            if plugin.type == "normalizer":
+                return service.create_normalizer(plugin)
+    except DuplicatePlugin as error:
+        raise HTTPException(status.HTTP_400_BAD_REQUEST, error.message)
 
     raise HTTPException(status.HTTP_400_BAD_REQUEST, "Creation of Bits is not supported")
 
@@ -123,22 +135,33 @@ class BoefjeIn(BaseModel):
     version: str | None = None
     created: datetime.datetime | None = None
     description: str | None = None
-    environment_keys: list[str] = Field(default_factory=list)
     scan_level: int = 1
     consumes: set[str] = Field(default_factory=set)
     produces: set[str] = Field(default_factory=set)
-    schema: dict | None = None
+    boefje_schema: dict | None = None
+    cron: str | None = None
+    interval: int | None = None
     oci_image: str | None = None
     oci_arguments: list[str] = Field(default_factory=list)
 
-    @field_validator("schema")
+    @field_validator("boefje_schema")
     @classmethod
     def json_schema_valid(cls, schema: dict | None) -> dict | None:
         if schema is not None:
-            Draft202012Validator.check_schema(schema)
-            return schema
+            try:
+                Draft202012Validator.check_schema(schema)
+            except SchemaError as e:
+                raise ValueError("The schema field is not a valid JSON schema") from e
+
+        return schema
 
-        return None
+    @field_validator("cron")
+    @classmethod
+    def cron_valid(cls, cron: str | None) -> str | None:
+        if cron is not None:
+            croniter(cron)  # Raises a ValueError
+
+        return cron
 
 
 @router.patch("/boefjes/{boefje_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -147,8 +170,15 @@ def update_boefje(
     boefje: BoefjeIn,
     storage: PluginStorage = Depends(get_plugin_storage),
 ):
-    with storage as p:
-        p.update_boefje(boefje_id, boefje.model_dump(exclude_unset=True))
+    # todo: update boefje should be done in the plugin service
+    try:
+        with storage as p:
+            try:
+                p.update_boefje(boefje_id, boefje.model_dump(exclude_unset=True))
+            except NotAllowed:
+                raise HTTPException(status.HTTP_403_FORBIDDEN, "Updating a static plugin is not allowed")
+    except IntegrityError as error:
+        raise HTTPException(status.HTTP_400_BAD_REQUEST, error.message)
 
 
 @router.delete("/boefjes/{boefje_id}", status_code=status.HTTP_204_NO_CONTENT)
@@ -167,7 +197,6 @@ class NormalizerIn(BaseModel):
     version: str | None = None
     created: datetime.datetime | None = None
     description: str | None = None
-    environment_keys: list[str] = Field(default_factory=list)
     consumes: list[str] = Field(default_factory=list)  # mime types (and/ or boefjes)
     produces: list[str] = Field(default_factory=list)  # oois
 
diff --git a/boefjes/boefjes/katalogus/root.py b/boefjes/boefjes/katalogus/root.py
index 8aa0c1683c5..771adffb945 100644
--- a/boefjes/boefjes/katalogus/root.py
+++ b/boefjes/boefjes/katalogus/root.py
@@ -5,7 +5,6 @@
 import structlog
 from fastapi import APIRouter, FastAPI, Request, status
 from fastapi.responses import JSONResponse, RedirectResponse
-from jsonschema.exceptions import SchemaError
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
 from opentelemetry.instrumentation.fastapi import FastAPIInstrumentor
@@ -20,7 +19,7 @@
 from boefjes.katalogus import organisations, plugins
 from boefjes.katalogus import settings as settings_router
 from boefjes.katalogus.version import __version__
-from boefjes.storage.interfaces import NotAllowed, NotFound, StorageError
+from boefjes.storage.interfaces import IntegrityError, NotAllowed, NotFound, StorageError
 
 with settings.log_cfg.open() as f:
     logging.config.dictConfig(json.load(f))
@@ -89,19 +88,19 @@ def not_allowed_handler(request: Request, exc: NotAllowed):
     )
 
 
-@app.exception_handler(StorageError)
-def storage_error_handler(request: Request, exc: StorageError):
+@app.exception_handler(IntegrityError)
+def integrity_error_handler(request: Request, exc: IntegrityError):
     return JSONResponse(
-        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        status_code=status.HTTP_400_BAD_REQUEST,
         content={"message": exc.message},
     )
 
 
-@app.exception_handler(SchemaError)
-def schema_error_handler(request: Request, exc: StorageError):
+@app.exception_handler(StorageError)
+def storage_error_handler(request: Request, exc: StorageError):
     return JSONResponse(
-        status_code=status.HTTP_400_BAD_REQUEST,
-        content={"message": "Invalid jsonschema provided"},
+        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        content={"message": exc.message},
     )
 
 
diff --git a/boefjes/boefjes/local_repository.py b/boefjes/boefjes/local_repository.py
index a29fb92ba35..719b26f06a8 100644
--- a/boefjes/boefjes/local_repository.py
+++ b/boefjes/boefjes/local_repository.py
@@ -47,6 +47,19 @@ def by_id(self, plugin_id: str) -> PluginType:
 
         raise KeyError(f"Can't find plugin {plugin_id}")
 
+    def by_name(self, plugin_name: str) -> PluginType:
+        boefjes = {resource.boefje.name: resource for resource in self.resolve_boefjes().values()}
+
+        if plugin_name in boefjes:
+            return boefjes[plugin_name].boefje
+
+        normalizers = {resource.normalizer.name: resource for resource in self.resolve_normalizers().values()}
+
+        if plugin_name in normalizers:
+            return normalizers[plugin_name].normalizer
+
+        raise KeyError(f"Can't find plugin {plugin_name}")
+
     def schema(self, id_: str) -> dict | None:
         boefjes = self.resolve_boefjes()
 
diff --git a/boefjes/boefjes/logging.json b/boefjes/boefjes/logging.json
index 5ab07731cae..489c18d9681 100644
--- a/boefjes/boefjes/logging.json
+++ b/boefjes/boefjes/logging.json
@@ -3,8 +3,7 @@
   "disable_existing_loggers": 0,
   "formatters": {
     "default": {
-      "format": "%(asctime)s [%(process)d] [%(levelname)s] [%(module)s] %(message)s",
-      "datefmt": "[%Y-%m-%d %H:%M:%S %z]"
+      "format": "%(message)s"
     }
   },
   "handlers": {
diff --git a/boefjes/boefjes/migrations/versions/5be152459a7b_introduce_schema_field_to_boefje_model.py b/boefjes/boefjes/migrations/versions/5be152459a7b_introduce_schema_field_to_boefje_model.py
index 2cd63145aa5..470385e1879 100644
--- a/boefjes/boefjes/migrations/versions/5be152459a7b_introduce_schema_field_to_boefje_model.py
+++ b/boefjes/boefjes/migrations/versions/5be152459a7b_introduce_schema_field_to_boefje_model.py
@@ -10,11 +10,9 @@
 
 import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy import text
 
 from boefjes.local_repository import get_local_repository
-from boefjes.sql.plugin_storage import create_plugin_storage
-from boefjes.storage.interfaces import PluginNotFound
 
 # revision identifiers, used by Alembic.
 revision = "5be152459a7b"
@@ -30,29 +28,21 @@ def upgrade() -> None:
     op.add_column("boefje", sa.Column("schema", sa.JSON(), nullable=True))
 
     local_repo = get_local_repository()
-    session = sessionmaker(bind=op.get_bind())()
+    connection = op.get_bind()
 
-    with create_plugin_storage(session) as storage:
+    with connection.begin():
         plugins = local_repo.get_all()
         logger.info("Found %s plugins", len(plugins))
 
         for plugin in local_repo.get_all():
             schema = local_repo.schema(plugin.id)
-
             if schema:
-                try:
-                    # This way we avoid the safeguard that updating static boefjes is not allowed
-                    instance = storage._db_boefje_instance_by_id(plugin.id)
-                    instance.schema = schema
-                    storage.session.add(instance)
-                    logger.info("Updated database entry for plugin %s", plugin.id)
-                except PluginNotFound:
-                    logger.info("No database entry for plugin %s", plugin.id)
-                    continue
+                query = text("UPDATE boefje SET schema = :schema WHERE plugin_id = :plugin_id")  # noqa: S608
+                connection.execute(query, {"schema": schema, "plugin_id": plugin.id})
+                logger.info("Updated any database entries for plugin %s", plugin.id)
             else:
                 logger.info("No schema present for plugin %s", plugin.id)
 
-    session.close()
     # ### end Alembic commands ###
 
 
diff --git a/boefjes/boefjes/migrations/versions/870fc302b852_remove_environment_keys_field.py b/boefjes/boefjes/migrations/versions/870fc302b852_remove_environment_keys_field.py
new file mode 100644
index 00000000000..7bdfbd9e024
--- /dev/null
+++ b/boefjes/boefjes/migrations/versions/870fc302b852_remove_environment_keys_field.py
@@ -0,0 +1,37 @@
+"""Remove environment keys field
+
+Revision ID: 870fc302b852
+Revises: 5be152459a7b
+Create Date: 2024-08-20 06:08:20.943924
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "870fc302b852"
+down_revision = "5be152459a7b"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("boefje", "environment_keys")
+    op.drop_column("normalizer", "environment_keys")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "normalizer",
+        sa.Column("environment_keys", postgresql.ARRAY(sa.VARCHAR(length=128)), autoincrement=False, nullable=False),
+    )
+    op.add_column(
+        "boefje",
+        sa.Column("environment_keys", postgresql.ARRAY(sa.VARCHAR(length=128)), autoincrement=False, nullable=False),
+    )
+    # ### end Alembic commands ###
diff --git a/boefjes/boefjes/migrations/versions/9f48560b0000_add_schedule_interval_fields.py b/boefjes/boefjes/migrations/versions/9f48560b0000_add_schedule_interval_fields.py
new file mode 100644
index 00000000000..901020b2f65
--- /dev/null
+++ b/boefjes/boefjes/migrations/versions/9f48560b0000_add_schedule_interval_fields.py
@@ -0,0 +1,30 @@
+"""Add cron field
+
+Revision ID: 9f48560b0000
+Revises: 870fc302b852
+Create Date: 2024-09-18 13:12:40.926394
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "9f48560b0000"
+down_revision = "a2c8d54b0124"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column("boefje", sa.Column("cron", sa.String(length=128), nullable=True))
+    op.add_column("boefje", sa.Column("interval", sa.Integer(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("boefje", "interval")
+    op.drop_column("boefje", "cron")
+    # ### end Alembic commands ###
diff --git a/boefjes/boefjes/migrations/versions/a2c8d54b0124_unique_plugin_names.py b/boefjes/boefjes/migrations/versions/a2c8d54b0124_unique_plugin_names.py
new file mode 100644
index 00000000000..84759f49cff
--- /dev/null
+++ b/boefjes/boefjes/migrations/versions/a2c8d54b0124_unique_plugin_names.py
@@ -0,0 +1,29 @@
+"""Unique plugin names
+
+Revision ID: a2c8d54b0124
+Revises: 870fc302b852
+Create Date: 2024-09-18 14:46:00.881022
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "a2c8d54b0124"
+down_revision = "870fc302b852"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_unique_constraint("unique_boefje_name", "boefje", ["name"])
+    op.create_unique_constraint("unique_normalizer_name", "normalizer", ["name"])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint("unique_normalizer_name", "normalizer", type_="unique")
+    op.drop_constraint("unique_boefje_name", "boefje", type_="unique")
+    # ### end Alembic commands ###
diff --git a/boefjes/boefjes/migrations/versions/f9de6eb7824b_introduce_boefjeconfig_model.py b/boefjes/boefjes/migrations/versions/f9de6eb7824b_introduce_boefjeconfig_model.py
index 40a44d504d3..d46f360b703 100644
--- a/boefjes/boefjes/migrations/versions/f9de6eb7824b_introduce_boefjeconfig_model.py
+++ b/boefjes/boefjes/migrations/versions/f9de6eb7824b_introduce_boefjeconfig_model.py
@@ -95,7 +95,7 @@ def upgrade() -> None:
             str(boefje.scan_level),
             list(boefje.consumes),
             list(boefje.produces),
-            boefje.environment_keys,
+            ["TEST_KEY"],
             boefje.oci_image,
             boefje.oci_arguments,
             boefje.version,
@@ -137,7 +137,7 @@ def upgrade() -> None:
             str(boefje.scan_level),
             list(boefje.consumes),
             list(boefje.produces),
-            boefje.environment_keys,
+            ["TEST_KEY"],
             boefje.oci_image,
             boefje.oci_arguments,
             boefje.version,
@@ -177,7 +177,7 @@ def upgrade() -> None:
             normalizer.description,
             normalizer.consumes,
             normalizer.produces,
-            normalizer.environment_keys,
+            ["TEST_KEY"],
             normalizer.version,
         )
         for normalizer in normalizers_to_insert
diff --git a/boefjes/boefjes/models.py b/boefjes/boefjes/models.py
index 4881b26008a..752de2aa298 100644
--- a/boefjes/boefjes/models.py
+++ b/boefjes/boefjes/models.py
@@ -2,6 +2,8 @@
 from enum import Enum
 from typing import Literal
 
+from croniter import croniter
+from jsonschema.exceptions import SchemaError
 from jsonschema.validators import Draft202012Validator
 from pydantic import BaseModel, Field, field_validator
 
@@ -13,11 +15,10 @@ class Organisation(BaseModel):
 
 class Plugin(BaseModel):
     id: str
-    name: str | None = None
+    name: str
     version: str | None = None
     created: datetime.datetime | None = None
     description: str | None = None
-    environment_keys: list[str] = Field(default_factory=list)
     enabled: bool = False
     static: bool = True  # We need to differentiate between local and remote plugins to know which ones can be deleted
 
@@ -30,17 +31,31 @@ class Boefje(Plugin):
     scan_level: int = 1
     consumes: set[str] = Field(default_factory=set)
     produces: set[str] = Field(default_factory=set)
-    schema: dict | None = None
+    boefje_schema: dict | None = None
+    cron: str | None = None
+    interval: int | None = None
     runnable_hash: str | None = None
     oci_image: str | None = None
     oci_arguments: list[str] = Field(default_factory=list)
 
-    @field_validator("schema")
+    @field_validator("boefje_schema")
     @classmethod
     def json_schema_valid(cls, schema: dict) -> dict:
         if schema is not None:
-            Draft202012Validator.check_schema(schema)
-            return schema
+            try:
+                Draft202012Validator.check_schema(schema)
+            except SchemaError as e:
+                raise ValueError("The schema field is not a valid JSON schema") from e
+
+        return schema
+
+    @field_validator("cron")
+    @classmethod
+    def cron_valid(cls, cron: str | None) -> str | None:
+        if cron is not None:
+            croniter(cron)  # Raises a ValueError
+
+        return cron
 
     class Config:
         validate_assignment = True
@@ -80,3 +95,4 @@ class FilterParameters(BaseModel):
     ids: list[str] | None = None
     state: bool | None = None
     scan_level: int = 0
+    oci_image: str | None = None
diff --git a/boefjes/boefjes/plugins/kat_adr_validator/normalizer.json b/boefjes/boefjes/plugins/kat_adr_validator/normalizer.json
index f840cded2ad..d342474d1e8 100644
--- a/boefjes/boefjes/plugins/kat_adr_validator/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_adr_validator/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "adr-validator-normalize",
   "name": "API Design Rules validator",
-  "description": "TODO",
+  "description": "Parses and validates the API Design Rules (ADR). https://www.forumstandaardisatie.nl/open-standaarden/rest-api-design-rules",
   "consumes": [
     "boefje/adr-validator"
   ],
diff --git a/boefjes/boefjes/plugins/kat_answer_parser/normalizer.json b/boefjes/boefjes/plugins/kat_answer_parser/normalizer.json
index 922b333697f..e10ab9a92c6 100644
--- a/boefjes/boefjes/plugins/kat_answer_parser/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_answer_parser/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_answer_parser",
   "name": "Answer Parser",
-  "description": "Parses the answers from Config objects.",
+  "description": "Parses the answers from 'Config' objects. Config OOIs are used when your policies and objects need different treatment from the usual setup.",
   "consumes": [
     "answer"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/boefje.json b/boefjes/boefjes/plugins/kat_binaryedge/boefje.json
index 9dc2a85d8fb..e7d90e4ee98 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/boefje.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/boefje.json
@@ -6,8 +6,5 @@
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "BINARYEDGE_API"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/containers/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/containers/normalizer.json
index 086ce350160..288b50127c7 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/containers/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/containers/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_containers",
   "name": "BinaryEdge containers",
+  "description": "Parse BinaryEdge data to check if Kubernetes hosts have any vulnerabilities. Creates 'VERIFIED-VULNERABILITY' findings.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/databases/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/databases/normalizer.json
index 2af3f47f891..d2336234281 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/databases/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/databases/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_databases",
   "name": "BinaryEdge databases",
+  "description": "Parses BinaryEdge data to check if any Cassandra, ElasticSearch, Memcached, MongoDB and Redis servers are identified and parses the version number. Create 'EXPOSED-SOFTWARE' findings.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/http_web/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/http_web/normalizer.json
index f5cafc7560a..03f77c3fe73 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/http_web/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/http_web/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_http_web",
   "name": "BinaryEdge Websites",
+  "description": "Parses BinaryEdge data to check for AWS secrets, F5 BIG IP loadbalancers and Citrix NetScaler.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/message_queues/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/message_queues/normalizer.json
index caa59b56f4b..3953e6f9b13 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/message_queues/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/message_queues/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_message_queues",
   "name": "BinaryEdge message queues",
+  "description": "Parses BinaryEdge data to check for message queues (mqtt) servers. Creates the finding 'EXPOSED-SOFTWARE' if mqtt servers are found.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/protocols/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/protocols/normalizer.json
index 30d0f02963e..f6e89f9fb3d 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/protocols/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/protocols/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_protocols",
-  "name": "BinaryEdge protocols",
+  "name": "BinaryEdge SSL/TLS protocols",
+  "description": "Parses BinaryEdge data to check for various vulnerabilities within SSL/TLS protocols, such as Heartbleed, Secure Renegotiation and SSL Compression.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/remote_desktop/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/remote_desktop/normalizer.json
index 80e1837a499..5cc15031b65 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/remote_desktop/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/remote_desktop/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_remote_desktop",
   "name": "Binary Edge remote desktop",
+  "description": "Parses BinaryEdge data to check for remote desktop services such as RDP, VNC and X11. Creates 'EXPOSED-SOFTWARE' findings.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/service_identification/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/service_identification/normalizer.json
index d451a79b150..dc92d458b6c 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/service_identification/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/service_identification/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_service_identification",
   "name": "BinaryEdge service identification",
+  "description": "Parses BinaryEdge data to check if Software is present that is known for malware.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_binaryedge/services/normalizer.json b/boefjes/boefjes/plugins/kat_binaryedge/services/normalizer.json
index 57a0f8dac16..89b0b22c057 100644
--- a/boefjes/boefjes/plugins/kat_binaryedge/services/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_binaryedge/services/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_binaryedge_services",
   "name": "BinaryEdge services",
+  "description": "Parses BinaryEdge data to check for services such as SSH, rsync, FTP, telnet and SMB.",
   "consumes": [
     "boefje/binaryedge"
   ],
diff --git a/boefjes/boefjes/plugins/kat_burpsuite/normalize.py b/boefjes/boefjes/plugins/kat_burpsuite/normalize.py
index a476695d471..e938e150578 100644
--- a/boefjes/boefjes/plugins/kat_burpsuite/normalize.py
+++ b/boefjes/boefjes/plugins/kat_burpsuite/normalize.py
@@ -7,7 +7,6 @@
 from defusedxml import minidom
 
 from boefjes.job_models import NormalizerOutput
-from octopoes.models import Reference
 from octopoes.models.ooi.dns.zone import Hostname
 from octopoes.models.ooi.findings import CAPECFindingType, CVEFindingType, CWEFindingType, Finding
 from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, Protocol
@@ -15,16 +14,22 @@
 from octopoes.models.ooi.web import URL, HostnameHTTPURL, HTTPHeader, HTTPResource, IPAddressHTTPURL, WebScheme, Website
 
 
+def find_network(data: dict) -> dict:
+    if "network" in data:
+        return data["network"]
+    for key, value in data.items():
+        if isinstance(value, dict):
+            result = find_network(value)
+            if result is not None:
+                return result
+    # Return internet if network is not found
+    return {"name": "internet"}
+
+
 def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
-    parser = minidom.parse(raw)
-
-    # assume that input ooi is none or a HostnameHTTPURL
-    if input_ooi:
-        ooi = Reference.from_str(input_ooi["primary_key"])
-        network = Network(name=ooi.tokenized.netloc.network.name)
-    else:
-        network = Network(name="internet")
-        yield network
+    parser = minidom.parseString(raw.decode("UTF-8"))
+
+    network = Network(name=find_network(input_ooi).get("name", "internet"))
 
     tcp_protocol = Protocol.TCP
 
diff --git a/boefjes/boefjes/plugins/kat_censys/boefje.json b/boefjes/boefjes/plugins/kat_censys/boefje.json
index 6aadac16fba..034d79a0034 100644
--- a/boefjes/boefjes/plugins/kat_censys/boefje.json
+++ b/boefjes/boefjes/plugins/kat_censys/boefje.json
@@ -1,14 +1,10 @@
 {
   "id": "censys",
   "name": "Censys",
-  "description": "Use Censys to discover open ports, services and certificates. Requires and API key.",
+  "description": "Use Censys to discover open ports, services and certificates. Requires an API key.",
   "consumes": [
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "CENSYS_API_ID",
-    "CENSYS_API_SECRET"
-  ],
   "scan_level": 1
 }
diff --git a/boefjes/boefjes/plugins/kat_censys/normalizer.json b/boefjes/boefjes/plugins/kat_censys/normalizer.json
index 809fc7d7174..c160577458c 100644
--- a/boefjes/boefjes/plugins/kat_censys/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_censys/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_censys_normalize",
   "name": "Censys",
+  "description": "Parses Cencys data into objects that can be used by other boefjes and normalizers. Can create ports, certificates, software, websites and headers. Doesn't create findings.",
   "consumes": [
     "boefje/censys"
   ],
diff --git a/boefjes/boefjes/plugins/kat_cve_finding_types/boefje.json b/boefjes/boefjes/plugins/kat_cve_finding_types/boefje.json
index 280ea27e565..ee0be42b6e5 100644
--- a/boefjes/boefjes/plugins/kat_cve_finding_types/boefje.json
+++ b/boefjes/boefjes/plugins/kat_cve_finding_types/boefje.json
@@ -1,13 +1,10 @@
 {
   "id": "cve-finding-types",
   "name": "CVE Finding Types",
-  "description": "Hydrate information of Common Vulnerabilities and Exposures (CVE) finding types from the CVE API",
+  "description": "Hydrate information of Common Vulnerabilities and Exposures (CVE) finding types from the CVE API.",
   "consumes": [
     "CVEFindingType"
   ],
-  "environment_keys": [
-    "CVEAPI_URL"
-  ],
   "scan_level": 0,
   "enabled": true
 }
diff --git a/boefjes/boefjes/plugins/kat_cve_finding_types/normalizer.json b/boefjes/boefjes/plugins/kat_cve_finding_types/normalizer.json
index 6ae5590562d..31d217e7658 100644
--- a/boefjes/boefjes/plugins/kat_cve_finding_types/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_cve_finding_types/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_cve_finding_types_normalize",
   "name": "CVE finding types",
-  "description": "Parses CVE findings.",
+  "description": "Parses Common Vulnerability Exposures (CVE) into findings.",
   "consumes": [
     "boefje/cve-finding-types"
   ],
diff --git a/boefjes/boefjes/plugins/kat_cwe_finding_types/boefje.json b/boefjes/boefjes/plugins/kat_cwe_finding_types/boefje.json
index abeeaa7d9d0..edcc6cae7c7 100644
--- a/boefjes/boefjes/plugins/kat_cwe_finding_types/boefje.json
+++ b/boefjes/boefjes/plugins/kat_cwe_finding_types/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "cwe-finding-types",
   "name": "CWE Finding Types",
-  "description": "Hydrate information of Common Weakness Enumeration (CWE) finding types",
+  "description": "Hydrate information of Common Weakness Enumeration (CWE) finding types.",
   "consumes": [
     "CWEFindingType"
   ],
diff --git a/boefjes/boefjes/plugins/kat_cwe_finding_types/normalizer.json b/boefjes/boefjes/plugins/kat_cwe_finding_types/normalizer.json
index 9b939d07df5..2b97ac2d404 100644
--- a/boefjes/boefjes/plugins/kat_cwe_finding_types/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_cwe_finding_types/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_cwe_finding_types_normalize",
   "name": "CWE finding",
-  "description": "Parses CWE findings.",
+  "description": "Parses Common Weakness Enumeration (CWE) into findings.",
   "consumes": [
     "boefje/cwe-finding-types"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dicom/normalizer.json b/boefjes/boefjes/plugins/kat_dicom/normalizer.json
index 74519e6e96c..f829c80bced 100644
--- a/boefjes/boefjes/plugins/kat_dicom/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_dicom/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_dicom_normalize",
   "name": "DICOM servers",
-  "description": "Parses DICOM output into findings and identified software.",
+  "description": "Parses medical imaging data (DICOM) into findings and identified software.",
   "consumes": [
     "boefje/dicom"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dns/boefje.json b/boefjes/boefjes/plugins/kat_dns/boefje.json
index 53391f0155d..5773364b9b6 100644
--- a/boefjes/boefjes/plugins/kat_dns/boefje.json
+++ b/boefjes/boefjes/plugins/kat_dns/boefje.json
@@ -5,9 +5,5 @@
   "consumes": [
     "Hostname"
   ],
-  "environment_keys": [
-    "RECORD_TYPES",
-    "REMOTE_NS"
-  ],
   "scan_level": 1
 }
diff --git a/boefjes/boefjes/plugins/kat_dns/normalizer.json b/boefjes/boefjes/plugins/kat_dns/normalizer.json
index fa9c8a73fa6..a534d08e04b 100644
--- a/boefjes/boefjes/plugins/kat_dns/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_dns/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_dns_normalize",
   "name": "DNS records",
-  "description": "Parses the DNS records.",
+  "description": "Parses DNS records. Can parse A, AAAA, CAA, CNAME, MX, NS, SOA, TXT, DKIM and DMARC data.",
   "consumes": [
     "boefje/dns-records"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dns_version/normalizer.json b/boefjes/boefjes/plugins/kat_dns_version/normalizer.json
index 0252c4fe250..1ee372c81f5 100644
--- a/boefjes/boefjes/plugins/kat_dns_version/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_dns_version/normalizer.json
@@ -1,5 +1,7 @@
 {
   "id": "dns-bind-version-normalize",
+  "name": "DNS bind version normalizer",
+  "description": "Parses DNS Bind data into Software version objects.",
   "consumes": [
     "boefje/dns-bind-version"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dns_zone/boefje.json b/boefjes/boefjes/plugins/kat_dns_zone/boefje.json
index cc03e079bd1..04fd37c4826 100644
--- a/boefjes/boefjes/plugins/kat_dns_zone/boefje.json
+++ b/boefjes/boefjes/plugins/kat_dns_zone/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "dns-zone",
   "name": "DNS zone",
-  "description": "Fetch the parent DNS zone of a DNS zone",
+  "description": "Fetch the parent DNS zone of a DNS zone.",
   "consumes": [
     "DNSZone"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dnssec/boefje.json b/boefjes/boefjes/plugins/kat_dnssec/boefje.json
index 8b4d156396e..a772cbb6cf0 100644
--- a/boefjes/boefjes/plugins/kat_dnssec/boefje.json
+++ b/boefjes/boefjes/plugins/kat_dnssec/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "dns-sec",
   "name": "DNSSEC",
-  "description": "Validates DNSSec of a hostname",
+  "description": "Validates DNSSEC of a hostname by checking the cryptographic signatures.",
   "consumes": [
     "Hostname"
   ],
diff --git a/boefjes/boefjes/plugins/kat_dnssec/main.py b/boefjes/boefjes/plugins/kat_dnssec/main.py
index 3c1b93328a0..950225b1829 100644
--- a/boefjes/boefjes/plugins/kat_dnssec/main.py
+++ b/boefjes/boefjes/plugins/kat_dnssec/main.py
@@ -17,4 +17,4 @@ def run(boefje_meta: dict):
     cmd = ["/usr/bin/drill", "-DT", domain]
     output = subprocess.run(cmd, capture_output=True)
 
-    return [(set(), output.stdout)]
+    return [({"openkat/dnssec-output"}, output.stdout)]
diff --git a/boefjes/boefjes/plugins/kat_dnssec/normalizer.json b/boefjes/boefjes/plugins/kat_dnssec/normalizer.json
index 670f16592f4..7a605294fc9 100644
--- a/boefjes/boefjes/plugins/kat_dnssec/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_dnssec/normalizer.json
@@ -3,7 +3,8 @@
   "name": "DNS records",
   "description": "Parses DNSSEC data into findings.",
   "consumes": [
-    "boefje/dns-sec"
+    "boefje/dns-sec",
+    "openkat/dnssec-output"
   ],
   "produces": [
     "KATFindingType",
diff --git a/boefjes/boefjes/plugins/kat_external_db/boefje.json b/boefjes/boefjes/plugins/kat_external_db/boefje.json
index 4de34b597ac..da2043f7db9 100644
--- a/boefjes/boefjes/plugins/kat_external_db/boefje.json
+++ b/boefjes/boefjes/plugins/kat_external_db/boefje.json
@@ -1,16 +1,9 @@
 {
   "id": "external_db",
   "name": "External database host fetcher",
-  "description": "Fetch hostnames and IP addresses/netblocks from an external database with API. See `description.md` for more information. Useful if you have a large network.",
+  "description": "Fetch hostnames and IP addresses/netblocks from an external database with API. See `description.md` for more information. Useful if you have a large network and wish to add all your hosts. You can also upload hosts through the CSV upload functionality.",
   "consumes": [
     "Network"
   ],
-  "environment_keys": [
-    "DB_URL",
-    "DB_ACCESS_TOKEN",
-    "DB_ORGANIZATION_IDENTIFIER",
-    "DB_ENDPOINT_FORMAT",
-    "REQUESTS_CA_BUNDLE"
-  ],
   "scan_level": 0
 }
diff --git a/boefjes/boefjes/plugins/kat_external_db/normalizer.json b/boefjes/boefjes/plugins/kat_external_db/normalizer.json
index 2d9e72d56e9..9988c541f68 100644
--- a/boefjes/boefjes/plugins/kat_external_db/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_external_db/normalizer.json
@@ -1,7 +1,7 @@
 {
   "id": "kat_external_db_normalize",
   "name": "External database hosts fetcher",
-  "description": "Parse data the fetched host data from the external database into hostnames and IP-addresses.",
+  "description": "Parse the fetched host data from the external database into hostnames and IP-addresses.",
   "consumes": [
     "boefje/external_db"
   ],
diff --git a/boefjes/boefjes/plugins/kat_fierce/boefje.json b/boefjes/boefjes/plugins/kat_fierce/boefje.json
index 1f7d5c677db..9e1ab8182ef 100644
--- a/boefjes/boefjes/plugins/kat_fierce/boefje.json
+++ b/boefjes/boefjes/plugins/kat_fierce/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "fierce",
   "name": "Fierce",
-  "description": "Perform DNS reconnaissance using Fierce, to help locate non-contiguous IP space and hostnames against specified hostnames. No exploitation is performed.",
+  "description": "Perform DNS reconnaissance using Fierce. Helps to locate non-contiguous IP space and hostnames against specified hostnames. No exploitation is performed.",
   "consumes": [
     "Hostname"
   ],
diff --git a/boefjes/boefjes/plugins/kat_finding_normalizer/normalizer.json b/boefjes/boefjes/plugins/kat_finding_normalizer/normalizer.json
index 70adfd46c47..2acc3c9c210 100644
--- a/boefjes/boefjes/plugins/kat_finding_normalizer/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_finding_normalizer/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_generic_finding_normalize",
   "name": "Finding types",
+  "description": "Parses data to create (CVE) Findings.",
   "consumes": [
     "openkat/finding"
   ],
diff --git a/boefjes/boefjes/plugins/kat_green_hosting/normalizer.json b/boefjes/boefjes/plugins/kat_green_hosting/normalizer.json
index 92434280db5..714628e5587 100644
--- a/boefjes/boefjes/plugins/kat_green_hosting/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_green_hosting/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_green_hosting_normalize",
   "description": "Parses the Green Hosting output into findings.",
+  "name": "Green Hosting",
   "consumes": [
     "boefje/green-hosting"
   ],
diff --git a/boefjes/boefjes/plugins/kat_kat_finding_types/boefje.json b/boefjes/boefjes/plugins/kat_kat_finding_types/boefje.json
index 559724289f9..e653f45622d 100644
--- a/boefjes/boefjes/plugins/kat_kat_finding_types/boefje.json
+++ b/boefjes/boefjes/plugins/kat_kat_finding_types/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "kat-finding-types",
   "name": "KAT Finding Types",
-  "description": "Hydrate information of KAT finding types",
+  "description": "Hydrate information of KAT finding types.",
   "consumes": [
     "KATFindingType"
   ],
diff --git a/boefjes/boefjes/plugins/kat_kat_finding_types/kat_finding_types.json b/boefjes/boefjes/plugins/kat_kat_finding_types/kat_finding_types.json
index 23ec1b70da7..a23c8d04f2f 100644
--- a/boefjes/boefjes/plugins/kat_kat_finding_types/kat_finding_types.json
+++ b/boefjes/boefjes/plugins/kat_kat_finding_types/kat_finding_types.json
@@ -13,14 +13,14 @@
     "impact": "The usage possibility of JavaScript is not limited by the website. If the website contains a cross-site scripting vulnerability, then JavaScript code can be injected into the web page. This code is then executed by the browser of the victim. If a well-established Content Security Policy is active, the attacker can inject JavaScript code into the browser of the victim, but then the code will not get executed by the browser. A good configured Content Security Policy is a strong protection against cross-site scripting vulnerabilities.",
     "recommendation": "1. Set the Content-Security-Policy HTTP header in all HTTP answers. 2. Make sure that when the Content Security Policy is violated by a browser, that this violation is logged and monitored. Point the content security violation variable report-uri to a server-side log script. 3. Implement a process that periodically analyses these logs for programming errors and hack attacks."
   },
-  "KAT-NO-X-PERMITTED-CROSS-DOMAIN-POLICIES": {
+  "KAT-X-PERMITTED-CROSS-DOMAIN-POLICIES": {
     "description": "The HTTP header X-Permitted-Cross-Domain- Policies is missing in HTTP responses. This header is not officially supported by Mozilla MDN.",
     "source": "https://owasp.org/www-project-secure-headers/#div-headers",
     "risk": "recommendation",
     "impact": "When the value of this header is not set to master- only, Adobe Flash or Adobe Acrobat (and possibly other software) can also look at cross-domain configuration files hosted at the web server.",
     "recommendation": "This header is not supported by default by Mozilla. If this header is required for your environment: Set the HTTP header X-Permitted-Cross- Domain-Policies: none in all HTTP responses. Use value master-only if a Flash or Acrobat cross- domain configuration file is used that is placed in the root of the web server"
   },
-  "KAT-NO-EXPLICIT-XSS-PROTECTION": {
+  "KAT-EXPLICIT-XSS-PROTECTION": {
     "description": "The 'X-XSS-Protection' header is a deprecated header previously used to prevent against Cross-Site-Scripting attacks. Support in modern browsers could introduce XSS attacks again.",
     "source": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-XSS-Protection",
     "risk": "recommendation",
@@ -34,14 +34,14 @@
     "impact": "There is a change that clickjacking is possible. This is an attack technique in which the website is invisibly loaded. On top of the original website, another malicious website is loaded that contains specially placed buttons or links. When the victim clicks on those buttons or links, the mouse click and thus its corresponding action is performed on the original website (which is made invisible). If the victim is logged in, then this click can perform an unauthorized action.",
     "recommendation": "1. Set the HTTP header <c>X-Frame- Options</c> with value deny (safest) or sameorigin in every HTTP answer for older browsers. 2. Set the frame-ancestors variable in the Content-Security-Policy header for modern browsers. 3. Add JavaScript code to all pages to ensure that these web pages may not be loaded within an <iframe>. In this manner also very old browsers are protected that do not support the HTTP header X-Frame-Options."
   },
-  "KAT-NO-X-DNS-PREFETCH-CONTROL": {
+  "KAT-X-DNS-PREFETCH-CONTROL": {
     "description": "This is a non-standard header. The HTTP header X-DNS-Prefetch-Control is missing. The X-DNS-Prefetch-Control HTTP response header controls DNS prefetching, a feature by which browsers proactively perform domain name resolution on both links that the user may choose to follow as well as URLs for items referenced by the document.",
     "source": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-DNS-Prefetch-Control",
     "risk": "recommendation",
     "impact": "This header not production ready and thus not officially supported by Mozilla MDN.",
     "recommendation": "If support is required: Set the HTTP header to: `X-DNS-Prefetch-Control: off` in all HTTP answers."
   },
-  "KAT-NO-EXCPECT-CT": {
+  "KAT-EXCPECT-CT": {
     "description": "The 'Expect-CT' header is deprecated. The Expect-CT header allowed sites to opt in to reporting and/or enforcement of Certificate Transparency requirements. This header is not supported by common browsers, as certificate transparency is now a standard functionality.",
     "source": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Expect-CT",
     "risk": "recommendation",
@@ -419,7 +419,7 @@
     "impact": "An attacker using your hosting provider may setup a virtual host for your domain and thus intercept and trick users.",
     "recommendation": "To prevent subdomain takeover, organizations should regularly monitor their DNS records to identify and remove any unused subdomains. Additionally, they should ensure that all subdomains are properly configured and point to valid services."
   },
-  "EXPOSED-PANELS": {
+  "EXPOSED-ADMIN-PANELS": {
     "description": "Exposed login panels for services can pose security risks as they can be targeted by malicious actors for brute-force attacks, phishing attempts, and other forms of unauthorized access.",
     "source": "https://resources.infosecinstitute.com/topics/application-security/dangers-web-management/",
     "risk": "recommendation",
@@ -463,6 +463,7 @@
   },
   "KAT-INVALID-RPKI": {
     "description": "A route announcement that is matched by the published Route Policy and Authorization (RPKI) is invalid",
+    "source": "https://blog.cloudflare.com/rpki/",
     "risk": "medium",
     "impact": "Without RPKI validation, your servers might be more vulnerable to unintended or malicious routing configuration errors, potentially leading to inaccessibility of your servers or interception of internet traffic directed to them.",
     "recommendation": "Make sure that the Route Origin Authorizations (ROAs) that specify which Autonomous Systems (AS) are authorized to announce your IP addresses are valid and not expired."
@@ -476,6 +477,7 @@
   },
   "KAT-DISALLOWED-DOMAIN-IN-CSP": {
     "description": "This CSP header contains domains that are not allowed, If the website contains a cross-site scripting vulnerability, then JavaScript code can be injected into the web page hosted on these domains which can host files for anyone.",
+    "source": "https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP",
     "risk": "medium",
     "impact": "Disallowed domains are domains that are for example 'world writable', this opens up the possibility for an atacker to host malicious files on a csp whitelisted domain.",
     "recommendation": "Remove the offending hostname from the CSP header."
@@ -486,5 +488,19 @@
     "source": "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers",
     "impact": "Nonstandard headers may not be supported by all browsers and may not provide the security that is expected.",
     "recommendation": "Remove the nonstandard headers from the response."
+  },
+  "KAT-DOMAIN-OWNERSHIP-PENDING": {
+    "description": "The domain requires Ownership verification. An email has been sent to the registered owner by the registrar. The domain is currently offline.",
+    "risk": "high",
+    "source": "https://www.icann.org/resources/pages/contact-verification-2013-05-03-en",
+    "impact": "Domain points to placeholder DNS-Servers, and is offline for regular use.",
+    "recommendation": "Verify ownership by following the emailed link."
+  },
+  "KAT-SOFTWARE-VERSION-NOT-FOUND": {
+    "description": "The version of the software is not found.",
+    "risk": "recommendation",
+    "source": "Check the version of the host manually.",
+    "impact": "Unknown. The server may or may not be vulnerable. OpenKAT is not able to determine the version.",
+    "recommendation": "Verify manually if the software is up to date as OpenKAT is not able to determine the software version ."
   }
 }
diff --git a/boefjes/boefjes/plugins/kat_kat_finding_types/normalizer.json b/boefjes/boefjes/plugins/kat_kat_finding_types/normalizer.json
index fc0516ed23e..81130efc8f7 100644
--- a/boefjes/boefjes/plugins/kat_kat_finding_types/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_kat_finding_types/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "kat_kat_finding_types_normalize",
+  "name": "KAT finding types",
   "description": "Parses KAT finding types.",
   "consumes": [
     "boefje/kat-finding-types"
diff --git a/boefjes/boefjes/plugins/kat_leakix/boefje.json b/boefjes/boefjes/plugins/kat_leakix/boefje.json
index 6bbc19c76ee..173f1b3169d 100644
--- a/boefjes/boefjes/plugins/kat_leakix/boefje.json
+++ b/boefjes/boefjes/plugins/kat_leakix/boefje.json
@@ -7,8 +7,5 @@
     "IPAddressV6",
     "Hostname"
   ],
-  "environment_keys": [
-    "LEAKIX_API"
-  ],
   "scan_level": 1
 }
diff --git a/boefjes/boefjes/plugins/kat_log4shell/boefje.json b/boefjes/boefjes/plugins/kat_log4shell/boefje.json
index 1841a2c6d9a..40a9b6e9991 100644
--- a/boefjes/boefjes/plugins/kat_log4shell/boefje.json
+++ b/boefjes/boefjes/plugins/kat_log4shell/boefje.json
@@ -5,8 +5,5 @@
   "consumes": [
     "Hostname"
   ],
-  "environment_keys": [
-    "REPLY_FQDN"
-  ],
   "scan_level": 4
 }
diff --git a/boefjes/boefjes/plugins/kat_manual/csv/normalizer.json b/boefjes/boefjes/plugins/kat_manual/csv/normalizer.json
index e20641f2459..fa44dd9b9d5 100644
--- a/boefjes/boefjes/plugins/kat_manual/csv/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_manual/csv/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_manual_csv",
   "name": "Manual CSV",
+  "description": "Parses uploaded CSV files into objects.",
   "consumes": [
     "manual/csv"
   ],
diff --git a/boefjes/boefjes/plugins/kat_manual/single_ooi/normalizer.json b/boefjes/boefjes/plugins/kat_manual/single_ooi/normalizer.json
index 193deac6cda..cda7b5d8b97 100644
--- a/boefjes/boefjes/plugins/kat_manual/single_ooi/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_manual/single_ooi/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "kat_manual_ooi",
+  "name": "Manual OOI normalizer",
   "consumes": [
     "manual/ooi"
   ],
diff --git a/boefjes/boefjes/plugins/kat_masscan/boefje.json b/boefjes/boefjes/plugins/kat_masscan/boefje.json
index b0681d7ba2a..6456bb5d8bf 100644
--- a/boefjes/boefjes/plugins/kat_masscan/boefje.json
+++ b/boefjes/boefjes/plugins/kat_masscan/boefje.json
@@ -1,13 +1,9 @@
 {
   "id": "masscan",
   "name": "masscan",
-  "description": "Quickly scan large amounts of IPs.",
+  "description": "Quickly scan large amounts of IPs. Due to the quick scanning it may not always show accurate results.",
   "consumes": [
     "IPV4NetBlock"
   ],
-  "environment_keys": [
-    "PORTS",
-    "MAX_RATE"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_maxmind_geoip/boefje.json b/boefjes/boefjes/plugins/kat_maxmind_geoip/boefje.json
index bd0386c9c20..eaeae4d2095 100644
--- a/boefjes/boefjes/plugins/kat_maxmind_geoip/boefje.json
+++ b/boefjes/boefjes/plugins/kat_maxmind_geoip/boefje.json
@@ -6,9 +6,5 @@
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "scan_level": 1,
-  "environment_keys": [
-    "MAXMIND_USER_ID",
-    "MAXMIND_LICENCE_KEY"
-  ]
+  "scan_level": 1
 }
diff --git a/boefjes/boefjes/plugins/kat_nmap_ip_range/boefje.json b/boefjes/boefjes/plugins/kat_nmap_ip_range/boefje.json
index 4b4dc1a2d06..a266db549ae 100644
--- a/boefjes/boefjes/plugins/kat_nmap_ip_range/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nmap_ip_range/boefje.json
@@ -1,16 +1,10 @@
 {
   "id": "nmap-ip-range",
   "name": "Nmap IP range",
-  "description": "Scan an IP range and store found IPs. Defaults to top-250 TCP and top-10 UDP on ranges with 1024 addresses or less. Larger ranges are skipped by default.",
+  "description": "Scan an IP range and store found IPs. Defaults to top-250 TCP and top-10 UDP on ranges with 1024 addresses or less (max is a /22). Larger ranges are skipped by default.",
   "consumes": [
     "IPV6NetBlock",
     "IPV4NetBlock"
   ],
-  "environment_keys": [
-    "TOP_PORTS_TCP",
-    "TOP_PORTS_UDP",
-    "MIN_VLSM_IPV4",
-    "MIN_VLSM_IPV6"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_nmap_ports/boefje.json b/boefjes/boefjes/plugins/kat_nmap_ports/boefje.json
index 506b6ffd478..667852d2be2 100644
--- a/boefjes/boefjes/plugins/kat_nmap_ports/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nmap_ports/boefje.json
@@ -1,13 +1,10 @@
 {
   "id": "nmap-ports",
   "name": "Nmap Ports",
-  "description": "Scan a specific set of ports including service detection",
+  "description": "Scan a specific set of ports including service detection.",
   "consumes": [
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "PORTS"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_nmap_ports/schema.json b/boefjes/boefjes/plugins/kat_nmap_ports/schema.json
index 4b52a8af648..b078f26b0b8 100644
--- a/boefjes/boefjes/plugins/kat_nmap_ports/schema.json
+++ b/boefjes/boefjes/plugins/kat_nmap_ports/schema.json
@@ -6,6 +6,7 @@
       "title": "PORTS",
       "maxLength": 2048,
       "type": "string",
+      "pattern": "^((6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)|(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)-(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d))$|^((6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)|(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)-(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d))(,((6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)|(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)-(6553[0-5]|655[0-2]\\d|65[0-4]\\d{2}|6[0-4]\\d{3}|[1-5]\\d{0,4}|\\d)))+$",
       "description": "Specify the ports that need to be scanned (nmap format). Single ports are comma separated, port ranges can be specified using the dash symbol. For example: 22,111,137,80-100 will scan ports 22, 111, 137 and the port range 80 up to 100."
     }
   },
diff --git a/boefjes/boefjes/plugins/kat_nmap_tcp/boefje.json b/boefjes/boefjes/plugins/kat_nmap_tcp/boefje.json
index f3d46684aeb..2ab5f018393 100644
--- a/boefjes/boefjes/plugins/kat_nmap_tcp/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nmap_tcp/boefje.json
@@ -6,9 +6,6 @@
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "TOP_PORTS"
-  ],
   "scan_level": 2,
   "oci_image": "ghcr.io/minvws/openkat/nmap:latest",
   "oci_arguments": [
diff --git a/boefjes/boefjes/plugins/kat_nmap_tcp/main.py b/boefjes/boefjes/plugins/kat_nmap_tcp/main.py
index c46d686134f..41fdaa5cd97 100644
--- a/boefjes/boefjes/plugins/kat_nmap_tcp/main.py
+++ b/boefjes/boefjes/plugins/kat_nmap_tcp/main.py
@@ -18,4 +18,4 @@ def run(boefje_meta: dict):
         cmd.append("-6")
 
     cmd.extend(["-oX", "-", str(ip)])
-    return [(set(), subprocess.run(cmd, capture_output=True).stdout.decode())]
+    return [({"openkat/nmap-output"}, subprocess.run(cmd, capture_output=True).stdout.decode())]
diff --git a/boefjes/boefjes/plugins/kat_nmap_tcp/normalizer.json b/boefjes/boefjes/plugins/kat_nmap_tcp/normalizer.json
index ae7e2db0145..9261f449ddf 100644
--- a/boefjes/boefjes/plugins/kat_nmap_tcp/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_nmap_tcp/normalizer.json
@@ -1,11 +1,13 @@
 {
   "id": "kat_nmap_normalize",
   "name": "nmap",
+  "description": "Parses data from all nmap variants into IP-addresses, ports and services.",
   "consumes": [
     "boefje/nmap",
     "boefje/nmap-udp",
     "boefje/nmap-ports",
-    "boefje/nmap-ip-range"
+    "boefje/nmap-ip-range",
+    "openkat/nmap-output"
   ],
   "produces": [
     "IPAddressV6",
diff --git a/boefjes/boefjes/plugins/kat_nmap_udp/boefje.json b/boefjes/boefjes/plugins/kat_nmap_udp/boefje.json
index f9839e53e37..671ff93fe2a 100644
--- a/boefjes/boefjes/plugins/kat_nmap_udp/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nmap_udp/boefje.json
@@ -6,9 +6,6 @@
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "TOP_PORTS_UDP"
-  ],
   "scan_level": 2,
   "oci_image": "ghcr.io/minvws/openkat/nmap:latest",
   "oci_arguments": [
diff --git a/boefjes/boefjes/plugins/kat_nuclei_cve/boefje.json b/boefjes/boefjes/plugins/kat_nuclei_cve/boefje.json
index d547b8c5359..2b37e26d6a5 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_cve/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_cve/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "nuclei-cve",
   "name": "Nuclei CVE scan",
-  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning. (CVE scanning)",
+  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning. (CVE scanning).",
   "consumes": [
     "Hostname",
     "HostnameHTTPURL"
diff --git a/boefjes/boefjes/plugins/kat_nuclei_cve/normalizer.json b/boefjes/boefjes/plugins/kat_nuclei_cve/normalizer.json
index e096426fa1f..035bcd3eef5 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_cve/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_cve/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_nuclei_cve_normalize",
   "name": "Nuclei CVE",
+  "description": "Parses Nuclei CVE data into findings.",
   "consumes": [
     "boefje/nuclei-cve"
   ],
diff --git a/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/boefje.json b/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/boefje.json
index 1b5f62387bf..f4c2c5061df 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "nuclei-exposed-panels",
   "name": "Nuclei Exposed panels",
-  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning. (Exposed panels)",
+  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning. Can be used to find specific exposed administrative panels in your network.",
   "consumes": [
     "Hostname",
     "HostnameHTTPURL"
diff --git a/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/normalizer.json b/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/normalizer.json
index d26c4f40239..addf8888438 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_exposed_panels/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_nuclei_exposed_panels_normalize",
   "name": "Nuclei exposed admin panels",
+  "description": "Parses Nuclei of exposed panels into findings.",
   "consumes": [
     "boefje/nuclei-exposed-panels"
   ],
diff --git a/boefjes/boefjes/plugins/kat_nuclei_take_over/boefje.json b/boefjes/boefjes/plugins/kat_nuclei_take_over/boefje.json
index d1bb332eb93..c420b0a1554 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_take_over/boefje.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_take_over/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "nuclei-takeover",
   "name": "Nuclei takeover scan",
-  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning.(sub-domain takeover)",
+  "description": "Nuclei is used to send requests across targets based on a template, providing fast scanning. This will try to perform a sub sub-domain takeover.",
   "consumes": [
     "Hostname",
     "HostnameHTTPURL"
diff --git a/boefjes/boefjes/plugins/kat_nuclei_take_over/normalizer.json b/boefjes/boefjes/plugins/kat_nuclei_take_over/normalizer.json
index c9937b46e50..ff067686f4f 100644
--- a/boefjes/boefjes/plugins/kat_nuclei_take_over/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_nuclei_take_over/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_nuclei_takeover_normalize",
   "name": "Nuclei takeover",
+  "description": "Parses Nuclei takeover data into findings.",
   "consumes": [
     "boefje/nuclei-takeover"
   ],
diff --git a/boefjes/boefjes/plugins/kat_rdns/boefje.json b/boefjes/boefjes/plugins/kat_rdns/boefje.json
index 44b486f04fe..a838a103061 100644
--- a/boefjes/boefjes/plugins/kat_rdns/boefje.json
+++ b/boefjes/boefjes/plugins/kat_rdns/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "rdns",
   "name": "Reverse DNS",
-  "description": "Resolve IP addresses to a hostname",
+  "description": "Resolve IP addresses to a hostname.",
   "consumes": [
     "IPAddressV4",
     "IPAddressV6"
diff --git a/boefjes/boefjes/plugins/kat_rdns/normalizer.json b/boefjes/boefjes/plugins/kat_rdns/normalizer.json
index 2e1e99a15bb..c0dfa4a4e8f 100644
--- a/boefjes/boefjes/plugins/kat_rdns/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_rdns/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_rdns_normalize",
-  "name": "RDNS",
+  "name": "Reverse DNS",
+  "description": "Parses reverse DNS data into PTR records.",
   "consumes": [
     "boefje/rdns"
   ],
diff --git a/boefjes/boefjes/plugins/kat_report_data/normalizer.json b/boefjes/boefjes/plugins/kat_report_data/normalizer.json
index 01927fd0753..9c3d0e17bdb 100644
--- a/boefjes/boefjes/plugins/kat_report_data/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_report_data/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_report_data",
   "name": "Report data",
+  "description": "Parses (uploaded) report data to create reports.",
   "consumes": [
     "openkat/report-data"
   ],
diff --git a/boefjes/boefjes/plugins/kat_retirejs_finding_types/boefje.json b/boefjes/boefjes/plugins/kat_retirejs_finding_types/boefje.json
index d7957dcae2f..d8be8eca744 100644
--- a/boefjes/boefjes/plugins/kat_retirejs_finding_types/boefje.json
+++ b/boefjes/boefjes/plugins/kat_retirejs_finding_types/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "retirejs-finding-types",
   "name": "RetireJS Finding Types",
-  "description": "Hydrate information of RetireJS finding types",
+  "description": "Hydrate information of RetireJS finding types.",
   "consumes": [
     "RetireJSFindingType"
   ],
diff --git a/boefjes/boefjes/plugins/kat_retirejs_finding_types/normalizer.json b/boefjes/boefjes/plugins/kat_retirejs_finding_types/normalizer.json
index 40e1bbbf235..e525365378c 100644
--- a/boefjes/boefjes/plugins/kat_retirejs_finding_types/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_retirejs_finding_types/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_retirejs_finding_types_normalize",
   "name": "RetireJS finding types",
+  "description": "Parses RetireJS data into findings.",
   "consumes": [
     "boefje/retirejs-finding-types"
   ],
diff --git a/boefjes/boefjes/plugins/kat_rpki/boefje.json b/boefjes/boefjes/plugins/kat_rpki/boefje.json
index edbd65b28b8..dc31c0fd354 100644
--- a/boefjes/boefjes/plugins/kat_rpki/boefje.json
+++ b/boefjes/boefjes/plugins/kat_rpki/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "rpki",
   "name": "RPKI",
-  "description": "Check if an IPv4 or IPv6 address has a valid VRPS record.",
+  "description": "Check BGP announcements to see if an IPv4 or IPv6 address has Validated ROA Payload (VRPs).",
   "consumes": [
     "IPAddressV4",
     "IPAddressV6"
diff --git a/boefjes/boefjes/plugins/kat_rpki/normalizer.json b/boefjes/boefjes/plugins/kat_rpki/normalizer.json
index 59c5567e427..488e23ecafe 100644
--- a/boefjes/boefjes/plugins/kat_rpki/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_rpki/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_rpki_normalize",
   "name": "RPKI",
+  "description": "Parses RPKI data into findings.",
   "consumes": [
     "rpki/results"
   ],
diff --git a/boefjes/boefjes/plugins/kat_security_txt_downloader/boefje.json b/boefjes/boefjes/plugins/kat_security_txt_downloader/boefje.json
index ff83f57ff5e..3f0e3452478 100644
--- a/boefjes/boefjes/plugins/kat_security_txt_downloader/boefje.json
+++ b/boefjes/boefjes/plugins/kat_security_txt_downloader/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "security_txt_downloader",
   "name": "Security.txt downloader",
-  "description": "Downloads the security.txt file from the target host.",
+  "description": "Downloads the security.txt file from the target website to check if it contains all the required elements.",
   "consumes": [
     "Website"
   ],
diff --git a/boefjes/boefjes/plugins/kat_security_txt_downloader/normalizer.json b/boefjes/boefjes/plugins/kat_security_txt_downloader/normalizer.json
index 01d20c7a895..a5dad882aec 100644
--- a/boefjes/boefjes/plugins/kat_security_txt_downloader/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_security_txt_downloader/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_sec_txt_downloader_normalize",
   "name": "Security.txt downloader",
+  "description": "Parses the downloaded security.txt data from a website.",
   "consumes": [
     "boefje/security_txt_downloader"
   ],
diff --git a/boefjes/boefjes/plugins/kat_service_banner/boefje.json b/boefjes/boefjes/plugins/kat_service_banner/boefje.json
index 6319afe8c94..8a04b669a3f 100644
--- a/boefjes/boefjes/plugins/kat_service_banner/boefje.json
+++ b/boefjes/boefjes/plugins/kat_service_banner/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "service_banner",
   "name": "Service banner download",
-  "description": "Downloads service banners from the target hosts",
+  "description": "Downloads service banners from the target hosts.",
   "consumes": [
     "IPPort"
   ],
diff --git a/boefjes/boefjes/plugins/kat_shodan/boefje.json b/boefjes/boefjes/plugins/kat_shodan/boefje.json
index ad1e1c3787e..240e065da2c 100644
--- a/boefjes/boefjes/plugins/kat_shodan/boefje.json
+++ b/boefjes/boefjes/plugins/kat_shodan/boefje.json
@@ -1,13 +1,10 @@
 {
   "id": "shodan",
   "name": "Shodan",
-  "description": "Use Shodan to find open ports with vulnerabilities that are found on that port",
+  "description": "Use Shodan to find open ports with vulnerabilities that are found on that port. Requires an API key.",
   "consumes": [
     "IPAddressV4",
     "IPAddressV6"
   ],
-  "environment_keys": [
-    "SHODAN_API"
-  ],
   "scan_level": 1
 }
diff --git a/boefjes/boefjes/plugins/kat_shodan/normalizer.json b/boefjes/boefjes/plugins/kat_shodan/normalizer.json
index 76f7798a49a..eb1b4376d8a 100644
--- a/boefjes/boefjes/plugins/kat_shodan/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_shodan/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_shodan_normalize",
   "name": "Shodan",
+  "description": "Parses Shodan data into (CVE) findings and ports.",
   "consumes": [
     "boefje/shodan"
   ],
diff --git a/boefjes/boefjes/plugins/kat_snyk/boefje.json b/boefjes/boefjes/plugins/kat_snyk/boefje.json
index 5caed40ad8e..52036fcfc93 100644
--- a/boefjes/boefjes/plugins/kat_snyk/boefje.json
+++ b/boefjes/boefjes/plugins/kat_snyk/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "snyk",
   "name": "Snyk.io-vulnerabilities",
-  "description": "Get Snyk.io vulnerabilities based on Software",
+  "description": "Get Snyk.io vulnerabilities based on identified Software.",
   "consumes": [
     "SoftwareInstance"
   ],
diff --git a/boefjes/boefjes/plugins/kat_snyk/normalize.py b/boefjes/boefjes/plugins/kat_snyk/normalize.py
index cd8b5746234..240cc580e0f 100755
--- a/boefjes/boefjes/plugins/kat_snyk/normalize.py
+++ b/boefjes/boefjes/plugins/kat_snyk/normalize.py
@@ -23,7 +23,7 @@ def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
     elif not results["table_vulnerabilities"] and not results["cve_vulnerabilities"]:
         # no vulnerabilities found
         return
-    else:
+    if software_version:
         for vuln in results["table_vulnerabilities"]:
             snyk_ft = SnykFindingType(id=vuln.get("Vuln_href"))
             yield snyk_ft
@@ -40,6 +40,15 @@ def run(input_ooi: dict, raw: bytes) -> Iterable[NormalizerOutput]:
                 ooi=pk_ooi,
                 description=vuln.get("Vuln_text"),
             )
+    if not software_version and (results["table_vulnerabilities"] or results["cve_vulnerabilities"]):
+        kat_ooi = KATFindingType(id="KAT-SOFTWARE-VERSION-NOT-FOUND")
+        yield kat_ooi
+        yield Finding(
+            finding_type=kat_ooi.reference,
+            ooi=pk_ooi,
+            description="There was no version found for this software. "
+            "But there are known vulnerabilities for some versions.",
+        )
 
     # Check for latest version
     latest_version = ""
diff --git a/boefjes/boefjes/plugins/kat_snyk/normalizer.json b/boefjes/boefjes/plugins/kat_snyk/normalizer.json
index a24799474f2..7234a8de07f 100644
--- a/boefjes/boefjes/plugins/kat_snyk/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_snyk/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_snyk_normalize",
   "name": "Snyk.io",
+  "description": "Parses Snyk.io data into various findings.",
   "consumes": [
     "boefje/snyk"
   ],
diff --git a/boefjes/boefjes/plugins/kat_snyk_finding_types/boefje.json b/boefjes/boefjes/plugins/kat_snyk_finding_types/boefje.json
index f48633af47b..2c710422948 100644
--- a/boefjes/boefjes/plugins/kat_snyk_finding_types/boefje.json
+++ b/boefjes/boefjes/plugins/kat_snyk_finding_types/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "snyk-finding-types",
   "name": "SNYK Finding Types",
-  "description": "Hydrate information of SNYK finding types",
+  "description": "Hydrate information of SNYK finding types.",
   "consumes": [
     "SnykFindingType"
   ],
diff --git a/boefjes/boefjes/plugins/kat_snyk_finding_types/normalizer.json b/boefjes/boefjes/plugins/kat_snyk_finding_types/normalizer.json
index f576b514d7d..80f919d126d 100644
--- a/boefjes/boefjes/plugins/kat_snyk_finding_types/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_snyk_finding_types/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_snyk_finding_types_normalize",
   "name": "Snyk.io finding types",
+  "description": "Parses Snyk.io data into Finding Types. Required for the Snyk Normalizer.",
   "consumes": [
     "boefje/snyk-finding-types"
   ],
diff --git a/boefjes/boefjes/plugins/kat_ssl_certificates/boefje.json b/boefjes/boefjes/plugins/kat_ssl_certificates/boefje.json
index 0d6ed28a5b4..3cf277314a2 100644
--- a/boefjes/boefjes/plugins/kat_ssl_certificates/boefje.json
+++ b/boefjes/boefjes/plugins/kat_ssl_certificates/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "ssl-certificates",
   "name": "SSLCertificates",
-  "description": "Scan SSL certificates of websites",
+  "description": "Scan SSL certificates of websites. Checks if certificates are valid and/or expired.",
   "consumes": [
     "Website"
   ],
diff --git a/boefjes/boefjes/plugins/kat_ssl_certificates/normalizer.json b/boefjes/boefjes/plugins/kat_ssl_certificates/normalizer.json
index 6445ad84e4e..77b555201c9 100644
--- a/boefjes/boefjes/plugins/kat_ssl_certificates/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_ssl_certificates/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_ssl_certificates_normalize",
   "name": "SSL certificates",
+  "description": "Parses SSL certificates data into X509 certificates.",
   "consumes": [
     "boefje/ssl-certificates"
   ],
diff --git a/boefjes/boefjes/plugins/kat_ssl_scan/boefje.json b/boefjes/boefjes/plugins/kat_ssl_scan/boefje.json
index 7bc7dddcd71..2fb0a2a1ec7 100644
--- a/boefjes/boefjes/plugins/kat_ssl_scan/boefje.json
+++ b/boefjes/boefjes/plugins/kat_ssl_scan/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "ssl-version",
   "name": "SSLScan",
-  "description": "Scan SSL/TLS versions of websites",
+  "description": "Scan SSL/TLS versions (protocols) of websites. Will result in findings if outdated SSL/TLS versions are identified such as SSLv3. ",
   "consumes": [
     "Website"
   ],
diff --git a/boefjes/boefjes/plugins/kat_ssl_scan/normalizer.json b/boefjes/boefjes/plugins/kat_ssl_scan/normalizer.json
index 03440d05d64..a1bb4705da9 100644
--- a/boefjes/boefjes/plugins/kat_ssl_scan/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_ssl_scan/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_ssl_scan_normalize",
   "name": "SSL scan",
+  "description": "Parses SSL scan version data into findings.",
   "consumes": [
     "boefje/ssl-version"
   ],
diff --git a/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/boefje.json b/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/boefje.json
index 91a7d6f9994..5d717a60661 100644
--- a/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/boefje.json
+++ b/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/boefje.json
@@ -1,12 +1,9 @@
 {
   "id": "testssl-sh-ciphers",
   "name": "Testssl.sh Ciphers",
-  "description": "Run testssl.sh Docker container and check ciphers",
+  "description": "Checks the SSL and TLS ciphers of a website for any insecure ciphers that are offered.",
   "consumes": [
     "IPService"
   ],
-  "scan_level": 2,
-  "environment_keys": [
-    "TIMEOUT"
-  ]
+  "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/normalizer.json b/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/normalizer.json
index 7d8d73f78a7..670cea50569 100644
--- a/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_testssl_sh_ciphers/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_ssl_test_ciphers_normalize",
   "name": "SSL test ciphers",
+  "description": "Parses TestSSL data into TLS ciphers.",
   "consumes": [
     "boefje/testssl-sh-ciphers"
   ],
diff --git a/boefjes/boefjes/plugins/kat_wappalyzer/normalizer.json b/boefjes/boefjes/plugins/kat_wappalyzer/normalizer.json
index 078eeb6eab1..aadfd6cb73a 100644
--- a/boefjes/boefjes/plugins/kat_wappalyzer/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_wappalyzer/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_wappalyzer_normalize",
   "name": "Wappalyzer",
+  "description": "Checks HTTP responses for Software versions.",
   "consumes": [
     "openkat-http/response"
   ],
diff --git a/boefjes/boefjes/plugins/kat_webpage_analysis/boefje.json b/boefjes/boefjes/plugins/kat_webpage_analysis/boefje.json
index c6c12b6e73c..e284ad6f61b 100644
--- a/boefjes/boefjes/plugins/kat_webpage_analysis/boefje.json
+++ b/boefjes/boefjes/plugins/kat_webpage_analysis/boefje.json
@@ -141,8 +141,5 @@
     "video/x-msvideo",
     "video/x-sgi-movie"
   ],
-  "environment_keys": [
-    "USERAGENT"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_webpage_analysis/check_images/normalizer.json b/boefjes/boefjes/plugins/kat_webpage_analysis/check_images/normalizer.json
index 1f6d2edfae1..61e8b1ec671 100644
--- a/boefjes/boefjes/plugins/kat_webpage_analysis/check_images/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_webpage_analysis/check_images/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_check_images",
-  "name": "Webpage analysis check images",
+  "name": "Webpage analysis check images for metadata",
+  "description": "Checks images for metadata.",
   "consumes": [
     "image/jpeg",
     "image/jpg",
diff --git a/boefjes/boefjes/plugins/kat_webpage_analysis/find_images_in_html/normalizer.json b/boefjes/boefjes/plugins/kat_webpage_analysis/find_images_in_html/normalizer.json
index 112a43fdb40..6e4902e45f7 100644
--- a/boefjes/boefjes/plugins/kat_webpage_analysis/find_images_in_html/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_webpage_analysis/find_images_in_html/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_find_images_in_html",
   "name": "Webpage analysis find images in html",
+  "description": "Parses websites to find images.",
   "consumes": [
     "text/html"
   ],
diff --git a/boefjes/boefjes/plugins/kat_webpage_analysis/headers/normalizer.json b/boefjes/boefjes/plugins/kat_webpage_analysis/headers/normalizer.json
index cb66bfead5c..7af10b6f0ad 100644
--- a/boefjes/boefjes/plugins/kat_webpage_analysis/headers/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_webpage_analysis/headers/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_webpage_analysis_headers_normalize",
   "name": "Webpage analysis HTTP headers",
+  "description": "Parses the HTTP headers from websites.",
   "consumes": [
     "openkat-http/headers"
   ],
diff --git a/boefjes/boefjes/plugins/kat_webpage_capture/boefje.json b/boefjes/boefjes/plugins/kat_webpage_capture/boefje.json
index 7b28df2c714..75db6e9e3fe 100644
--- a/boefjes/boefjes/plugins/kat_webpage_capture/boefje.json
+++ b/boefjes/boefjes/plugins/kat_webpage_capture/boefje.json
@@ -1,7 +1,7 @@
 {
   "id": "webpage-capture",
   "name": "Webpage Capture",
-  "description": "Takes a screenshot of a webpage. Image is stored to bytes.",
+  "description": "Takes a screenshot of a webpage. Image can be found on the Tasks page in the downloadable 'meta and raw data' file.",
   "consumes": [
     "HostnameHTTPURL",
     "IPAddressHTTPURL"
diff --git a/boefjes/boefjes/plugins/kat_wpscan/boefje.json b/boefjes/boefjes/plugins/kat_wpscan/boefje.json
index 83658bb2d56..35a7e543d7a 100644
--- a/boefjes/boefjes/plugins/kat_wpscan/boefje.json
+++ b/boefjes/boefjes/plugins/kat_wpscan/boefje.json
@@ -1,12 +1,9 @@
 {
   "id": "wp-scan",
   "name": "WPScan",
-  "description": "WordPress security scanner",
+  "description": "Scans WordPress websites.",
   "consumes": [
     "SoftwareInstance"
   ],
-  "environment_keys": [
-    "WP_SCAN_API"
-  ],
   "scan_level": 2
 }
diff --git a/boefjes/boefjes/plugins/kat_wpscan/normalizer.json b/boefjes/boefjes/plugins/kat_wpscan/normalizer.json
index 931a4dc72c4..d4319ac6b66 100644
--- a/boefjes/boefjes/plugins/kat_wpscan/normalizer.json
+++ b/boefjes/boefjes/plugins/kat_wpscan/normalizer.json
@@ -1,6 +1,7 @@
 {
   "id": "kat_wpscan_normalize",
   "name": "WPscan",
+  "description": "Creates findings from WPscan data.",
   "consumes": [
     "boefje/wp-scan"
   ],
diff --git a/boefjes/boefjes/plugins/models.py b/boefjes/boefjes/plugins/models.py
index 91af854f576..af08e385971 100644
--- a/boefjes/boefjes/plugins/models.py
+++ b/boefjes/boefjes/plugins/models.py
@@ -59,7 +59,7 @@ class BoefjeResource:
 
     def __init__(self, path: Path, package: str):
         self.path = path
-        self.boefje: Boefje = Boefje.parse_file(path / BOEFJE_DEFINITION_FILE)
+        self.boefje: Boefje = Boefje.model_validate_json(path.joinpath(BOEFJE_DEFINITION_FILE).read_text())
         self.boefje.runnable_hash = get_runnable_hash(self.path)
         self.boefje.produces = self.boefje.produces.union(set(_default_mime_types(self.boefje)))
         self.module: Runnable | None = None
@@ -69,7 +69,7 @@ def __init__(self, path: Path, package: str):
 
         if (path / SCHEMA_FILE).exists():
             try:
-                self.boefje.schema = json.load((path / SCHEMA_FILE).open())
+                self.boefje.boefje_schema = json.load((path / SCHEMA_FILE).open())
             except JSONDecodeError as e:
                 raise ModuleException("Invalid schema file") from e
             except SchemaError as e:
@@ -81,7 +81,7 @@ class NormalizerResource:
 
     def __init__(self, path: Path, package: str):
         self.path = path
-        self.normalizer = Normalizer.parse_file(path / NORMALIZER_DEFINITION_FILE)
+        self.normalizer = Normalizer.model_validate_json(path.joinpath(NORMALIZER_DEFINITION_FILE).read_text())
         self.normalizer.consumes.append(f"normalizer/{self.normalizer.id}")
         self.module = get_runnable_module_from_package(package, ENTRYPOINT_NORMALIZERS, parameter_count=2)
 
diff --git a/boefjes/boefjes/sql/db.py b/boefjes/boefjes/sql/db.py
index 0f31709206b..97fa858b75b 100644
--- a/boefjes/boefjes/sql/db.py
+++ b/boefjes/boefjes/sql/db.py
@@ -43,7 +43,7 @@ def session_managed_iterator(service_factory: Callable[[Session], Any]) -> Itera
     try:
         yield service
     except Exception as error:
-        logger.exception("An error occurred: %s. Rolling back session", error)
+        logger.error("An error occurred: %s. Rolling back session", error)
         session.rollback()
         raise error
     finally:
diff --git a/boefjes/boefjes/sql/db_models.py b/boefjes/boefjes/sql/db_models.py
index e8e9740f8f4..df37626f1b6 100644
--- a/boefjes/boefjes/sql/db_models.py
+++ b/boefjes/boefjes/sql/db_models.py
@@ -68,15 +68,16 @@ class BoefjeInDB(SQL_BASE):
     static = Column(Boolean, nullable=False, server_default="false")
 
     # Metadata
-    name = Column(String(length=64), nullable=False)
+    name = Column(String(length=64), nullable=False, unique=True)
     description = Column(types.Text, nullable=True)
     scan_level = Column(types.Enum(*[str(x.value) for x in ScanLevel], name="scan_level"), nullable=False, default="4")
 
     # Job specifications
     consumes = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
     produces = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
-    environment_keys = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
     schema = Column(types.JSON(), nullable=True)
+    cron = Column(types.String(length=128), nullable=True)
+    interval = Column(types.Integer, nullable=True)
 
     # Image specifications
     oci_image = Column(types.String(length=256), nullable=True)
@@ -93,11 +94,10 @@ class NormalizerInDB(SQL_BASE):
     static = Column(Boolean, nullable=False, server_default="false")
 
     # Metadata
-    name = Column(String(length=64), nullable=False)
+    name = Column(String(length=64), nullable=False, unique=True)
     description = Column(types.Text, nullable=True)
 
     # Job specifications
     consumes = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
     produces = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
-    environment_keys = Column(types.ARRAY(types.String(length=128)), default=lambda: [], nullable=False)
     version = Column(types.String(length=16), nullable=True)
diff --git a/boefjes/boefjes/sql/organisation_storage.py b/boefjes/boefjes/sql/organisation_storage.py
index 4591ffc574f..fd1c748feef 100644
--- a/boefjes/boefjes/sql/organisation_storage.py
+++ b/boefjes/boefjes/sql/organisation_storage.py
@@ -30,7 +30,7 @@ def get_all(self) -> dict[str, Organisation]:
         return {organisation.id: self.to_organisation(organisation) for organisation in query.all()}
 
     def create(self, organisation: Organisation) -> None:
-        logger.info("Saving organisation: %s", organisation.json())
+        logger.info("Saving organisation: %s", organisation.model_dump_json())
 
         organisation_in_db = self.to_organisation_in_db(organisation)
         self.session.add(organisation_in_db)
diff --git a/boefjes/boefjes/sql/plugin_storage.py b/boefjes/boefjes/sql/plugin_storage.py
index c9bcffbaa2f..204f7fb8e21 100644
--- a/boefjes/boefjes/sql/plugin_storage.py
+++ b/boefjes/boefjes/sql/plugin_storage.py
@@ -35,7 +35,7 @@ def normalizer_by_id(self, normalizer_id: str) -> Normalizer:
         return self.to_normalizer(instance)
 
     def create_boefje(self, boefje: Boefje) -> None:
-        logger.info("Saving plugin: %s", boefje.json())
+        logger.info("Saving plugin: %s", boefje.model_dump_json())
 
         boefje_in_db = self.to_boefje_in_db(boefje)
         self.session.add(boefje_in_db)
@@ -49,13 +49,11 @@ def update_boefje(self, boefje_id: str, data: dict) -> None:
         if instance.static:
             raise NotAllowed(f"Plugin with id '{boefje_id}' is static, so updating it is not allowed")
 
-        for key, value in data.items():
-            setattr(instance, key, value)
-
-        self.session.add(instance)
+        boefje = self.to_boefje(instance).copy(update=data)
+        self.session.merge(self.to_boefje_in_db(boefje, instance.id))
 
     def create_normalizer(self, normalizer: Normalizer) -> None:
-        logger.info("Saving plugin: %s", normalizer.json())
+        logger.info("Saving plugin: %s", normalizer.model_dump_json())
 
         normalizer_in_db = self.to_normalizer_in_db(normalizer)
         self.session.add(normalizer_in_db)
@@ -69,10 +67,8 @@ def update_normalizer(self, normalizer_id: str, data: dict) -> None:
         if instance.static:
             raise NotAllowed(f"Plugin with id '{normalizer_id}' is static, so updating it is not allowed")
 
-        for key, value in data.items():
-            setattr(instance, key, value)
-
-        self.session.add(instance)
+        normalizer = self.to_normalizer(instance).copy(update=data)
+        self.session.merge(self.to_normalizer_in_db(normalizer, instance.id))
 
     def delete_boefje_by_id(self, boefje_id: str) -> None:
         instance = self._db_boefje_instance_by_id(boefje_id)
@@ -101,8 +97,8 @@ def _db_normalizer_instance_by_id(self, normalizer_id: str) -> NormalizerInDB:
         return instance
 
     @staticmethod
-    def to_boefje_in_db(boefje: Boefje) -> BoefjeInDB:
-        return BoefjeInDB(
+    def to_boefje_in_db(boefje: Boefje, pk: int | None = None) -> BoefjeInDB:
+        boefje = BoefjeInDB(
             plugin_id=boefje.id,
             created=boefje.created,
             name=boefje.name,
@@ -110,28 +106,38 @@ def to_boefje_in_db(boefje: Boefje) -> BoefjeInDB:
             scan_level=str(boefje.scan_level),
             consumes=boefje.consumes,
             produces=boefje.produces,
-            schema=boefje.schema,
-            environment_keys=boefje.environment_keys,
+            schema=boefje.boefje_schema,
+            cron=boefje.cron,
+            interval=boefje.interval,
             oci_image=boefje.oci_image,
             oci_arguments=boefje.oci_arguments,
             version=boefje.version,
             static=boefje.static,
         )
 
+        if pk is not None:
+            boefje.id = pk
+
+        return boefje
+
     @staticmethod
-    def to_normalizer_in_db(normalizer: Normalizer) -> NormalizerInDB:
-        return NormalizerInDB(
+    def to_normalizer_in_db(normalizer: Normalizer, pk: int | None = None) -> NormalizerInDB:
+        normalizer = NormalizerInDB(
             plugin_id=normalizer.id,
             created=normalizer.created,
             name=normalizer.name,
             description=normalizer.description,
             consumes=normalizer.consumes,
             produces=normalizer.produces,
-            environment_keys=normalizer.environment_keys,
             version=normalizer.version,
             static=normalizer.static,
         )
 
+        if pk is not None:
+            normalizer.id = pk
+
+        return normalizer
+
     @staticmethod
     def to_boefje(boefje_in_db: BoefjeInDB) -> Boefje:
         return Boefje(
@@ -143,8 +149,9 @@ def to_boefje(boefje_in_db: BoefjeInDB) -> Boefje:
             scan_level=int(boefje_in_db.scan_level),
             consumes=boefje_in_db.consumes,
             produces=boefje_in_db.produces,
-            schema=boefje_in_db.schema,
-            environment_keys=boefje_in_db.environment_keys,
+            boefje_schema=boefje_in_db.schema,
+            cron=boefje_in_db.cron,
+            interval=boefje_in_db.interval,
             oci_image=boefje_in_db.oci_image,
             oci_arguments=boefje_in_db.oci_arguments,
             version=boefje_in_db.version,
@@ -161,7 +168,6 @@ def to_normalizer(normalizer_in_db: NormalizerInDB) -> Normalizer:
             description=normalizer_in_db.description,
             consumes=normalizer_in_db.consumes,
             produces=normalizer_in_db.produces,
-            environment_keys=normalizer_in_db.environment_keys,
             version=normalizer_in_db.version,
             static=normalizer_in_db.static,
         )
diff --git a/boefjes/boefjes/sql/session.py b/boefjes/boefjes/sql/session.py
index 681a6c963ba..a48f238d410 100644
--- a/boefjes/boefjes/sql/session.py
+++ b/boefjes/boefjes/sql/session.py
@@ -1,9 +1,10 @@
 import structlog
-from sqlalchemy.exc import DatabaseError
+from psycopg2 import errors
+from sqlalchemy import exc
 from sqlalchemy.orm import Session
 from typing_extensions import Self
 
-from boefjes.storage.interfaces import StorageError
+from boefjes.storage.interfaces import IntegrityError, StorageError
 
 logger = structlog.get_logger(__name__)
 
@@ -29,20 +30,21 @@ def __enter__(self) -> Self:
 
     def __exit__(self, exc_type: type[Exception], exc_value: str, exc_traceback: str) -> None:  # noqa: F841
         if exc_type is not None:
-            logger.error("An error occurred: %s. Rolling back session", exc_value, exc_info=True)
+            logger.error("An error occurred: %s. Rolling back session", exc_value)
             self.session.rollback()
 
             return
 
-        error = None
-
         try:
-            logger.info("Committing session")
+            logger.debug("Committing session")
             self.session.commit()
-        except DatabaseError as e:
-            error = e
-            logger.exception("Committing failed, rolling back")
-            self.session.rollback()
-
-        if error:
-            raise StorageError("A storage error occurred") from error
+        except exc.IntegrityError as e:
+            if isinstance(e.orig, errors.UniqueViolation):
+                raise IntegrityError(str(e.orig))
+            raise IntegrityError("An integrity error occurred") from e
+        except exc.DatabaseError as e:
+            raise StorageError("A storage error occurred") from e
+        finally:
+            if exc_type is not None or self.session.is_active:
+                logger.debug("Committing failed, rolling back")
+                self.session.rollback()
diff --git a/boefjes/boefjes/storage/interfaces.py b/boefjes/boefjes/storage/interfaces.py
index ff19ca7c9f8..24a7d77f9df 100644
--- a/boefjes/boefjes/storage/interfaces.py
+++ b/boefjes/boefjes/storage/interfaces.py
@@ -10,12 +10,16 @@ def __init__(self, message: str):
         self.message = message
 
 
+class IntegrityError(StorageError):
+    """Integrity error during persistence of an entity"""
+
+    def __init__(self, message: str):
+        self.message = message
+
+
 class SettingsNotConformingToSchema(StorageError):
-    def __init__(self, organisation_id: str, plugin_id: str, validation_error: str):
-        super().__init__(
-            f"Settings for organisation {organisation_id} and plugin {plugin_id} are not conform the plugin schema: "
-            f"{validation_error}"
-        )
+    def __init__(self, plugin_id: str, validation_error: str):
+        super().__init__(f"Settings for plugin {plugin_id} are not conform the plugin schema: {validation_error}")
 
 
 class NotFound(StorageError):
@@ -51,9 +55,9 @@ def __init__(self, plugin_id: str):
         super().__init__(f"Plugin with id '{plugin_id}' is static, so updating it is not allowed")
 
 
-class ExistingPluginId(NotAllowed):
-    def __init__(self, plugin_id: str):
-        super().__init__(f"Plugin id '{plugin_id}' is already used")
+class DuplicatePlugin(NotAllowed):
+    def __init__(self, key: str):
+        super().__init__(f"Duplicate plugin {key}")
 
 
 class OrganisationStorage(ABC):
diff --git a/boefjes/images/oci_adapter.py b/boefjes/images/oci_adapter.py
index 32a788a4cf8..0027e11e4be 100755
--- a/boefjes/images/oci_adapter.py
+++ b/boefjes/images/oci_adapter.py
@@ -9,7 +9,11 @@
 
 def main():
     input_url = sys.argv[-1]
-    boefje_input = httpx.get(input_url).json()
+    try:
+        boefje_input = httpx.get(input_url).json()
+    except httpx.HTTPError as e:
+        # sys.exit will print the message on stderr and return with exit code 1
+        sys.exit(f"Failed to get input from boefje API: {e}")
 
     try:
         os.environ.update(boefje_input["boefje_meta"]["environment"])
@@ -32,7 +36,10 @@ def main():
             ],
         }
 
-    httpx.post(boefje_input["output_url"], json=out)
+    try:
+        httpx.post(boefje_input["output_url"], json=out)
+    except httpx.HTTPError as e:
+        sys.exit(f"Failed to post output to boefje API: {e}")
 
 
 if __name__ == "__main__":
diff --git a/boefjes/poetry.lock b/boefjes/poetry.lock
index fcd021764f5..8b78cb9e8e7 100644
--- a/boefjes/poetry.lock
+++ b/boefjes/poetry.lock
@@ -13,87 +13,102 @@ files = [
 
 [[package]]
 name = "aiohttp"
-version = "3.10.3"
+version = "3.10.5"
 description = "Async http client/server framework (asyncio)"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "aiohttp-3.10.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cc36cbdedf6f259371dbbbcaae5bb0e95b879bc501668ab6306af867577eb5db"},
-    {file = "aiohttp-3.10.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:85466b5a695c2a7db13eb2c200af552d13e6a9313d7fa92e4ffe04a2c0ea74c1"},
-    {file = "aiohttp-3.10.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:71bb1d97bfe7e6726267cea169fdf5df7658831bb68ec02c9c6b9f3511e108bb"},
-    {file = "aiohttp-3.10.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:baec1eb274f78b2de54471fc4c69ecbea4275965eab4b556ef7a7698dee18bf2"},
-    {file = "aiohttp-3.10.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:13031e7ec1188274bad243255c328cc3019e36a5a907978501256000d57a7201"},
-    {file = "aiohttp-3.10.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2bbc55a964b8eecb341e492ae91c3bd0848324d313e1e71a27e3d96e6ee7e8e8"},
-    {file = "aiohttp-3.10.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8cc0564b286b625e673a2615ede60a1704d0cbbf1b24604e28c31ed37dc62aa"},
-    {file = "aiohttp-3.10.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f817a54059a4cfbc385a7f51696359c642088710e731e8df80d0607193ed2b73"},
-    {file = "aiohttp-3.10.3-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:8542c9e5bcb2bd3115acdf5adc41cda394e7360916197805e7e32b93d821ef93"},
-    {file = "aiohttp-3.10.3-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:671efce3a4a0281060edf9a07a2f7e6230dca3a1cbc61d110eee7753d28405f7"},
-    {file = "aiohttp-3.10.3-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:0974f3b5b0132edcec92c3306f858ad4356a63d26b18021d859c9927616ebf27"},
-    {file = "aiohttp-3.10.3-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:44bb159b55926b57812dca1b21c34528e800963ffe130d08b049b2d6b994ada7"},
-    {file = "aiohttp-3.10.3-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:6ae9ae382d1c9617a91647575255ad55a48bfdde34cc2185dd558ce476bf16e9"},
-    {file = "aiohttp-3.10.3-cp310-cp310-win32.whl", hash = "sha256:aed12a54d4e1ee647376fa541e1b7621505001f9f939debf51397b9329fd88b9"},
-    {file = "aiohttp-3.10.3-cp310-cp310-win_amd64.whl", hash = "sha256:b51aef59370baf7444de1572f7830f59ddbabd04e5292fa4218d02f085f8d299"},
-    {file = "aiohttp-3.10.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:e021c4c778644e8cdc09487d65564265e6b149896a17d7c0f52e9a088cc44e1b"},
-    {file = "aiohttp-3.10.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:24fade6dae446b183e2410a8628b80df9b7a42205c6bfc2eff783cbeedc224a2"},
-    {file = "aiohttp-3.10.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bc8e9f15939dacb0e1f2d15f9c41b786051c10472c7a926f5771e99b49a5957f"},
-    {file = "aiohttp-3.10.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5a9ec959b5381271c8ec9310aae1713b2aec29efa32e232e5ef7dcca0df0279"},
-    {file = "aiohttp-3.10.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2a5d0ea8a6467b15d53b00c4e8ea8811e47c3cc1bdbc62b1aceb3076403d551f"},
-    {file = "aiohttp-3.10.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c9ed607dbbdd0d4d39b597e5bf6b0d40d844dfb0ac6a123ed79042ef08c1f87e"},
-    {file = "aiohttp-3.10.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3e66d5b506832e56add66af88c288c1d5ba0c38b535a1a59e436b300b57b23e"},
-    {file = "aiohttp-3.10.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fda91ad797e4914cca0afa8b6cccd5d2b3569ccc88731be202f6adce39503189"},
-    {file = "aiohttp-3.10.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:61ccb867b2f2f53df6598eb2a93329b5eee0b00646ee79ea67d68844747a418e"},
-    {file = "aiohttp-3.10.3-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:6d881353264e6156f215b3cb778c9ac3184f5465c2ece5e6fce82e68946868ef"},
-    {file = "aiohttp-3.10.3-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:b031ce229114825f49cec4434fa844ccb5225e266c3e146cb4bdd025a6da52f1"},
-    {file = "aiohttp-3.10.3-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:5337cc742a03f9e3213b097abff8781f79de7190bbfaa987bd2b7ceb5bb0bdec"},
-    {file = "aiohttp-3.10.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ab3361159fd3dcd0e48bbe804006d5cfb074b382666e6c064112056eb234f1a9"},
-    {file = "aiohttp-3.10.3-cp311-cp311-win32.whl", hash = "sha256:05d66203a530209cbe40f102ebaac0b2214aba2a33c075d0bf825987c36f1f0b"},
-    {file = "aiohttp-3.10.3-cp311-cp311-win_amd64.whl", hash = "sha256:70b4a4984a70a2322b70e088d654528129783ac1ebbf7dd76627b3bd22db2f17"},
-    {file = "aiohttp-3.10.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:166de65e2e4e63357cfa8417cf952a519ac42f1654cb2d43ed76899e2319b1ee"},
-    {file = "aiohttp-3.10.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:7084876352ba3833d5d214e02b32d794e3fd9cf21fdba99cff5acabeb90d9806"},
-    {file = "aiohttp-3.10.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8d98c604c93403288591d7d6d7d6cc8a63459168f8846aeffd5b3a7f3b3e5e09"},
-    {file = "aiohttp-3.10.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d73b073a25a0bb8bf014345374fe2d0f63681ab5da4c22f9d2025ca3e3ea54fc"},
-    {file = "aiohttp-3.10.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8da6b48c20ce78f5721068f383e0e113dde034e868f1b2f5ee7cb1e95f91db57"},
-    {file = "aiohttp-3.10.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3a9dcdccf50284b1b0dc72bc57e5bbd3cc9bf019060dfa0668f63241ccc16aa7"},
-    {file = "aiohttp-3.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56fb94bae2be58f68d000d046172d8b8e6b1b571eb02ceee5535e9633dcd559c"},
-    {file = "aiohttp-3.10.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bf75716377aad2c718cdf66451c5cf02042085d84522aec1f9246d3e4b8641a6"},
-    {file = "aiohttp-3.10.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6c51ed03e19c885c8e91f574e4bbe7381793f56f93229731597e4a499ffef2a5"},
-    {file = "aiohttp-3.10.3-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b84857b66fa6510a163bb083c1199d1ee091a40163cfcbbd0642495fed096204"},
-    {file = "aiohttp-3.10.3-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:c124b9206b1befe0491f48185fd30a0dd51b0f4e0e7e43ac1236066215aff272"},
-    {file = "aiohttp-3.10.3-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:3461d9294941937f07bbbaa6227ba799bc71cc3b22c40222568dc1cca5118f68"},
-    {file = "aiohttp-3.10.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:08bd0754d257b2db27d6bab208c74601df6f21bfe4cb2ec7b258ba691aac64b3"},
-    {file = "aiohttp-3.10.3-cp312-cp312-win32.whl", hash = "sha256:7f9159ae530297f61a00116771e57516f89a3de6ba33f314402e41560872b50a"},
-    {file = "aiohttp-3.10.3-cp312-cp312-win_amd64.whl", hash = "sha256:e1128c5d3a466279cb23c4aa32a0f6cb0e7d2961e74e9e421f90e74f75ec1edf"},
-    {file = "aiohttp-3.10.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:d1100e68e70eb72eadba2b932b185ebf0f28fd2f0dbfe576cfa9d9894ef49752"},
-    {file = "aiohttp-3.10.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a541414578ff47c0a9b0b8b77381ea86b0c8531ab37fc587572cb662ccd80b88"},
-    {file = "aiohttp-3.10.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:d5548444ef60bf4c7b19ace21f032fa42d822e516a6940d36579f7bfa8513f9c"},
-    {file = "aiohttp-3.10.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ba2e838b5e6a8755ac8297275c9460e729dc1522b6454aee1766c6de6d56e5e"},
-    {file = "aiohttp-3.10.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:48665433bb59144aaf502c324694bec25867eb6630fcd831f7a893ca473fcde4"},
-    {file = "aiohttp-3.10.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bac352fceed158620ce2d701ad39d4c1c76d114255a7c530e057e2b9f55bdf9f"},
-    {file = "aiohttp-3.10.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b0f670502100cdc567188c49415bebba947eb3edaa2028e1a50dd81bd13363f"},
-    {file = "aiohttp-3.10.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43b09f38a67679e32d380fe512189ccb0b25e15afc79b23fbd5b5e48e4fc8fd9"},
-    {file = "aiohttp-3.10.3-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:cd788602e239ace64f257d1c9d39898ca65525583f0fbf0988bcba19418fe93f"},
-    {file = "aiohttp-3.10.3-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:214277dcb07ab3875f17ee1c777d446dcce75bea85846849cc9d139ab8f5081f"},
-    {file = "aiohttp-3.10.3-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:32007fdcaab789689c2ecaaf4b71f8e37bf012a15cd02c0a9db8c4d0e7989fa8"},
-    {file = "aiohttp-3.10.3-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:123e5819bfe1b87204575515cf448ab3bf1489cdeb3b61012bde716cda5853e7"},
-    {file = "aiohttp-3.10.3-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:812121a201f0c02491a5db335a737b4113151926a79ae9ed1a9f41ea225c0e3f"},
-    {file = "aiohttp-3.10.3-cp38-cp38-win32.whl", hash = "sha256:b97dc9a17a59f350c0caa453a3cb35671a2ffa3a29a6ef3568b523b9113d84e5"},
-    {file = "aiohttp-3.10.3-cp38-cp38-win_amd64.whl", hash = "sha256:3731a73ddc26969d65f90471c635abd4e1546a25299b687e654ea6d2fc052394"},
-    {file = "aiohttp-3.10.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38d91b98b4320ffe66efa56cb0f614a05af53b675ce1b8607cdb2ac826a8d58e"},
-    {file = "aiohttp-3.10.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9743fa34a10a36ddd448bba8a3adc2a66a1c575c3c2940301bacd6cc896c6bf1"},
-    {file = "aiohttp-3.10.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7c126f532caf238031c19d169cfae3c6a59129452c990a6e84d6e7b198a001dc"},
-    {file = "aiohttp-3.10.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:926e68438f05703e500b06fe7148ef3013dd6f276de65c68558fa9974eeb59ad"},
-    {file = "aiohttp-3.10.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:434b3ab75833accd0b931d11874e206e816f6e6626fd69f643d6a8269cd9166a"},
-    {file = "aiohttp-3.10.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d35235a44ec38109b811c3600d15d8383297a8fab8e3dec6147477ec8636712a"},
-    {file = "aiohttp-3.10.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59c489661edbd863edb30a8bd69ecb044bd381d1818022bc698ba1b6f80e5dd1"},
-    {file = "aiohttp-3.10.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:50544fe498c81cb98912afabfc4e4d9d85e89f86238348e3712f7ca6a2f01dab"},
-    {file = "aiohttp-3.10.3-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:09bc79275737d4dc066e0ae2951866bb36d9c6b460cb7564f111cc0427f14844"},
-    {file = "aiohttp-3.10.3-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:af4dbec58e37f5afff4f91cdf235e8e4b0bd0127a2a4fd1040e2cad3369d2f06"},
-    {file = "aiohttp-3.10.3-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:b22cae3c9dd55a6b4c48c63081d31c00fc11fa9db1a20c8a50ee38c1a29539d2"},
-    {file = "aiohttp-3.10.3-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:ba562736d3fbfe9241dad46c1a8994478d4a0e50796d80e29d50cabe8fbfcc3f"},
-    {file = "aiohttp-3.10.3-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:f25d6c4e82d7489be84f2b1c8212fafc021b3731abdb61a563c90e37cced3a21"},
-    {file = "aiohttp-3.10.3-cp39-cp39-win32.whl", hash = "sha256:b69d832e5f5fa15b1b6b2c8eb6a9fd2c0ec1fd7729cb4322ed27771afc9fc2ac"},
-    {file = "aiohttp-3.10.3-cp39-cp39-win_amd64.whl", hash = "sha256:673bb6e3249dc8825df1105f6ef74e2eab779b7ff78e96c15cadb78b04a83752"},
-    {file = "aiohttp-3.10.3.tar.gz", hash = "sha256:21650e7032cc2d31fc23d353d7123e771354f2a3d5b05a5647fc30fea214e696"},
+    {file = "aiohttp-3.10.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3"},
+    {file = "aiohttp-3.10.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6"},
+    {file = "aiohttp-3.10.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699"},
+    {file = "aiohttp-3.10.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6"},
+    {file = "aiohttp-3.10.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1"},
+    {file = "aiohttp-3.10.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f"},
+    {file = "aiohttp-3.10.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb"},
+    {file = "aiohttp-3.10.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91"},
+    {file = "aiohttp-3.10.5-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f"},
+    {file = "aiohttp-3.10.5-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c"},
+    {file = "aiohttp-3.10.5-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69"},
+    {file = "aiohttp-3.10.5-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3"},
+    {file = "aiohttp-3.10.5-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683"},
+    {file = "aiohttp-3.10.5-cp310-cp310-win32.whl", hash = "sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef"},
+    {file = "aiohttp-3.10.5-cp310-cp310-win_amd64.whl", hash = "sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088"},
+    {file = "aiohttp-3.10.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2"},
+    {file = "aiohttp-3.10.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf"},
+    {file = "aiohttp-3.10.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e"},
+    {file = "aiohttp-3.10.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77"},
+    {file = "aiohttp-3.10.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061"},
+    {file = "aiohttp-3.10.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697"},
+    {file = "aiohttp-3.10.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7"},
+    {file = "aiohttp-3.10.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0"},
+    {file = "aiohttp-3.10.5-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5"},
+    {file = "aiohttp-3.10.5-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e"},
+    {file = "aiohttp-3.10.5-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1"},
+    {file = "aiohttp-3.10.5-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277"},
+    {file = "aiohttp-3.10.5-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058"},
+    {file = "aiohttp-3.10.5-cp311-cp311-win32.whl", hash = "sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072"},
+    {file = "aiohttp-3.10.5-cp311-cp311-win_amd64.whl", hash = "sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff"},
+    {file = "aiohttp-3.10.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487"},
+    {file = "aiohttp-3.10.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a"},
+    {file = "aiohttp-3.10.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d"},
+    {file = "aiohttp-3.10.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75"},
+    {file = "aiohttp-3.10.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178"},
+    {file = "aiohttp-3.10.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e"},
+    {file = "aiohttp-3.10.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f"},
+    {file = "aiohttp-3.10.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73"},
+    {file = "aiohttp-3.10.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf"},
+    {file = "aiohttp-3.10.5-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820"},
+    {file = "aiohttp-3.10.5-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca"},
+    {file = "aiohttp-3.10.5-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91"},
+    {file = "aiohttp-3.10.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6"},
+    {file = "aiohttp-3.10.5-cp312-cp312-win32.whl", hash = "sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12"},
+    {file = "aiohttp-3.10.5-cp312-cp312-win_amd64.whl", hash = "sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc"},
+    {file = "aiohttp-3.10.5-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092"},
+    {file = "aiohttp-3.10.5-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77"},
+    {file = "aiohttp-3.10.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385"},
+    {file = "aiohttp-3.10.5-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972"},
+    {file = "aiohttp-3.10.5-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16"},
+    {file = "aiohttp-3.10.5-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6"},
+    {file = "aiohttp-3.10.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa"},
+    {file = "aiohttp-3.10.5-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689"},
+    {file = "aiohttp-3.10.5-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57"},
+    {file = "aiohttp-3.10.5-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f"},
+    {file = "aiohttp-3.10.5-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599"},
+    {file = "aiohttp-3.10.5-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5"},
+    {file = "aiohttp-3.10.5-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987"},
+    {file = "aiohttp-3.10.5-cp313-cp313-win32.whl", hash = "sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04"},
+    {file = "aiohttp-3.10.5-cp313-cp313-win_amd64.whl", hash = "sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022"},
+    {file = "aiohttp-3.10.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569"},
+    {file = "aiohttp-3.10.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a"},
+    {file = "aiohttp-3.10.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc"},
+    {file = "aiohttp-3.10.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3"},
+    {file = "aiohttp-3.10.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf"},
+    {file = "aiohttp-3.10.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe"},
+    {file = "aiohttp-3.10.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5"},
+    {file = "aiohttp-3.10.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471"},
+    {file = "aiohttp-3.10.5-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589"},
+    {file = "aiohttp-3.10.5-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae"},
+    {file = "aiohttp-3.10.5-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d"},
+    {file = "aiohttp-3.10.5-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f"},
+    {file = "aiohttp-3.10.5-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511"},
+    {file = "aiohttp-3.10.5-cp38-cp38-win32.whl", hash = "sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a"},
+    {file = "aiohttp-3.10.5-cp38-cp38-win_amd64.whl", hash = "sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8"},
+    {file = "aiohttp-3.10.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e"},
+    {file = "aiohttp-3.10.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172"},
+    {file = "aiohttp-3.10.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b"},
+    {file = "aiohttp-3.10.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b"},
+    {file = "aiohttp-3.10.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92"},
+    {file = "aiohttp-3.10.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22"},
+    {file = "aiohttp-3.10.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f"},
+    {file = "aiohttp-3.10.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32"},
+    {file = "aiohttp-3.10.5-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce"},
+    {file = "aiohttp-3.10.5-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db"},
+    {file = "aiohttp-3.10.5-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b"},
+    {file = "aiohttp-3.10.5-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857"},
+    {file = "aiohttp-3.10.5-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11"},
+    {file = "aiohttp-3.10.5-cp39-cp39-win32.whl", hash = "sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1"},
+    {file = "aiohttp-3.10.5-cp39-cp39-win_amd64.whl", hash = "sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862"},
+    {file = "aiohttp-3.10.5.tar.gz", hash = "sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691"},
 ]
 
 [package.dependencies]
@@ -293,13 +308,13 @@ rich = ">=10.16.2"
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -537,45 +552,55 @@ files = [
 docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
 testing = ["pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1)", "types-backports"]
 
+[[package]]
+name = "croniter"
+version = "3.0.3"
+description = "croniter provides iteration for datetime object with cron like format"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.6"
+files = [
+    {file = "croniter-3.0.3-py2.py3-none-any.whl", hash = "sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101"},
+    {file = "croniter-3.0.3.tar.gz", hash = "sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668"},
+]
+
+[package.dependencies]
+python-dateutil = "*"
+pytz = ">2021.1"
+
 [[package]]
 name = "cryptography"
-version = "42.0.8"
+version = "43.0.1"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e"},
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7"},
-    {file = "cryptography-42.0.8-cp37-abi3-win32.whl", hash = "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2"},
-    {file = "cryptography-42.0.8-cp37-abi3-win_amd64.whl", hash = "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba"},
-    {file = "cryptography-42.0.8-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14"},
-    {file = "cryptography-42.0.8-cp39-abi3-win32.whl", hash = "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c"},
-    {file = "cryptography-42.0.8-cp39-abi3-win_amd64.whl", hash = "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad"},
-    {file = "cryptography-42.0.8.tar.gz", hash = "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2"},
+    {file = "cryptography-43.0.1-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a"},
+    {file = "cryptography-43.0.1-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042"},
+    {file = "cryptography-43.0.1-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494"},
+    {file = "cryptography-43.0.1-cp37-abi3-win32.whl", hash = "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2"},
+    {file = "cryptography-43.0.1-cp37-abi3-win_amd64.whl", hash = "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d"},
+    {file = "cryptography-43.0.1-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1"},
+    {file = "cryptography-43.0.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa"},
+    {file = "cryptography-43.0.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4"},
+    {file = "cryptography-43.0.1-cp39-abi3-win32.whl", hash = "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47"},
+    {file = "cryptography-43.0.1-cp39-abi3-win_amd64.whl", hash = "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2"},
+    {file = "cryptography-43.0.1.tar.gz", hash = "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d"},
 ]
 
 [package.dependencies]
@@ -588,7 +613,7 @@ nox = ["nox"]
 pep8test = ["check-sdist", "click", "mypy", "ruff"]
 sdist = ["build"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["certifi", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
+test = ["certifi", "cryptography-vectors (==43.0.1)", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
 test-randomorder = ["pytest-randomly"]
 
 [[package]]
@@ -913,61 +938,61 @@ test = ["objgraph", "psutil"]
 
 [[package]]
 name = "grpcio"
-version = "1.65.4"
+version = "1.66.1"
 description = "HTTP/2-based RPC framework"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "grpcio-1.65.4-cp310-cp310-linux_armv7l.whl", hash = "sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c"},
-    {file = "grpcio-1.65.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d"},
-    {file = "grpcio-1.65.4-cp310-cp310-win32.whl", hash = "sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1"},
-    {file = "grpcio-1.65.4-cp310-cp310-win_amd64.whl", hash = "sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec"},
-    {file = "grpcio-1.65.4-cp311-cp311-linux_armv7l.whl", hash = "sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef"},
-    {file = "grpcio-1.65.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5"},
-    {file = "grpcio-1.65.4-cp311-cp311-win32.whl", hash = "sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b"},
-    {file = "grpcio-1.65.4-cp311-cp311-win_amd64.whl", hash = "sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558"},
-    {file = "grpcio-1.65.4-cp312-cp312-linux_armv7l.whl", hash = "sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56"},
-    {file = "grpcio-1.65.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28"},
-    {file = "grpcio-1.65.4-cp312-cp312-win32.whl", hash = "sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0"},
-    {file = "grpcio-1.65.4-cp312-cp312-win_amd64.whl", hash = "sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416"},
-    {file = "grpcio-1.65.4-cp38-cp38-linux_armv7l.whl", hash = "sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021"},
-    {file = "grpcio-1.65.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7"},
-    {file = "grpcio-1.65.4-cp38-cp38-win32.whl", hash = "sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a"},
-    {file = "grpcio-1.65.4-cp38-cp38-win_amd64.whl", hash = "sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f"},
-    {file = "grpcio-1.65.4-cp39-cp39-linux_armv7l.whl", hash = "sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733"},
-    {file = "grpcio-1.65.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257"},
-    {file = "grpcio-1.65.4-cp39-cp39-win32.whl", hash = "sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d"},
-    {file = "grpcio-1.65.4-cp39-cp39-win_amd64.whl", hash = "sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9"},
-    {file = "grpcio-1.65.4.tar.gz", hash = "sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39"},
+    {file = "grpcio-1.66.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492"},
+    {file = "grpcio-1.66.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d"},
+    {file = "grpcio-1.66.1-cp310-cp310-win32.whl", hash = "sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c"},
+    {file = "grpcio-1.66.1-cp310-cp310-win_amd64.whl", hash = "sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858"},
+    {file = "grpcio-1.66.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a"},
+    {file = "grpcio-1.66.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd"},
+    {file = "grpcio-1.66.1-cp311-cp311-win32.whl", hash = "sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791"},
+    {file = "grpcio-1.66.1-cp311-cp311-win_amd64.whl", hash = "sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb"},
+    {file = "grpcio-1.66.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a"},
+    {file = "grpcio-1.66.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524"},
+    {file = "grpcio-1.66.1-cp312-cp312-win32.whl", hash = "sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759"},
+    {file = "grpcio-1.66.1-cp312-cp312-win_amd64.whl", hash = "sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734"},
+    {file = "grpcio-1.66.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2"},
+    {file = "grpcio-1.66.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d"},
+    {file = "grpcio-1.66.1-cp38-cp38-win32.whl", hash = "sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3"},
+    {file = "grpcio-1.66.1-cp38-cp38-win_amd64.whl", hash = "sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce"},
+    {file = "grpcio-1.66.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503"},
+    {file = "grpcio-1.66.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c"},
+    {file = "grpcio-1.66.1-cp39-cp39-win32.whl", hash = "sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45"},
+    {file = "grpcio-1.66.1-cp39-cp39-win_amd64.whl", hash = "sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8"},
+    {file = "grpcio-1.66.1.tar.gz", hash = "sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.65.4)"]
+protobuf = ["grpcio-tools (>=1.66.1)"]
 
 [[package]]
 name = "h11"
@@ -1013,13 +1038,13 @@ files = [
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -1034,6 +1059,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
@@ -1149,153 +1175,149 @@ test = ["pytest", "pytest-cov"]
 
 [[package]]
 name = "lxml"
-version = "5.2.2"
+version = "5.3.0"
 description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "lxml-5.2.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:364d03207f3e603922d0d3932ef363d55bbf48e3647395765f9bfcbdf6d23632"},
-    {file = "lxml-5.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50127c186f191b8917ea2fb8b206fbebe87fd414a6084d15568c27d0a21d60db"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:74e4f025ef3db1c6da4460dd27c118d8cd136d0391da4e387a15e48e5c975147"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:981a06a3076997adf7c743dcd0d7a0415582661e2517c7d961493572e909aa1d"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aef5474d913d3b05e613906ba4090433c515e13ea49c837aca18bde190853dff"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1e275ea572389e41e8b039ac076a46cb87ee6b8542df3fff26f5baab43713bca"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5b65529bb2f21ac7861a0e94fdbf5dc0daab41497d18223b46ee8515e5ad297"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:bcc98f911f10278d1daf14b87d65325851a1d29153caaf146877ec37031d5f36"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:b47633251727c8fe279f34025844b3b3a3e40cd1b198356d003aa146258d13a2"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:fbc9d316552f9ef7bba39f4edfad4a734d3d6f93341232a9dddadec4f15d425f"},
-    {file = "lxml-5.2.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:13e69be35391ce72712184f69000cda04fc89689429179bc4c0ae5f0b7a8c21b"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3b6a30a9ab040b3f545b697cb3adbf3696c05a3a68aad172e3fd7ca73ab3c835"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:a233bb68625a85126ac9f1fc66d24337d6e8a0f9207b688eec2e7c880f012ec0"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:dfa7c241073d8f2b8e8dbc7803c434f57dbb83ae2a3d7892dd068d99e96efe2c"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1a7aca7964ac4bb07680d5c9d63b9d7028cace3e2d43175cb50bba8c5ad33316"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:ae4073a60ab98529ab8a72ebf429f2a8cc612619a8c04e08bed27450d52103c0"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:ffb2be176fed4457e445fe540617f0252a72a8bc56208fd65a690fdb1f57660b"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:e290d79a4107d7d794634ce3e985b9ae4f920380a813717adf61804904dc4393"},
-    {file = "lxml-5.2.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:96e85aa09274955bb6bd483eaf5b12abadade01010478154b0ec70284c1b1526"},
-    {file = "lxml-5.2.2-cp310-cp310-win32.whl", hash = "sha256:f956196ef61369f1685d14dad80611488d8dc1ef00be57c0c5a03064005b0f30"},
-    {file = "lxml-5.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:875a3f90d7eb5c5d77e529080d95140eacb3c6d13ad5b616ee8095447b1d22e7"},
-    {file = "lxml-5.2.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:45f9494613160d0405682f9eee781c7e6d1bf45f819654eb249f8f46a2c22545"},
-    {file = "lxml-5.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b0b3f2df149efb242cee2ffdeb6674b7f30d23c9a7af26595099afaf46ef4e88"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d28cb356f119a437cc58a13f8135ab8a4c8ece18159eb9194b0d269ec4e28083"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:657a972f46bbefdbba2d4f14413c0d079f9ae243bd68193cb5061b9732fa54c1"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b74b9ea10063efb77a965a8d5f4182806fbf59ed068b3c3fd6f30d2ac7bee734"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:07542787f86112d46d07d4f3c4e7c760282011b354d012dc4141cc12a68cef5f"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:303f540ad2dddd35b92415b74b900c749ec2010e703ab3bfd6660979d01fd4ed"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:2eb2227ce1ff998faf0cd7fe85bbf086aa41dfc5af3b1d80867ecfe75fb68df3"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:1d8a701774dfc42a2f0b8ccdfe7dbc140500d1049e0632a611985d943fcf12df"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:56793b7a1a091a7c286b5f4aa1fe4ae5d1446fe742d00cdf2ffb1077865db10d"},
-    {file = "lxml-5.2.2-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:eb00b549b13bd6d884c863554566095bf6fa9c3cecb2e7b399c4bc7904cb33b5"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:1a2569a1f15ae6c8c64108a2cd2b4a858fc1e13d25846be0666fc144715e32ab"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:8cf85a6e40ff1f37fe0f25719aadf443686b1ac7652593dc53c7ef9b8492b115"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:d237ba6664b8e60fd90b8549a149a74fcc675272e0e95539a00522e4ca688b04"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0b3f5016e00ae7630a4b83d0868fca1e3d494c78a75b1c7252606a3a1c5fc2ad"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:23441e2b5339bc54dc949e9e675fa35efe858108404ef9aa92f0456929ef6fe8"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:2fb0ba3e8566548d6c8e7dd82a8229ff47bd8fb8c2da237607ac8e5a1b8312e5"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:79d1fb9252e7e2cfe4de6e9a6610c7cbb99b9708e2c3e29057f487de5a9eaefa"},
-    {file = "lxml-5.2.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:6dcc3d17eac1df7859ae01202e9bb11ffa8c98949dcbeb1069c8b9a75917e01b"},
-    {file = "lxml-5.2.2-cp311-cp311-win32.whl", hash = "sha256:4c30a2f83677876465f44c018830f608fa3c6a8a466eb223535035fbc16f3438"},
-    {file = "lxml-5.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:49095a38eb333aaf44c06052fd2ec3b8f23e19747ca7ec6f6c954ffea6dbf7be"},
-    {file = "lxml-5.2.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7429e7faa1a60cad26ae4227f4dd0459efde239e494c7312624ce228e04f6391"},
-    {file = "lxml-5.2.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:50ccb5d355961c0f12f6cf24b7187dbabd5433f29e15147a67995474f27d1776"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc911208b18842a3a57266d8e51fc3cfaccee90a5351b92079beed912a7914c2"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33ce9e786753743159799fdf8e92a5da351158c4bfb6f2db0bf31e7892a1feb5"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ec87c44f619380878bd49ca109669c9f221d9ae6883a5bcb3616785fa8f94c97"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:08ea0f606808354eb8f2dfaac095963cb25d9d28e27edcc375d7b30ab01abbf6"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75a9632f1d4f698b2e6e2e1ada40e71f369b15d69baddb8968dcc8e683839b18"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74da9f97daec6928567b48c90ea2c82a106b2d500f397eeb8941e47d30b1ca85"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:0969e92af09c5687d769731e3f39ed62427cc72176cebb54b7a9d52cc4fa3b73"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:9164361769b6ca7769079f4d426a41df6164879f7f3568be9086e15baca61466"},
-    {file = "lxml-5.2.2-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:d26a618ae1766279f2660aca0081b2220aca6bd1aa06b2cf73f07383faf48927"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ab67ed772c584b7ef2379797bf14b82df9aa5f7438c5b9a09624dd834c1c1aaf"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:3d1e35572a56941b32c239774d7e9ad724074d37f90c7a7d499ab98761bd80cf"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:8268cbcd48c5375f46e000adb1390572c98879eb4f77910c6053d25cc3ac2c67"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e282aedd63c639c07c3857097fc0e236f984ceb4089a8b284da1c526491e3f3d"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6dfdc2bfe69e9adf0df4915949c22a25b39d175d599bf98e7ddf620a13678585"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4aefd911793b5d2d7a921233a54c90329bf3d4a6817dc465f12ffdfe4fc7b8fe"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:8b8df03a9e995b6211dafa63b32f9d405881518ff1ddd775db4e7b98fb545e1c"},
-    {file = "lxml-5.2.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f11ae142f3a322d44513de1018b50f474f8f736bc3cd91d969f464b5bfef8836"},
-    {file = "lxml-5.2.2-cp312-cp312-win32.whl", hash = "sha256:16a8326e51fcdffc886294c1e70b11ddccec836516a343f9ed0f82aac043c24a"},
-    {file = "lxml-5.2.2-cp312-cp312-win_amd64.whl", hash = "sha256:bbc4b80af581e18568ff07f6395c02114d05f4865c2812a1f02f2eaecf0bfd48"},
-    {file = "lxml-5.2.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e3d9d13603410b72787579769469af730c38f2f25505573a5888a94b62b920f8"},
-    {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:38b67afb0a06b8575948641c1d6d68e41b83a3abeae2ca9eed2ac59892b36706"},
-    {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c689d0d5381f56de7bd6966a4541bff6e08bf8d3871bbd89a0c6ab18aa699573"},
-    {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:cf2a978c795b54c539f47964ec05e35c05bd045db5ca1e8366988c7f2fe6b3ce"},
-    {file = "lxml-5.2.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:739e36ef7412b2bd940f75b278749106e6d025e40027c0b94a17ef7968d55d56"},
-    {file = "lxml-5.2.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d8bbcd21769594dbba9c37d3c819e2d5847656ca99c747ddb31ac1701d0c0ed9"},
-    {file = "lxml-5.2.2-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:2304d3c93f2258ccf2cf7a6ba8c761d76ef84948d87bf9664e14d203da2cd264"},
-    {file = "lxml-5.2.2-cp36-cp36m-win32.whl", hash = "sha256:02437fb7308386867c8b7b0e5bc4cd4b04548b1c5d089ffb8e7b31009b961dc3"},
-    {file = "lxml-5.2.2-cp36-cp36m-win_amd64.whl", hash = "sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196"},
-    {file = "lxml-5.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c"},
-    {file = "lxml-5.2.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f"},
-    {file = "lxml-5.2.2-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61"},
-    {file = "lxml-5.2.2-cp37-cp37m-win32.whl", hash = "sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f"},
-    {file = "lxml-5.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40"},
-    {file = "lxml-5.2.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7ed07b3062b055d7a7f9d6557a251cc655eed0b3152b76de619516621c56f5d3"},
-    {file = "lxml-5.2.2-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f60fdd125d85bf9c279ffb8e94c78c51b3b6a37711464e1f5f31078b45002421"},
-    {file = "lxml-5.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8a7e24cb69ee5f32e003f50e016d5fde438010c1022c96738b04fc2423e61706"},
-    {file = "lxml-5.2.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23cfafd56887eaed93d07bc4547abd5e09d837a002b791e9767765492a75883f"},
-    {file = "lxml-5.2.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:19b4e485cd07b7d83e3fe3b72132e7df70bfac22b14fe4bf7a23822c3a35bff5"},
-    {file = "lxml-5.2.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7ce7ad8abebe737ad6143d9d3bf94b88b93365ea30a5b81f6877ec9c0dee0a48"},
-    {file = "lxml-5.2.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e49b052b768bb74f58c7dda4e0bdf7b79d43a9204ca584ffe1fb48a6f3c84c66"},
-    {file = "lxml-5.2.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d14a0d029a4e176795cef99c056d58067c06195e0c7e2dbb293bf95c08f772a3"},
-    {file = "lxml-5.2.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:be49ad33819d7dcc28a309b86d4ed98e1a65f3075c6acd3cd4fe32103235222b"},
-    {file = "lxml-5.2.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:a6d17e0370d2516d5bb9062c7b4cb731cff921fc875644c3d751ad857ba9c5b1"},
-    {file = "lxml-5.2.2-cp38-cp38-win32.whl", hash = "sha256:5b8c041b6265e08eac8a724b74b655404070b636a8dd6d7a13c3adc07882ef30"},
-    {file = "lxml-5.2.2-cp38-cp38-win_amd64.whl", hash = "sha256:f61efaf4bed1cc0860e567d2ecb2363974d414f7f1f124b1df368bbf183453a6"},
-    {file = "lxml-5.2.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:fb91819461b1b56d06fa4bcf86617fac795f6a99d12239fb0c68dbeba41a0a30"},
-    {file = "lxml-5.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d4ed0c7cbecde7194cd3228c044e86bf73e30a23505af852857c09c24e77ec5d"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54401c77a63cc7d6dc4b4e173bb484f28a5607f3df71484709fe037c92d4f0ed"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:625e3ef310e7fa3a761d48ca7ea1f9d8718a32b1542e727d584d82f4453d5eeb"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:519895c99c815a1a24a926d5b60627ce5ea48e9f639a5cd328bda0515ea0f10c"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c7079d5eb1c1315a858bbf180000757db8ad904a89476653232db835c3114001"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:343ab62e9ca78094f2306aefed67dcfad61c4683f87eee48ff2fd74902447726"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:cd9e78285da6c9ba2d5c769628f43ef66d96ac3085e59b10ad4f3707980710d3"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_ppc64le.whl", hash = "sha256:546cf886f6242dff9ec206331209db9c8e1643ae642dea5fdbecae2453cb50fd"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_s390x.whl", hash = "sha256:02f6a8eb6512fdc2fd4ca10a49c341c4e109aa6e9448cc4859af5b949622715a"},
-    {file = "lxml-5.2.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:339ee4a4704bc724757cd5dd9dc8cf4d00980f5d3e6e06d5847c1b594ace68ab"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0a028b61a2e357ace98b1615fc03f76eb517cc028993964fe08ad514b1e8892d"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f90e552ecbad426eab352e7b2933091f2be77115bb16f09f78404861c8322981"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:d83e2d94b69bf31ead2fa45f0acdef0757fa0458a129734f59f67f3d2eb7ef32"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a02d3c48f9bb1e10c7788d92c0c7db6f2002d024ab6e74d6f45ae33e3d0288a3"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:6d68ce8e7b2075390e8ac1e1d3a99e8b6372c694bbe612632606d1d546794207"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:453d037e09a5176d92ec0fd282e934ed26d806331a8b70ab431a81e2fbabf56d"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:3b019d4ee84b683342af793b56bb35034bd749e4cbdd3d33f7d1107790f8c472"},
-    {file = "lxml-5.2.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:cb3942960f0beb9f46e2a71a3aca220d1ca32feb5a398656be934320804c0df9"},
-    {file = "lxml-5.2.2-cp39-cp39-win32.whl", hash = "sha256:ac6540c9fff6e3813d29d0403ee7a81897f1d8ecc09a8ff84d2eea70ede1cdbf"},
-    {file = "lxml-5.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:610b5c77428a50269f38a534057444c249976433f40f53e3b47e68349cca1425"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b537bd04d7ccd7c6350cdaaaad911f6312cbd61e6e6045542f781c7f8b2e99d2"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4820c02195d6dfb7b8508ff276752f6b2ff8b64ae5d13ebe02e7667e035000b9"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2a09f6184f17a80897172863a655467da2b11151ec98ba8d7af89f17bf63dae"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:76acba4c66c47d27c8365e7c10b3d8016a7da83d3191d053a58382311a8bf4e1"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b128092c927eaf485928cec0c28f6b8bead277e28acf56800e972aa2c2abd7a2"},
-    {file = "lxml-5.2.2-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ae791f6bd43305aade8c0e22f816b34f3b72b6c820477aab4d18473a37e8090b"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a2f6a1bc2460e643785a2cde17293bd7a8f990884b822f7bca47bee0a82fc66b"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e8d351ff44c1638cb6e980623d517abd9f580d2e53bfcd18d8941c052a5a009"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bec4bd9133420c5c52d562469c754f27c5c9e36ee06abc169612c959bd7dbb07"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:55ce6b6d803890bd3cc89975fca9de1dff39729b43b73cb15ddd933b8bc20484"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:8ab6a358d1286498d80fe67bd3d69fcbc7d1359b45b41e74c4a26964ca99c3f8"},
-    {file = "lxml-5.2.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:06668e39e1f3c065349c51ac27ae430719d7806c026fec462e5693b08b95696b"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9cd5323344d8ebb9fb5e96da5de5ad4ebab993bbf51674259dbe9d7a18049525"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89feb82ca055af0fe797a2323ec9043b26bc371365847dbe83c7fd2e2f181c34"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e481bba1e11ba585fb06db666bfc23dbe181dbafc7b25776156120bf12e0d5a6"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:9d6c6ea6a11ca0ff9cd0390b885984ed31157c168565702959c25e2191674a14"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:3d98de734abee23e61f6b8c2e08a88453ada7d6486dc7cdc82922a03968928db"},
-    {file = "lxml-5.2.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:69ab77a1373f1e7563e0fb5a29a8440367dec051da6c7405333699d07444f511"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:34e17913c431f5ae01d8658dbf792fdc457073dcdfbb31dc0cc6ab256e664a8d"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:05f8757b03208c3f50097761be2dea0aba02e94f0dc7023ed73a7bb14ff11eb0"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6a520b4f9974b0a0a6ed73c2154de57cdfd0c8800f4f15ab2b73238ffed0b36e"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:5e097646944b66207023bc3c634827de858aebc226d5d4d6d16f0b77566ea182"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b5e4ef22ff25bfd4ede5f8fb30f7b24446345f3e79d9b7455aef2836437bc38a"},
-    {file = "lxml-5.2.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:ff69a9a0b4b17d78170c73abe2ab12084bdf1691550c5629ad1fe7849433f324"},
-    {file = "lxml-5.2.2.tar.gz", hash = "sha256:bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87"},
+    {file = "lxml-5.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:dd36439be765e2dde7660212b5275641edbc813e7b24668831a5c8ac91180656"},
+    {file = "lxml-5.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ae5fe5c4b525aa82b8076c1a59d642c17b6e8739ecf852522c6321852178119d"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:501d0d7e26b4d261fca8132854d845e4988097611ba2531408ec91cf3fd9d20a"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb66442c2546446944437df74379e9cf9e9db353e61301d1a0e26482f43f0dd8"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9e41506fec7a7f9405b14aa2d5c8abbb4dbbd09d88f9496958b6d00cb4d45330"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f7d4a670107d75dfe5ad080bed6c341d18c4442f9378c9f58e5851e86eb79965"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41ce1f1e2c7755abfc7e759dc34d7d05fd221723ff822947132dc934d122fe22"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:44264ecae91b30e5633013fb66f6ddd05c006d3e0e884f75ce0b4755b3e3847b"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_28_ppc64le.whl", hash = "sha256:3c174dc350d3ec52deb77f2faf05c439331d6ed5e702fc247ccb4e6b62d884b7"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_28_s390x.whl", hash = "sha256:2dfab5fa6a28a0b60a20638dc48e6343c02ea9933e3279ccb132f555a62323d8"},
+    {file = "lxml-5.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b1c8c20847b9f34e98080da785bb2336ea982e7f913eed5809e5a3c872900f32"},
+    {file = "lxml-5.3.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:2c86bf781b12ba417f64f3422cfc302523ac9cd1d8ae8c0f92a1c66e56ef2e86"},
+    {file = "lxml-5.3.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:c162b216070f280fa7da844531169be0baf9ccb17263cf5a8bf876fcd3117fa5"},
+    {file = "lxml-5.3.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:36aef61a1678cb778097b4a6eeae96a69875d51d1e8f4d4b491ab3cfb54b5a03"},
+    {file = "lxml-5.3.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f65e5120863c2b266dbcc927b306c5b78e502c71edf3295dfcb9501ec96e5fc7"},
+    {file = "lxml-5.3.0-cp310-cp310-win32.whl", hash = "sha256:ef0c1fe22171dd7c7c27147f2e9c3e86f8bdf473fed75f16b0c2e84a5030ce80"},
+    {file = "lxml-5.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:052d99051e77a4f3e8482c65014cf6372e61b0a6f4fe9edb98503bb5364cfee3"},
+    {file = "lxml-5.3.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:74bcb423462233bc5d6066e4e98b0264e7c1bed7541fff2f4e34fe6b21563c8b"},
+    {file = "lxml-5.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a3d819eb6f9b8677f57f9664265d0a10dd6551d227afb4af2b9cd7bdc2ccbf18"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5b8f5db71b28b8c404956ddf79575ea77aa8b1538e8b2ef9ec877945b3f46442"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c3406b63232fc7e9b8783ab0b765d7c59e7c59ff96759d8ef9632fca27c7ee4"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2ecdd78ab768f844c7a1d4a03595038c166b609f6395e25af9b0f3f26ae1230f"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:168f2dfcfdedf611eb285efac1516c8454c8c99caf271dccda8943576b67552e"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa617107a410245b8660028a7483b68e7914304a6d4882b5ff3d2d3eb5948d8c"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:69959bd3167b993e6e710b99051265654133a98f20cec1d9b493b931942e9c16"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_28_ppc64le.whl", hash = "sha256:bd96517ef76c8654446fc3db9242d019a1bb5fe8b751ba414765d59f99210b79"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_28_s390x.whl", hash = "sha256:ab6dd83b970dc97c2d10bc71aa925b84788c7c05de30241b9e96f9b6d9ea3080"},
+    {file = "lxml-5.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:eec1bb8cdbba2925bedc887bc0609a80e599c75b12d87ae42ac23fd199445654"},
+    {file = "lxml-5.3.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:6a7095eeec6f89111d03dabfe5883a1fd54da319c94e0fb104ee8f23616b572d"},
+    {file = "lxml-5.3.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:6f651ebd0b21ec65dfca93aa629610a0dbc13dbc13554f19b0113da2e61a4763"},
+    {file = "lxml-5.3.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f422a209d2455c56849442ae42f25dbaaba1c6c3f501d58761c619c7836642ec"},
+    {file = "lxml-5.3.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:62f7fdb0d1ed2065451f086519865b4c90aa19aed51081979ecd05a21eb4d1be"},
+    {file = "lxml-5.3.0-cp311-cp311-win32.whl", hash = "sha256:c6379f35350b655fd817cd0d6cbeef7f265f3ae5fedb1caae2eb442bbeae9ab9"},
+    {file = "lxml-5.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:9c52100e2c2dbb0649b90467935c4b0de5528833c76a35ea1a2691ec9f1ee7a1"},
+    {file = "lxml-5.3.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:e99f5507401436fdcc85036a2e7dc2e28d962550afe1cbfc07c40e454256a859"},
+    {file = "lxml-5.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:384aacddf2e5813a36495233b64cb96b1949da72bef933918ba5c84e06af8f0e"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:874a216bf6afaf97c263b56371434e47e2c652d215788396f60477540298218f"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65ab5685d56914b9a2a34d67dd5488b83213d680b0c5d10b47f81da5a16b0b0e"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aac0bbd3e8dd2d9c45ceb82249e8bdd3ac99131a32b4d35c8af3cc9db1657179"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b369d3db3c22ed14c75ccd5af429086f166a19627e84a8fdade3f8f31426e52a"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c24037349665434f375645fa9d1f5304800cec574d0310f618490c871fd902b3"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:62d172f358f33a26d6b41b28c170c63886742f5b6772a42b59b4f0fa10526cb1"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_28_ppc64le.whl", hash = "sha256:c1f794c02903c2824fccce5b20c339a1a14b114e83b306ff11b597c5f71a1c8d"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_28_s390x.whl", hash = "sha256:5d6a6972b93c426ace71e0be9a6f4b2cfae9b1baed2eed2006076a746692288c"},
+    {file = "lxml-5.3.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:3879cc6ce938ff4eb4900d901ed63555c778731a96365e53fadb36437a131a99"},
+    {file = "lxml-5.3.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:74068c601baff6ff021c70f0935b0c7bc528baa8ea210c202e03757c68c5a4ff"},
+    {file = "lxml-5.3.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:ecd4ad8453ac17bc7ba3868371bffb46f628161ad0eefbd0a855d2c8c32dd81a"},
+    {file = "lxml-5.3.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:7e2f58095acc211eb9d8b5771bf04df9ff37d6b87618d1cbf85f92399c98dae8"},
+    {file = "lxml-5.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e63601ad5cd8f860aa99d109889b5ac34de571c7ee902d6812d5d9ddcc77fa7d"},
+    {file = "lxml-5.3.0-cp312-cp312-win32.whl", hash = "sha256:17e8d968d04a37c50ad9c456a286b525d78c4a1c15dd53aa46c1d8e06bf6fa30"},
+    {file = "lxml-5.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:c1a69e58a6bb2de65902051d57fde951febad631a20a64572677a1052690482f"},
+    {file = "lxml-5.3.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:8c72e9563347c7395910de6a3100a4840a75a6f60e05af5e58566868d5eb2d6a"},
+    {file = "lxml-5.3.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e92ce66cd919d18d14b3856906a61d3f6b6a8500e0794142338da644260595cd"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1d04f064bebdfef9240478f7a779e8c5dc32b8b7b0b2fc6a62e39b928d428e51"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c2fb570d7823c2bbaf8b419ba6e5662137f8166e364a8b2b91051a1fb40ab8b"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c120f43553ec759f8de1fee2f4794452b0946773299d44c36bfe18e83caf002"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:562e7494778a69086f0312ec9689f6b6ac1c6b65670ed7d0267e49f57ffa08c4"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:423b121f7e6fa514ba0c7918e56955a1d4470ed35faa03e3d9f0e3baa4c7e492"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:c00f323cc00576df6165cc9d21a4c21285fa6b9989c5c39830c3903dc4303ef3"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_28_ppc64le.whl", hash = "sha256:1fdc9fae8dd4c763e8a31e7630afef517eab9f5d5d31a278df087f307bf601f4"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_28_s390x.whl", hash = "sha256:658f2aa69d31e09699705949b5fc4719cbecbd4a97f9656a232e7d6c7be1a367"},
+    {file = "lxml-5.3.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:1473427aff3d66a3fa2199004c3e601e6c4500ab86696edffdbc84954c72d832"},
+    {file = "lxml-5.3.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a87de7dd873bf9a792bf1e58b1c3887b9264036629a5bf2d2e6579fe8e73edff"},
+    {file = "lxml-5.3.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:0d7b36afa46c97875303a94e8f3ad932bf78bace9e18e603f2085b652422edcd"},
+    {file = "lxml-5.3.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:cf120cce539453ae086eacc0130a324e7026113510efa83ab42ef3fcfccac7fb"},
+    {file = "lxml-5.3.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:df5c7333167b9674aa8ae1d4008fa4bc17a313cc490b2cca27838bbdcc6bb15b"},
+    {file = "lxml-5.3.0-cp313-cp313-win32.whl", hash = "sha256:c802e1c2ed9f0c06a65bc4ed0189d000ada8049312cfeab6ca635e39c9608957"},
+    {file = "lxml-5.3.0-cp313-cp313-win_amd64.whl", hash = "sha256:406246b96d552e0503e17a1006fd27edac678b3fcc9f1be71a2f94b4ff61528d"},
+    {file = "lxml-5.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8f0de2d390af441fe8b2c12626d103540b5d850d585b18fcada58d972b74a74e"},
+    {file = "lxml-5.3.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1afe0a8c353746e610bd9031a630a95bcfb1a720684c3f2b36c4710a0a96528f"},
+    {file = "lxml-5.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56b9861a71575f5795bde89256e7467ece3d339c9b43141dbdd54544566b3b94"},
+    {file = "lxml-5.3.0-cp36-cp36m-manylinux_2_28_x86_64.whl", hash = "sha256:9fb81d2824dff4f2e297a276297e9031f46d2682cafc484f49de182aa5e5df99"},
+    {file = "lxml-5.3.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:2c226a06ecb8cdef28845ae976da407917542c5e6e75dcac7cc33eb04aaeb237"},
+    {file = "lxml-5.3.0-cp36-cp36m-musllinux_1_2_x86_64.whl", hash = "sha256:7d3d1ca42870cdb6d0d29939630dbe48fa511c203724820fc0fd507b2fb46577"},
+    {file = "lxml-5.3.0-cp36-cp36m-win32.whl", hash = "sha256:094cb601ba9f55296774c2d57ad68730daa0b13dc260e1f941b4d13678239e70"},
+    {file = "lxml-5.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:eafa2c8658f4e560b098fe9fc54539f86528651f61849b22111a9b107d18910c"},
+    {file = "lxml-5.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:cb83f8a875b3d9b458cada4f880fa498646874ba4011dc974e071a0a84a1b033"},
+    {file = "lxml-5.3.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:25f1b69d41656b05885aa185f5fdf822cb01a586d1b32739633679699f220391"},
+    {file = "lxml-5.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23e0553b8055600b3bf4a00b255ec5c92e1e4aebf8c2c09334f8368e8bd174d6"},
+    {file = "lxml-5.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9ada35dd21dc6c039259596b358caab6b13f4db4d4a7f8665764d616daf9cc1d"},
+    {file = "lxml-5.3.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:81b4e48da4c69313192d8c8d4311e5d818b8be1afe68ee20f6385d0e96fc9512"},
+    {file = "lxml-5.3.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:2bc9fd5ca4729af796f9f59cd8ff160fe06a474da40aca03fcc79655ddee1a8b"},
+    {file = "lxml-5.3.0-cp37-cp37m-musllinux_1_2_aarch64.whl", hash = "sha256:07da23d7ee08577760f0a71d67a861019103e4812c87e2fab26b039054594cc5"},
+    {file = "lxml-5.3.0-cp37-cp37m-musllinux_1_2_x86_64.whl", hash = "sha256:ea2e2f6f801696ad7de8aec061044d6c8c0dd4037608c7cab38a9a4d316bfb11"},
+    {file = "lxml-5.3.0-cp37-cp37m-win32.whl", hash = "sha256:5c54afdcbb0182d06836cc3d1be921e540be3ebdf8b8a51ee3ef987537455f84"},
+    {file = "lxml-5.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:f2901429da1e645ce548bf9171784c0f74f0718c3f6150ce166be39e4dd66c3e"},
+    {file = "lxml-5.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c56a1d43b2f9ee4786e4658c7903f05da35b923fb53c11025712562d5cc02753"},
+    {file = "lxml-5.3.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ee8c39582d2652dcd516d1b879451500f8db3fe3607ce45d7c5957ab2596040"},
+    {file = "lxml-5.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fdf3a3059611f7585a78ee10399a15566356116a4288380921a4b598d807a22"},
+    {file = "lxml-5.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:146173654d79eb1fc97498b4280c1d3e1e5d58c398fa530905c9ea50ea849b22"},
+    {file = "lxml-5.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:0a7056921edbdd7560746f4221dca89bb7a3fe457d3d74267995253f46343f15"},
+    {file = "lxml-5.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:9e4b47ac0f5e749cfc618efdf4726269441014ae1d5583e047b452a32e221920"},
+    {file = "lxml-5.3.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:f914c03e6a31deb632e2daa881fe198461f4d06e57ac3d0e05bbcab8eae01945"},
+    {file = "lxml-5.3.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:213261f168c5e1d9b7535a67e68b1f59f92398dd17a56d934550837143f79c42"},
+    {file = "lxml-5.3.0-cp38-cp38-win32.whl", hash = "sha256:218c1b2e17a710e363855594230f44060e2025b05c80d1f0661258142b2add2e"},
+    {file = "lxml-5.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:315f9542011b2c4e1d280e4a20ddcca1761993dda3afc7a73b01235f8641e903"},
+    {file = "lxml-5.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1ffc23010330c2ab67fac02781df60998ca8fe759e8efde6f8b756a20599c5de"},
+    {file = "lxml-5.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2b3778cb38212f52fac9fe913017deea2fdf4eb1a4f8e4cfc6b009a13a6d3fcc"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b0c7a688944891086ba192e21c5229dea54382f4836a209ff8d0a660fac06be"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:747a3d3e98e24597981ca0be0fd922aebd471fa99d0043a3842d00cdcad7ad6a"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86a6b24b19eaebc448dc56b87c4865527855145d851f9fc3891673ff97950540"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b11a5d918a6216e521c715b02749240fb07ae5a1fefd4b7bf12f833bc8b4fe70"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68b87753c784d6acb8a25b05cb526c3406913c9d988d51f80adecc2b0775d6aa"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:109fa6fede314cc50eed29e6e56c540075e63d922455346f11e4d7a036d2b8cf"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_28_ppc64le.whl", hash = "sha256:02ced472497b8362c8e902ade23e3300479f4f43e45f4105c85ef43b8db85229"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_28_s390x.whl", hash = "sha256:6b038cc86b285e4f9fea2ba5ee76e89f21ed1ea898e287dc277a25884f3a7dfe"},
+    {file = "lxml-5.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:7437237c6a66b7ca341e868cda48be24b8701862757426852c9b3186de1da8a2"},
+    {file = "lxml-5.3.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7f41026c1d64043a36fda21d64c5026762d53a77043e73e94b71f0521939cc71"},
+    {file = "lxml-5.3.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:482c2f67761868f0108b1743098640fbb2a28a8e15bf3f47ada9fa59d9fe08c3"},
+    {file = "lxml-5.3.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:1483fd3358963cc5c1c9b122c80606a3a79ee0875bcac0204149fa09d6ff2727"},
+    {file = "lxml-5.3.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:2dec2d1130a9cda5b904696cec33b2cfb451304ba9081eeda7f90f724097300a"},
+    {file = "lxml-5.3.0-cp39-cp39-win32.whl", hash = "sha256:a0eabd0a81625049c5df745209dc7fcef6e2aea7793e5f003ba363610aa0a3ff"},
+    {file = "lxml-5.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:89e043f1d9d341c52bf2af6d02e6adde62e0a46e6755d5eb60dc6e4f0b8aeca2"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-macosx_10_15_x86_64.whl", hash = "sha256:7b1cd427cb0d5f7393c31b7496419da594fe600e6fdc4b105a54f82405e6626c"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:51806cfe0279e06ed8500ce19479d757db42a30fd509940b1701be9c86a5ff9a"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ee70d08fd60c9565ba8190f41a46a54096afa0eeb8f76bd66f2c25d3b1b83005"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:8dc2c0395bea8254d8daebc76dcf8eb3a95ec2a46fa6fae5eaccee366bfe02ce"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:6ba0d3dcac281aad8a0e5b14c7ed6f9fa89c8612b47939fc94f80b16e2e9bc83"},
+    {file = "lxml-5.3.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:6e91cf736959057f7aac7adfc83481e03615a8e8dd5758aa1d95ea69e8931dba"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:94d6c3782907b5e40e21cadf94b13b0842ac421192f26b84c45f13f3c9d5dc27"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c300306673aa0f3ed5ed9372b21867690a17dba38c68c44b287437c362ce486b"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78d9b952e07aed35fe2e1a7ad26e929595412db48535921c5013edc8aa4a35ce"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:01220dca0d066d1349bd6a1726856a78f7929f3878f7e2ee83c296c69495309e"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:2d9b8d9177afaef80c53c0a9e30fa252ff3036fb1c6494d427c066a4ce6a282f"},
+    {file = "lxml-5.3.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:20094fc3f21ea0a8669dc4c61ed7fa8263bd37d97d93b90f28fc613371e7a875"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ace2c2326a319a0bb8a8b0e5b570c764962e95818de9f259ce814ee666603f19"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:92e67a0be1639c251d21e35fe74df6bcc40cba445c2cda7c4a967656733249e2"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd5350b55f9fecddc51385463a4f67a5da829bc741e38cf689f38ec9023f54ab"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c1fefd7e3d00921c44dc9ca80a775af49698bbfd92ea84498e56acffd4c5469"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:71a8dd38fbd2f2319136d4ae855a7078c69c9a38ae06e0c17c73fd70fc6caad8"},
+    {file = "lxml-5.3.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:97acf1e1fd66ab53dacd2c35b319d7e548380c2e9e8c54525c6e76d21b1ae3b1"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-macosx_10_15_x86_64.whl", hash = "sha256:68934b242c51eb02907c5b81d138cb977b2129a0a75a8f8b60b01cb8586c7b21"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b710bc2b8292966b23a6a0121f7a6c51d45d2347edcc75f016ac123b8054d3f2"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18feb4b93302091b1541221196a2155aa296c363fd233814fa11e181adebc52f"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:3eb44520c4724c2e1a57c0af33a379eee41792595023f367ba3952a2d96c2aab"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:609251a0ca4770e5a8768ff902aa02bf636339c5a93f9349b48eb1f606f7f3e9"},
+    {file = "lxml-5.3.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:516f491c834eb320d6c843156440fe7fc0d50b33e44387fcec5b02f0bc118a4c"},
+    {file = "lxml-5.3.0.tar.gz", hash = "sha256:4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f"},
 ]
 
 [package.extras]
@@ -1303,7 +1325,7 @@ cssselect = ["cssselect (>=0.7)"]
 html-clean = ["lxml-html-clean"]
 html5 = ["html5lib"]
 htmlsoup = ["BeautifulSoup4"]
-source = ["Cython (>=3.0.10)"]
+source = ["Cython (>=3.0.11)"]
 
 [[package]]
 name = "mako"
@@ -1611,103 +1633,108 @@ files = [
 
 [[package]]
 name = "multidict"
-version = "6.0.5"
+version = "6.1.0"
 description = "multidict implementation"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9"},
-    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604"},
-    {file = "multidict-6.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc"},
-    {file = "multidict-6.0.5-cp310-cp310-win32.whl", hash = "sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319"},
-    {file = "multidict-6.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e"},
-    {file = "multidict-6.0.5-cp311-cp311-win32.whl", hash = "sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c"},
-    {file = "multidict-6.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda"},
-    {file = "multidict-6.0.5-cp312-cp312-win32.whl", hash = "sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5"},
-    {file = "multidict-6.0.5-cp312-cp312-win_amd64.whl", hash = "sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556"},
-    {file = "multidict-6.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc"},
-    {file = "multidict-6.0.5-cp37-cp37m-win32.whl", hash = "sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee"},
-    {file = "multidict-6.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44"},
-    {file = "multidict-6.0.5-cp38-cp38-win32.whl", hash = "sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241"},
-    {file = "multidict-6.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c"},
-    {file = "multidict-6.0.5-cp39-cp39-win32.whl", hash = "sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b"},
-    {file = "multidict-6.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755"},
-    {file = "multidict-6.0.5-py3-none-any.whl", hash = "sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7"},
-    {file = "multidict-6.0.5.tar.gz", hash = "sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da"},
+    {file = "multidict-6.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3380252550e372e8511d49481bd836264c009adb826b23fefcc5dd3c69692f60"},
+    {file = "multidict-6.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:99f826cbf970077383d7de805c0681799491cb939c25450b9b5b3ced03ca99f1"},
+    {file = "multidict-6.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a114d03b938376557927ab23f1e950827c3b893ccb94b62fd95d430fd0e5cf53"},
+    {file = "multidict-6.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1c416351ee6271b2f49b56ad7f308072f6f44b37118d69c2cad94f3fa8a40d5"},
+    {file = "multidict-6.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6b5d83030255983181005e6cfbac1617ce9746b219bc2aad52201ad121226581"},
+    {file = "multidict-6.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3e97b5e938051226dc025ec80980c285b053ffb1e25a3db2a3aa3bc046bf7f56"},
+    {file = "multidict-6.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d618649d4e70ac6efcbba75be98b26ef5078faad23592f9b51ca492953012429"},
+    {file = "multidict-6.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10524ebd769727ac77ef2278390fb0068d83f3acb7773792a5080f2b0abf7748"},
+    {file = "multidict-6.1.0-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:ff3827aef427c89a25cc96ded1759271a93603aba9fb977a6d264648ebf989db"},
+    {file = "multidict-6.1.0-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:06809f4f0f7ab7ea2cabf9caca7d79c22c0758b58a71f9d32943ae13c7ace056"},
+    {file = "multidict-6.1.0-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:f179dee3b863ab1c59580ff60f9d99f632f34ccb38bf67a33ec6b3ecadd0fd76"},
+    {file = "multidict-6.1.0-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:aaed8b0562be4a0876ee3b6946f6869b7bcdb571a5d1496683505944e268b160"},
+    {file = "multidict-6.1.0-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:3c8b88a2ccf5493b6c8da9076fb151ba106960a2df90c2633f342f120751a9e7"},
+    {file = "multidict-6.1.0-cp310-cp310-win32.whl", hash = "sha256:4a9cb68166a34117d6646c0023c7b759bf197bee5ad4272f420a0141d7eb03a0"},
+    {file = "multidict-6.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:20b9b5fbe0b88d0bdef2012ef7dee867f874b72528cf1d08f1d59b0e3850129d"},
+    {file = "multidict-6.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:3efe2c2cb5763f2f1b275ad2bf7a287d3f7ebbef35648a9726e3b69284a4f3d6"},
+    {file = "multidict-6.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c7053d3b0353a8b9de430a4f4b4268ac9a4fb3481af37dfe49825bf45ca24156"},
+    {file = "multidict-6.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:27e5fc84ccef8dfaabb09d82b7d179c7cf1a3fbc8a966f8274fcb4ab2eb4cadb"},
+    {file = "multidict-6.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e2b90b43e696f25c62656389d32236e049568b39320e2735d51f08fd362761b"},
+    {file = "multidict-6.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d83a047959d38a7ff552ff94be767b7fd79b831ad1cd9920662db05fec24fe72"},
+    {file = "multidict-6.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d1a9dd711d0877a1ece3d2e4fea11a8e75741ca21954c919406b44e7cf971304"},
+    {file = "multidict-6.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ec2abea24d98246b94913b76a125e855eb5c434f7c46546046372fe60f666351"},
+    {file = "multidict-6.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4867cafcbc6585e4b678876c489b9273b13e9fff9f6d6d66add5e15d11d926cb"},
+    {file = "multidict-6.1.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:5b48204e8d955c47c55b72779802b219a39acc3ee3d0116d5080c388970b76e3"},
+    {file = "multidict-6.1.0-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:d8fff389528cad1618fb4b26b95550327495462cd745d879a8c7c2115248e399"},
+    {file = "multidict-6.1.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:a7a9541cd308eed5e30318430a9c74d2132e9a8cb46b901326272d780bf2d423"},
+    {file = "multidict-6.1.0-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:da1758c76f50c39a2efd5e9859ce7d776317eb1dd34317c8152ac9251fc574a3"},
+    {file = "multidict-6.1.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c943a53e9186688b45b323602298ab727d8865d8c9ee0b17f8d62d14b56f0753"},
+    {file = "multidict-6.1.0-cp311-cp311-win32.whl", hash = "sha256:90f8717cb649eea3504091e640a1b8568faad18bd4b9fcd692853a04475a4b80"},
+    {file = "multidict-6.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:82176036e65644a6cc5bd619f65f6f19781e8ec2e5330f51aa9ada7504cc1926"},
+    {file = "multidict-6.1.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:b04772ed465fa3cc947db808fa306d79b43e896beb677a56fb2347ca1a49c1fa"},
+    {file = "multidict-6.1.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6180c0ae073bddeb5a97a38c03f30c233e0a4d39cd86166251617d1bbd0af436"},
+    {file = "multidict-6.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:071120490b47aa997cca00666923a83f02c7fbb44f71cf7f136df753f7fa8761"},
+    {file = "multidict-6.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50b3a2710631848991d0bf7de077502e8994c804bb805aeb2925a981de58ec2e"},
+    {file = "multidict-6.1.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b58c621844d55e71c1b7f7c498ce5aa6985d743a1a59034c57a905b3f153c1ef"},
+    {file = "multidict-6.1.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55b6d90641869892caa9ca42ff913f7ff1c5ece06474fbd32fb2cf6834726c95"},
+    {file = "multidict-6.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b820514bfc0b98a30e3d85462084779900347e4d49267f747ff54060cc33925"},
+    {file = "multidict-6.1.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:10a9b09aba0c5b48c53761b7c720aaaf7cf236d5fe394cd399c7ba662d5f9966"},
+    {file = "multidict-6.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1e16bf3e5fc9f44632affb159d30a437bfe286ce9e02754759be5536b169b305"},
+    {file = "multidict-6.1.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:76f364861c3bfc98cbbcbd402d83454ed9e01a5224bb3a28bf70002a230f73e2"},
+    {file = "multidict-6.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:820c661588bd01a0aa62a1283f20d2be4281b086f80dad9e955e690c75fb54a2"},
+    {file = "multidict-6.1.0-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:0e5f362e895bc5b9e67fe6e4ded2492d8124bdf817827f33c5b46c2fe3ffaca6"},
+    {file = "multidict-6.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:3ec660d19bbc671e3a6443325f07263be452c453ac9e512f5eb935e7d4ac28b3"},
+    {file = "multidict-6.1.0-cp312-cp312-win32.whl", hash = "sha256:58130ecf8f7b8112cdb841486404f1282b9c86ccb30d3519faf301b2e5659133"},
+    {file = "multidict-6.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:188215fc0aafb8e03341995e7c4797860181562380f81ed0a87ff455b70bf1f1"},
+    {file = "multidict-6.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008"},
+    {file = "multidict-6.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f"},
+    {file = "multidict-6.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28"},
+    {file = "multidict-6.1.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b"},
+    {file = "multidict-6.1.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c"},
+    {file = "multidict-6.1.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3"},
+    {file = "multidict-6.1.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44"},
+    {file = "multidict-6.1.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2"},
+    {file = "multidict-6.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3"},
+    {file = "multidict-6.1.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa"},
+    {file = "multidict-6.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa"},
+    {file = "multidict-6.1.0-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4"},
+    {file = "multidict-6.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6"},
+    {file = "multidict-6.1.0-cp313-cp313-win32.whl", hash = "sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81"},
+    {file = "multidict-6.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774"},
+    {file = "multidict-6.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:db7457bac39421addd0c8449933ac32d8042aae84a14911a757ae6ca3eef1392"},
+    {file = "multidict-6.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d094ddec350a2fb899fec68d8353c78233debde9b7d8b4beeafa70825f1c281a"},
+    {file = "multidict-6.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5845c1fd4866bb5dd3125d89b90e57ed3138241540897de748cdf19de8a2fca2"},
+    {file = "multidict-6.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9079dfc6a70abe341f521f78405b8949f96db48da98aeb43f9907f342f627cdc"},
+    {file = "multidict-6.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3914f5aaa0f36d5d60e8ece6a308ee1c9784cd75ec8151062614657a114c4478"},
+    {file = "multidict-6.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c08be4f460903e5a9d0f76818db3250f12e9c344e79314d1d570fc69d7f4eae4"},
+    {file = "multidict-6.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d093be959277cb7dee84b801eb1af388b6ad3ca6a6b6bf1ed7585895789d027d"},
+    {file = "multidict-6.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3702ea6872c5a2a4eeefa6ffd36b042e9773f05b1f37ae3ef7264b1163c2dcf6"},
+    {file = "multidict-6.1.0-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:2090f6a85cafc5b2db085124d752757c9d251548cedabe9bd31afe6363e0aff2"},
+    {file = "multidict-6.1.0-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:f67f217af4b1ff66c68a87318012de788dd95fcfeb24cc889011f4e1c7454dfd"},
+    {file = "multidict-6.1.0-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:189f652a87e876098bbc67b4da1049afb5f5dfbaa310dd67c594b01c10388db6"},
+    {file = "multidict-6.1.0-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:6bb5992037f7a9eff7991ebe4273ea7f51f1c1c511e6a2ce511d0e7bdb754492"},
+    {file = "multidict-6.1.0-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:ac10f4c2b9e770c4e393876e35a7046879d195cd123b4f116d299d442b335bcd"},
+    {file = "multidict-6.1.0-cp38-cp38-win32.whl", hash = "sha256:e27bbb6d14416713a8bd7aaa1313c0fc8d44ee48d74497a0ff4c3a1b6ccb5167"},
+    {file = "multidict-6.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:22f3105d4fb15c8f57ff3959a58fcab6ce36814486500cd7485651230ad4d4ef"},
+    {file = "multidict-6.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:4e18b656c5e844539d506a0a06432274d7bd52a7487e6828c63a63d69185626c"},
+    {file = "multidict-6.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a185f876e69897a6f3325c3f19f26a297fa058c5e456bfcff8015e9a27e83ae1"},
+    {file = "multidict-6.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ab7c4ceb38d91570a650dba194e1ca87c2b543488fe9309b4212694174fd539c"},
+    {file = "multidict-6.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e617fb6b0b6953fffd762669610c1c4ffd05632c138d61ac7e14ad187870669c"},
+    {file = "multidict-6.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:16e5f4bf4e603eb1fdd5d8180f1a25f30056f22e55ce51fb3d6ad4ab29f7d96f"},
+    {file = "multidict-6.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c035da3f544b1882bac24115f3e2e8760f10a0107614fc9839fd232200b875"},
+    {file = "multidict-6.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:957cf8e4b6e123a9eea554fa7ebc85674674b713551de587eb318a2df3e00255"},
+    {file = "multidict-6.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:483a6aea59cb89904e1ceabd2b47368b5600fb7de78a6e4a2c2987b2d256cf30"},
+    {file = "multidict-6.1.0-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:87701f25a2352e5bf7454caa64757642734da9f6b11384c1f9d1a8e699758057"},
+    {file = "multidict-6.1.0-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:682b987361e5fd7a139ed565e30d81fd81e9629acc7d925a205366877d8c8657"},
+    {file = "multidict-6.1.0-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:ce2186a7df133a9c895dea3331ddc5ddad42cdd0d1ea2f0a51e5d161e4762f28"},
+    {file = "multidict-6.1.0-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:9f636b730f7e8cb19feb87094949ba54ee5357440b9658b2a32a5ce4bce53972"},
+    {file = "multidict-6.1.0-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:73eae06aa53af2ea5270cc066dcaf02cc60d2994bbb2c4ef5764949257d10f43"},
+    {file = "multidict-6.1.0-cp39-cp39-win32.whl", hash = "sha256:1ca0083e80e791cffc6efce7660ad24af66c8d4079d2a750b29001b53ff59ada"},
+    {file = "multidict-6.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:aa466da5b15ccea564bdab9c89175c762bc12825f4659c11227f515cee76fa4a"},
+    {file = "multidict-6.1.0-py3-none-any.whl", hash = "sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506"},
+    {file = "multidict-6.1.0.tar.gz", hash = "sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a"},
 ]
 
+[package.dependencies]
+typing-extensions = {version = ">=4.1.0", markers = "python_version < \"3.11\""}
+
 [[package]]
 name = "netaddr"
 version = "0.9.0"
@@ -2155,18 +2182,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -2174,103 +2201,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -2278,13 +2306,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.4.0"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.4.0-py3-none-any.whl", hash = "sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315"},
-    {file = "pydantic_settings-2.4.0.tar.gz", hash = "sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -2409,6 +2437,23 @@ tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 [package.extras]
 test = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "pytest-mock (>=3.12)"]
 
+[[package]]
+name = "pytest-mock"
+version = "3.14.0"
+description = "Thin-wrapper around the mock package for easier use with pytest"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "pytest-mock-3.14.0.tar.gz", hash = "sha256:2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0"},
+    {file = "pytest_mock-3.14.0-py3-none-any.whl", hash = "sha256:0b72c38033392a5f4621342fe11e9219ac11ec9d375f8e2a0c164539e0d70f6f"},
+]
+
+[package.dependencies]
+pytest = ">=6.2.5"
+
+[package.extras]
+dev = ["pre-commit", "pytest-asyncio", "tox"]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"
@@ -2477,6 +2522,17 @@ url = "https://github.com/chorsley/python-Wappalyzer.git"
 reference = "0.4.0"
 resolved_reference = "ac651718af77804e52b826944933be831d491387"
 
+[[package]]
+name = "pytz"
+version = "2024.2"
+description = "World timezone definitions, modern and historical"
+optional = false
+python-versions = "*"
+files = [
+    {file = "pytz-2024.2-py2.py3-none-any.whl", hash = "sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725"},
+    {file = "pytz-2024.2.tar.gz", hash = "sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a"},
+]
+
 [[package]]
 name = "pywin32"
 version = "306"
@@ -2915,13 +2971,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.2"
+version = "2.2.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
-    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
+    {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
+    {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 ]
 
 [package.extras]
@@ -3071,101 +3127,103 @@ files = [
 
 [[package]]
 name = "yarl"
-version = "1.9.4"
+version = "1.11.1"
 description = "Yet another URL library"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e"},
-    {file = "yarl-1.9.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2"},
-    {file = "yarl-1.9.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66"},
-    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234"},
-    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392"},
-    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551"},
-    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455"},
-    {file = "yarl-1.9.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c"},
-    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53"},
-    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385"},
-    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863"},
-    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b"},
-    {file = "yarl-1.9.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541"},
-    {file = "yarl-1.9.4-cp310-cp310-win32.whl", hash = "sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d"},
-    {file = "yarl-1.9.4-cp310-cp310-win_amd64.whl", hash = "sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b"},
-    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099"},
-    {file = "yarl-1.9.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c"},
-    {file = "yarl-1.9.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0"},
-    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525"},
-    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8"},
-    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9"},
-    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42"},
-    {file = "yarl-1.9.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe"},
-    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce"},
-    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9"},
-    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572"},
-    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958"},
-    {file = "yarl-1.9.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98"},
-    {file = "yarl-1.9.4-cp311-cp311-win32.whl", hash = "sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31"},
-    {file = "yarl-1.9.4-cp311-cp311-win_amd64.whl", hash = "sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1"},
-    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81"},
-    {file = "yarl-1.9.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142"},
-    {file = "yarl-1.9.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074"},
-    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129"},
-    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2"},
-    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78"},
-    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4"},
-    {file = "yarl-1.9.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0"},
-    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51"},
-    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff"},
-    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7"},
-    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc"},
-    {file = "yarl-1.9.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10"},
-    {file = "yarl-1.9.4-cp312-cp312-win32.whl", hash = "sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7"},
-    {file = "yarl-1.9.4-cp312-cp312-win_amd64.whl", hash = "sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984"},
-    {file = "yarl-1.9.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f"},
-    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17"},
-    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14"},
-    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5"},
-    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd"},
-    {file = "yarl-1.9.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7"},
-    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e"},
-    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec"},
-    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c"},
-    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead"},
-    {file = "yarl-1.9.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434"},
-    {file = "yarl-1.9.4-cp37-cp37m-win32.whl", hash = "sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749"},
-    {file = "yarl-1.9.4-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2"},
-    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be"},
-    {file = "yarl-1.9.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f"},
-    {file = "yarl-1.9.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf"},
-    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1"},
-    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57"},
-    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa"},
-    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130"},
-    {file = "yarl-1.9.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559"},
-    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23"},
-    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec"},
-    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78"},
-    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be"},
-    {file = "yarl-1.9.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3"},
-    {file = "yarl-1.9.4-cp38-cp38-win32.whl", hash = "sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece"},
-    {file = "yarl-1.9.4-cp38-cp38-win_amd64.whl", hash = "sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b"},
-    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27"},
-    {file = "yarl-1.9.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1"},
-    {file = "yarl-1.9.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91"},
-    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b"},
-    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5"},
-    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34"},
-    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136"},
-    {file = "yarl-1.9.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7"},
-    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e"},
-    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4"},
-    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec"},
-    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c"},
-    {file = "yarl-1.9.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0"},
-    {file = "yarl-1.9.4-cp39-cp39-win32.whl", hash = "sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575"},
-    {file = "yarl-1.9.4-cp39-cp39-win_amd64.whl", hash = "sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15"},
-    {file = "yarl-1.9.4-py3-none-any.whl", hash = "sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad"},
-    {file = "yarl-1.9.4.tar.gz", hash = "sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf"},
+    {file = "yarl-1.11.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:400cd42185f92de559d29eeb529e71d80dfbd2f45c36844914a4a34297ca6f00"},
+    {file = "yarl-1.11.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8258c86f47e080a258993eed877d579c71da7bda26af86ce6c2d2d072c11320d"},
+    {file = "yarl-1.11.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2164cd9725092761fed26f299e3f276bb4b537ca58e6ff6b252eae9631b5c96e"},
+    {file = "yarl-1.11.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08ea567c16f140af8ddc7cb58e27e9138a1386e3e6e53982abaa6f2377b38cc"},
+    {file = "yarl-1.11.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:768ecc550096b028754ea28bf90fde071c379c62c43afa574edc6f33ee5daaec"},
+    {file = "yarl-1.11.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2909fa3a7d249ef64eeb2faa04b7957e34fefb6ec9966506312349ed8a7e77bf"},
+    {file = "yarl-1.11.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01a8697ec24f17c349c4f655763c4db70eebc56a5f82995e5e26e837c6eb0e49"},
+    {file = "yarl-1.11.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e286580b6511aac7c3268a78cdb861ec739d3e5a2a53b4809faef6b49778eaff"},
+    {file = "yarl-1.11.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:4179522dc0305c3fc9782549175c8e8849252fefeb077c92a73889ccbcd508ad"},
+    {file = "yarl-1.11.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:27fcb271a41b746bd0e2a92182df507e1c204759f460ff784ca614e12dd85145"},
+    {file = "yarl-1.11.1-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:f61db3b7e870914dbd9434b560075e0366771eecbe6d2b5561f5bc7485f39efd"},
+    {file = "yarl-1.11.1-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:c92261eb2ad367629dc437536463dc934030c9e7caca861cc51990fe6c565f26"},
+    {file = "yarl-1.11.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:d95b52fbef190ca87d8c42f49e314eace4fc52070f3dfa5f87a6594b0c1c6e46"},
+    {file = "yarl-1.11.1-cp310-cp310-win32.whl", hash = "sha256:489fa8bde4f1244ad6c5f6d11bb33e09cf0d1d0367edb197619c3e3fc06f3d91"},
+    {file = "yarl-1.11.1-cp310-cp310-win_amd64.whl", hash = "sha256:476e20c433b356e16e9a141449f25161e6b69984fb4cdbd7cd4bd54c17844998"},
+    {file = "yarl-1.11.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:946eedc12895873891aaceb39bceb484b4977f70373e0122da483f6c38faaa68"},
+    {file = "yarl-1.11.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:21a7c12321436b066c11ec19c7e3cb9aec18884fe0d5b25d03d756a9e654edfe"},
+    {file = "yarl-1.11.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c35f493b867912f6fda721a59cc7c4766d382040bdf1ddaeeaa7fa4d072f4675"},
+    {file = "yarl-1.11.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25861303e0be76b60fddc1250ec5986c42f0a5c0c50ff57cc30b1be199c00e63"},
+    {file = "yarl-1.11.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e4b53f73077e839b3f89c992223f15b1d2ab314bdbdf502afdc7bb18e95eae27"},
+    {file = "yarl-1.11.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:327c724b01b8641a1bf1ab3b232fb638706e50f76c0b5bf16051ab65c868fac5"},
+    {file = "yarl-1.11.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4307d9a3417eea87715c9736d050c83e8c1904e9b7aada6ce61b46361b733d92"},
+    {file = "yarl-1.11.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48a28bed68ab8fb7e380775f0029a079f08a17799cb3387a65d14ace16c12e2b"},
+    {file = "yarl-1.11.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:067b961853c8e62725ff2893226fef3d0da060656a9827f3f520fb1d19b2b68a"},
+    {file = "yarl-1.11.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8215f6f21394d1f46e222abeb06316e77ef328d628f593502d8fc2a9117bde83"},
+    {file = "yarl-1.11.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:498442e3af2a860a663baa14fbf23fb04b0dd758039c0e7c8f91cb9279799bff"},
+    {file = "yarl-1.11.1-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:69721b8effdb588cb055cc22f7c5105ca6fdaa5aeb3ea09021d517882c4a904c"},
+    {file = "yarl-1.11.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1e969fa4c1e0b1a391f3fcbcb9ec31e84440253325b534519be0d28f4b6b533e"},
+    {file = "yarl-1.11.1-cp311-cp311-win32.whl", hash = "sha256:7d51324a04fc4b0e097ff8a153e9276c2593106a811704025bbc1d6916f45ca6"},
+    {file = "yarl-1.11.1-cp311-cp311-win_amd64.whl", hash = "sha256:15061ce6584ece023457fb8b7a7a69ec40bf7114d781a8c4f5dcd68e28b5c53b"},
+    {file = "yarl-1.11.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:a4264515f9117be204935cd230fb2a052dd3792789cc94c101c535d349b3dab0"},
+    {file = "yarl-1.11.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f41fa79114a1d2eddb5eea7b912d6160508f57440bd302ce96eaa384914cd265"},
+    {file = "yarl-1.11.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:02da8759b47d964f9173c8675710720b468aa1c1693be0c9c64abb9d8d9a4867"},
+    {file = "yarl-1.11.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9361628f28f48dcf8b2f528420d4d68102f593f9c2e592bfc842f5fb337e44fd"},
+    {file = "yarl-1.11.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b91044952da03b6f95fdba398d7993dd983b64d3c31c358a4c89e3c19b6f7aef"},
+    {file = "yarl-1.11.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:74db2ef03b442276d25951749a803ddb6e270d02dda1d1c556f6ae595a0d76a8"},
+    {file = "yarl-1.11.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e975a2211952a8a083d1b9d9ba26472981ae338e720b419eb50535de3c02870"},
+    {file = "yarl-1.11.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aef97ba1dd2138112890ef848e17d8526fe80b21f743b4ee65947ea184f07a2"},
+    {file = "yarl-1.11.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a7915ea49b0c113641dc4d9338efa9bd66b6a9a485ffe75b9907e8573ca94b84"},
+    {file = "yarl-1.11.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:504cf0d4c5e4579a51261d6091267f9fd997ef58558c4ffa7a3e1460bd2336fa"},
+    {file = "yarl-1.11.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:3de5292f9f0ee285e6bd168b2a77b2a00d74cbcfa420ed078456d3023d2f6dff"},
+    {file = "yarl-1.11.1-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:a34e1e30f1774fa35d37202bbeae62423e9a79d78d0874e5556a593479fdf239"},
+    {file = "yarl-1.11.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:66b63c504d2ca43bf7221a1f72fbe981ff56ecb39004c70a94485d13e37ebf45"},
+    {file = "yarl-1.11.1-cp312-cp312-win32.whl", hash = "sha256:a28b70c9e2213de425d9cba5ab2e7f7a1c8ca23a99c4b5159bf77b9c31251447"},
+    {file = "yarl-1.11.1-cp312-cp312-win_amd64.whl", hash = "sha256:17b5a386d0d36fb828e2fb3ef08c8829c1ebf977eef88e5367d1c8c94b454639"},
+    {file = "yarl-1.11.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:1fa2e7a406fbd45b61b4433e3aa254a2c3e14c4b3186f6e952d08a730807fa0c"},
+    {file = "yarl-1.11.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:750f656832d7d3cb0c76be137ee79405cc17e792f31e0a01eee390e383b2936e"},
+    {file = "yarl-1.11.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0b8486f322d8f6a38539136a22c55f94d269addb24db5cb6f61adc61eabc9d93"},
+    {file = "yarl-1.11.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3fce4da3703ee6048ad4138fe74619c50874afe98b1ad87b2698ef95bf92c96d"},
+    {file = "yarl-1.11.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8ed653638ef669e0efc6fe2acb792275cb419bf9cb5c5049399f3556995f23c7"},
+    {file = "yarl-1.11.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18ac56c9dd70941ecad42b5a906820824ca72ff84ad6fa18db33c2537ae2e089"},
+    {file = "yarl-1.11.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:688654f8507464745ab563b041d1fb7dab5d9912ca6b06e61d1c4708366832f5"},
+    {file = "yarl-1.11.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4973eac1e2ff63cf187073cd4e1f1148dcd119314ab79b88e1b3fad74a18c9d5"},
+    {file = "yarl-1.11.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:964a428132227edff96d6f3cf261573cb0f1a60c9a764ce28cda9525f18f7786"},
+    {file = "yarl-1.11.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:6d23754b9939cbab02c63434776df1170e43b09c6a517585c7ce2b3d449b7318"},
+    {file = "yarl-1.11.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:c2dc4250fe94d8cd864d66018f8344d4af50e3758e9d725e94fecfa27588ff82"},
+    {file = "yarl-1.11.1-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:09696438cb43ea6f9492ef237761b043f9179f455f405279e609f2bc9100212a"},
+    {file = "yarl-1.11.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:999bfee0a5b7385a0af5ffb606393509cfde70ecca4f01c36985be6d33e336da"},
+    {file = "yarl-1.11.1-cp313-cp313-win32.whl", hash = "sha256:ce928c9c6409c79e10f39604a7e214b3cb69552952fbda8d836c052832e6a979"},
+    {file = "yarl-1.11.1-cp313-cp313-win_amd64.whl", hash = "sha256:501c503eed2bb306638ccb60c174f856cc3246c861829ff40eaa80e2f0330367"},
+    {file = "yarl-1.11.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:dae7bd0daeb33aa3e79e72877d3d51052e8b19c9025ecf0374f542ea8ec120e4"},
+    {file = "yarl-1.11.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3ff6b1617aa39279fe18a76c8d165469c48b159931d9b48239065767ee455b2b"},
+    {file = "yarl-1.11.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3257978c870728a52dcce8c2902bf01f6c53b65094b457bf87b2644ee6238ddc"},
+    {file = "yarl-1.11.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f351fa31234699d6084ff98283cb1e852270fe9e250a3b3bf7804eb493bd937"},
+    {file = "yarl-1.11.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8aef1b64da41d18026632d99a06b3fefe1d08e85dd81d849fa7c96301ed22f1b"},
+    {file = "yarl-1.11.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7175a87ab8f7fbde37160a15e58e138ba3b2b0e05492d7351314a250d61b1591"},
+    {file = "yarl-1.11.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba444bdd4caa2a94456ef67a2f383710928820dd0117aae6650a4d17029fa25e"},
+    {file = "yarl-1.11.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0ea9682124fc062e3d931c6911934a678cb28453f957ddccf51f568c2f2b5e05"},
+    {file = "yarl-1.11.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:8418c053aeb236b20b0ab8fa6bacfc2feaaf7d4683dd96528610989c99723d5f"},
+    {file = "yarl-1.11.1-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:61a5f2c14d0a1adfdd82258f756b23a550c13ba4c86c84106be4c111a3a4e413"},
+    {file = "yarl-1.11.1-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:f3a6d90cab0bdf07df8f176eae3a07127daafcf7457b997b2bf46776da2c7eb7"},
+    {file = "yarl-1.11.1-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:077da604852be488c9a05a524068cdae1e972b7dc02438161c32420fb4ec5e14"},
+    {file = "yarl-1.11.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:15439f3c5c72686b6c3ff235279630d08936ace67d0fe5c8d5bbc3ef06f5a420"},
+    {file = "yarl-1.11.1-cp38-cp38-win32.whl", hash = "sha256:238a21849dd7554cb4d25a14ffbfa0ef380bb7ba201f45b144a14454a72ffa5a"},
+    {file = "yarl-1.11.1-cp38-cp38-win_amd64.whl", hash = "sha256:67459cf8cf31da0e2cbdb4b040507e535d25cfbb1604ca76396a3a66b8ba37a6"},
+    {file = "yarl-1.11.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:884eab2ce97cbaf89f264372eae58388862c33c4f551c15680dd80f53c89a269"},
+    {file = "yarl-1.11.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8a336eaa7ee7e87cdece3cedb395c9657d227bfceb6781295cf56abcd3386a26"},
+    {file = "yarl-1.11.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:87f020d010ba80a247c4abc335fc13421037800ca20b42af5ae40e5fd75e7909"},
+    {file = "yarl-1.11.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:637c7ddb585a62d4469f843dac221f23eec3cbad31693b23abbc2c366ad41ff4"},
+    {file = "yarl-1.11.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:48dfd117ab93f0129084577a07287376cc69c08138694396f305636e229caa1a"},
+    {file = "yarl-1.11.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e0ae31fb5ccab6eda09ba1494e87eb226dcbd2372dae96b87800e1dcc98804"},
+    {file = "yarl-1.11.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f46f81501160c28d0c0b7333b4f7be8983dbbc161983b6fb814024d1b4952f79"},
+    {file = "yarl-1.11.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:04293941646647b3bfb1719d1d11ff1028e9c30199509a844da3c0f5919dc520"},
+    {file = "yarl-1.11.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:250e888fa62d73e721f3041e3a9abf427788a1934b426b45e1b92f62c1f68366"},
+    {file = "yarl-1.11.1-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:e8f63904df26d1a66aabc141bfd258bf738b9bc7bc6bdef22713b4f5ef789a4c"},
+    {file = "yarl-1.11.1-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:aac44097d838dda26526cffb63bdd8737a2dbdf5f2c68efb72ad83aec6673c7e"},
+    {file = "yarl-1.11.1-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:267b24f891e74eccbdff42241c5fb4f974de2d6271dcc7d7e0c9ae1079a560d9"},
+    {file = "yarl-1.11.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:6907daa4b9d7a688063ed098c472f96e8181733c525e03e866fb5db480a424df"},
+    {file = "yarl-1.11.1-cp39-cp39-win32.whl", hash = "sha256:14438dfc5015661f75f85bc5adad0743678eefee266ff0c9a8e32969d5d69f74"},
+    {file = "yarl-1.11.1-cp39-cp39-win_amd64.whl", hash = "sha256:94d0caaa912bfcdc702a4204cd5e2bb01eb917fc4f5ea2315aa23962549561b0"},
+    {file = "yarl-1.11.1-py3-none-any.whl", hash = "sha256:72bf26f66456baa0584eff63e44545c9f0eaed9b73cb6601b647c91f14c11f38"},
+    {file = "yarl-1.11.1.tar.gz", hash = "sha256:1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53"},
 ]
 
 [package.dependencies]
@@ -3174,20 +3232,24 @@ multidict = ">=4.0"
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "5065bdc0a65dda4d1d607f6f6fa30f8f3a0bfd6ce11afdc410f044c10d7720e3"
+content-hash = "50b5a327449e8c501e6494c4ef1082b56b48d1aaf95683d79c2adb9ce28e66fd"
diff --git a/boefjes/pyproject.toml b/boefjes/pyproject.toml
index 31c11e2cf98..3b563ddfb71 100644
--- a/boefjes/pyproject.toml
+++ b/boefjes/pyproject.toml
@@ -34,6 +34,7 @@ beautifulsoup4 = "4.11.1"
 censys = "2.1.8"
 # required by kat_dicom boefje
 pynetdicom = "2.0.2"
+pydicom = "2.4.4"
 # required by kat_dns, kat_dns_zone boefjes
 dnspython = "^2.6.1"
 # required by kat_fierce
@@ -45,7 +46,7 @@ python-libnmap = "0.7.3"
 # required by kat_shodan boefje
 shodan = "1.25.0"
 # required by kat_ssl_certificates boefje
-cryptography = "^42.0.1"
+cryptography = "^43.0.1"
 # required by kat_webpage_analysis
 forcediphttpsadapter = "1.1.0"
 python-wappalyzer = {git = "https://github.com/chorsley/python-Wappalyzer.git", rev = "0.4.0"}
@@ -73,10 +74,12 @@ fastapi-slim = "^0.111.0"
 structlog = "^24.2.0"
 # required by kat_maxmind_geoip
 maxminddb = "^2.6.2"
+croniter = "^3.0.3"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"
 pytest-env = "^1.1.3"
+pytest-mock = "^3.14.0"
 
 [build-system]
 requires = ["setuptools>=45", "wheel"]
@@ -87,6 +90,7 @@ line-length = 120
 transform-concats = true
 
 [tool.pytest.ini_options]
+markers = ["slow: marks tests as slow"]
 addopts = "-m 'not slow'"
 env = [
     "D:KATALOGUS_DB_URI=postgresql://postgres:postgres@ci_katalogus-db:5432/ci_katalogus",
diff --git a/boefjes/requirements-dev.txt b/boefjes/requirements-dev.txt
index 3d257eb1585..a9b17152b48 100644
--- a/boefjes/requirements-dev.txt
+++ b/boefjes/requirements-dev.txt
@@ -1,83 +1,98 @@
 aiohappyeyeballs==2.3.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4d6dea59215537dbc746e93e779caea8178c866856a721c9c660d7a5a7b8be03 \
     --hash=sha256:6fa48b9f1317254f122a07a131a86b71ca6946ca989ce6326fff54a99a920105
-aiohttp==3.10.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:05d66203a530209cbe40f102ebaac0b2214aba2a33c075d0bf825987c36f1f0b \
-    --hash=sha256:08bd0754d257b2db27d6bab208c74601df6f21bfe4cb2ec7b258ba691aac64b3 \
-    --hash=sha256:0974f3b5b0132edcec92c3306f858ad4356a63d26b18021d859c9927616ebf27 \
-    --hash=sha256:09bc79275737d4dc066e0ae2951866bb36d9c6b460cb7564f111cc0427f14844 \
-    --hash=sha256:123e5819bfe1b87204575515cf448ab3bf1489cdeb3b61012bde716cda5853e7 \
-    --hash=sha256:13031e7ec1188274bad243255c328cc3019e36a5a907978501256000d57a7201 \
-    --hash=sha256:166de65e2e4e63357cfa8417cf952a519ac42f1654cb2d43ed76899e2319b1ee \
-    --hash=sha256:214277dcb07ab3875f17ee1c777d446dcce75bea85846849cc9d139ab8f5081f \
-    --hash=sha256:21650e7032cc2d31fc23d353d7123e771354f2a3d5b05a5647fc30fea214e696 \
-    --hash=sha256:24fade6dae446b183e2410a8628b80df9b7a42205c6bfc2eff783cbeedc224a2 \
-    --hash=sha256:2a5d0ea8a6467b15d53b00c4e8ea8811e47c3cc1bdbc62b1aceb3076403d551f \
-    --hash=sha256:2b0f670502100cdc567188c49415bebba947eb3edaa2028e1a50dd81bd13363f \
-    --hash=sha256:2bbc55a964b8eecb341e492ae91c3bd0848324d313e1e71a27e3d96e6ee7e8e8 \
-    --hash=sha256:32007fdcaab789689c2ecaaf4b71f8e37bf012a15cd02c0a9db8c4d0e7989fa8 \
-    --hash=sha256:3461d9294941937f07bbbaa6227ba799bc71cc3b22c40222568dc1cca5118f68 \
-    --hash=sha256:3731a73ddc26969d65f90471c635abd4e1546a25299b687e654ea6d2fc052394 \
-    --hash=sha256:38d91b98b4320ffe66efa56cb0f614a05af53b675ce1b8607cdb2ac826a8d58e \
-    --hash=sha256:3a9dcdccf50284b1b0dc72bc57e5bbd3cc9bf019060dfa0668f63241ccc16aa7 \
-    --hash=sha256:434b3ab75833accd0b931d11874e206e816f6e6626fd69f643d6a8269cd9166a \
-    --hash=sha256:43b09f38a67679e32d380fe512189ccb0b25e15afc79b23fbd5b5e48e4fc8fd9 \
-    --hash=sha256:44bb159b55926b57812dca1b21c34528e800963ffe130d08b049b2d6b994ada7 \
-    --hash=sha256:48665433bb59144aaf502c324694bec25867eb6630fcd831f7a893ca473fcde4 \
-    --hash=sha256:50544fe498c81cb98912afabfc4e4d9d85e89f86238348e3712f7ca6a2f01dab \
-    --hash=sha256:5337cc742a03f9e3213b097abff8781f79de7190bbfaa987bd2b7ceb5bb0bdec \
-    --hash=sha256:56fb94bae2be58f68d000d046172d8b8e6b1b571eb02ceee5535e9633dcd559c \
-    --hash=sha256:59c489661edbd863edb30a8bd69ecb044bd381d1818022bc698ba1b6f80e5dd1 \
-    --hash=sha256:5ba2e838b5e6a8755ac8297275c9460e729dc1522b6454aee1766c6de6d56e5e \
-    --hash=sha256:61ccb867b2f2f53df6598eb2a93329b5eee0b00646ee79ea67d68844747a418e \
-    --hash=sha256:671efce3a4a0281060edf9a07a2f7e6230dca3a1cbc61d110eee7753d28405f7 \
-    --hash=sha256:673bb6e3249dc8825df1105f6ef74e2eab779b7ff78e96c15cadb78b04a83752 \
-    --hash=sha256:6ae9ae382d1c9617a91647575255ad55a48bfdde34cc2185dd558ce476bf16e9 \
-    --hash=sha256:6c51ed03e19c885c8e91f574e4bbe7381793f56f93229731597e4a499ffef2a5 \
-    --hash=sha256:6d881353264e6156f215b3cb778c9ac3184f5465c2ece5e6fce82e68946868ef \
-    --hash=sha256:7084876352ba3833d5d214e02b32d794e3fd9cf21fdba99cff5acabeb90d9806 \
-    --hash=sha256:70b4a4984a70a2322b70e088d654528129783ac1ebbf7dd76627b3bd22db2f17 \
-    --hash=sha256:71bb1d97bfe7e6726267cea169fdf5df7658831bb68ec02c9c6b9f3511e108bb \
-    --hash=sha256:7c126f532caf238031c19d169cfae3c6a59129452c990a6e84d6e7b198a001dc \
-    --hash=sha256:7f9159ae530297f61a00116771e57516f89a3de6ba33f314402e41560872b50a \
-    --hash=sha256:812121a201f0c02491a5db335a737b4113151926a79ae9ed1a9f41ea225c0e3f \
-    --hash=sha256:8542c9e5bcb2bd3115acdf5adc41cda394e7360916197805e7e32b93d821ef93 \
-    --hash=sha256:85466b5a695c2a7db13eb2c200af552d13e6a9313d7fa92e4ffe04a2c0ea74c1 \
-    --hash=sha256:8d98c604c93403288591d7d6d7d6cc8a63459168f8846aeffd5b3a7f3b3e5e09 \
-    --hash=sha256:8da6b48c20ce78f5721068f383e0e113dde034e868f1b2f5ee7cb1e95f91db57 \
-    --hash=sha256:926e68438f05703e500b06fe7148ef3013dd6f276de65c68558fa9974eeb59ad \
-    --hash=sha256:9743fa34a10a36ddd448bba8a3adc2a66a1c575c3c2940301bacd6cc896c6bf1 \
-    --hash=sha256:a541414578ff47c0a9b0b8b77381ea86b0c8531ab37fc587572cb662ccd80b88 \
-    --hash=sha256:ab3361159fd3dcd0e48bbe804006d5cfb074b382666e6c064112056eb234f1a9 \
-    --hash=sha256:aed12a54d4e1ee647376fa541e1b7621505001f9f939debf51397b9329fd88b9 \
-    --hash=sha256:af4dbec58e37f5afff4f91cdf235e8e4b0bd0127a2a4fd1040e2cad3369d2f06 \
-    --hash=sha256:b031ce229114825f49cec4434fa844ccb5225e266c3e146cb4bdd025a6da52f1 \
-    --hash=sha256:b22cae3c9dd55a6b4c48c63081d31c00fc11fa9db1a20c8a50ee38c1a29539d2 \
-    --hash=sha256:b51aef59370baf7444de1572f7830f59ddbabd04e5292fa4218d02f085f8d299 \
-    --hash=sha256:b69d832e5f5fa15b1b6b2c8eb6a9fd2c0ec1fd7729cb4322ed27771afc9fc2ac \
-    --hash=sha256:b84857b66fa6510a163bb083c1199d1ee091a40163cfcbbd0642495fed096204 \
-    --hash=sha256:b97dc9a17a59f350c0caa453a3cb35671a2ffa3a29a6ef3568b523b9113d84e5 \
-    --hash=sha256:ba562736d3fbfe9241dad46c1a8994478d4a0e50796d80e29d50cabe8fbfcc3f \
-    --hash=sha256:bac352fceed158620ce2d701ad39d4c1c76d114255a7c530e057e2b9f55bdf9f \
-    --hash=sha256:baec1eb274f78b2de54471fc4c69ecbea4275965eab4b556ef7a7698dee18bf2 \
-    --hash=sha256:bc8e9f15939dacb0e1f2d15f9c41b786051c10472c7a926f5771e99b49a5957f \
-    --hash=sha256:bf75716377aad2c718cdf66451c5cf02042085d84522aec1f9246d3e4b8641a6 \
-    --hash=sha256:c124b9206b1befe0491f48185fd30a0dd51b0f4e0e7e43ac1236066215aff272 \
-    --hash=sha256:c9ed607dbbdd0d4d39b597e5bf6b0d40d844dfb0ac6a123ed79042ef08c1f87e \
-    --hash=sha256:cc36cbdedf6f259371dbbbcaae5bb0e95b879bc501668ab6306af867577eb5db \
-    --hash=sha256:cd788602e239ace64f257d1c9d39898ca65525583f0fbf0988bcba19418fe93f \
-    --hash=sha256:d1100e68e70eb72eadba2b932b185ebf0f28fd2f0dbfe576cfa9d9894ef49752 \
-    --hash=sha256:d35235a44ec38109b811c3600d15d8383297a8fab8e3dec6147477ec8636712a \
-    --hash=sha256:d3e66d5b506832e56add66af88c288c1d5ba0c38b535a1a59e436b300b57b23e \
-    --hash=sha256:d5548444ef60bf4c7b19ace21f032fa42d822e516a6940d36579f7bfa8513f9c \
-    --hash=sha256:d5a9ec959b5381271c8ec9310aae1713b2aec29efa32e232e5ef7dcca0df0279 \
-    --hash=sha256:d73b073a25a0bb8bf014345374fe2d0f63681ab5da4c22f9d2025ca3e3ea54fc \
-    --hash=sha256:e021c4c778644e8cdc09487d65564265e6b149896a17d7c0f52e9a088cc44e1b \
-    --hash=sha256:e1128c5d3a466279cb23c4aa32a0f6cb0e7d2961e74e9e421f90e74f75ec1edf \
-    --hash=sha256:e8cc0564b286b625e673a2615ede60a1704d0cbbf1b24604e28c31ed37dc62aa \
-    --hash=sha256:f25d6c4e82d7489be84f2b1c8212fafc021b3731abdb61a563c90e37cced3a21 \
-    --hash=sha256:f817a54059a4cfbc385a7f51696359c642088710e731e8df80d0607193ed2b73 \
-    --hash=sha256:fda91ad797e4914cca0afa8b6cccd5d2b3569ccc88731be202f6adce39503189
+aiohttp==3.10.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277 \
+    --hash=sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1 \
+    --hash=sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe \
+    --hash=sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb \
+    --hash=sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca \
+    --hash=sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91 \
+    --hash=sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972 \
+    --hash=sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a \
+    --hash=sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3 \
+    --hash=sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa \
+    --hash=sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77 \
+    --hash=sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b \
+    --hash=sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8 \
+    --hash=sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599 \
+    --hash=sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc \
+    --hash=sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf \
+    --hash=sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511 \
+    --hash=sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699 \
+    --hash=sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487 \
+    --hash=sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987 \
+    --hash=sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff \
+    --hash=sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db \
+    --hash=sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022 \
+    --hash=sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce \
+    --hash=sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a \
+    --hash=sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5 \
+    --hash=sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7 \
+    --hash=sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820 \
+    --hash=sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf \
+    --hash=sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e \
+    --hash=sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf \
+    --hash=sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5 \
+    --hash=sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6 \
+    --hash=sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6 \
+    --hash=sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91 \
+    --hash=sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3 \
+    --hash=sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a \
+    --hash=sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d \
+    --hash=sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088 \
+    --hash=sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc \
+    --hash=sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f \
+    --hash=sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75 \
+    --hash=sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471 \
+    --hash=sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e \
+    --hash=sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697 \
+    --hash=sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092 \
+    --hash=sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69 \
+    --hash=sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3 \
+    --hash=sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32 \
+    --hash=sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589 \
+    --hash=sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178 \
+    --hash=sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92 \
+    --hash=sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2 \
+    --hash=sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e \
+    --hash=sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058 \
+    --hash=sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857 \
+    --hash=sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1 \
+    --hash=sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6 \
+    --hash=sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22 \
+    --hash=sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0 \
+    --hash=sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b \
+    --hash=sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57 \
+    --hash=sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f \
+    --hash=sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e \
+    --hash=sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16 \
+    --hash=sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1 \
+    --hash=sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f \
+    --hash=sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6 \
+    --hash=sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04 \
+    --hash=sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae \
+    --hash=sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d \
+    --hash=sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b \
+    --hash=sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f \
+    --hash=sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862 \
+    --hash=sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689 \
+    --hash=sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c \
+    --hash=sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683 \
+    --hash=sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef \
+    --hash=sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f \
+    --hash=sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12 \
+    --hash=sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73 \
+    --hash=sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061 \
+    --hash=sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072 \
+    --hash=sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11 \
+    --hash=sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691 \
+    --hash=sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77 \
+    --hash=sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385 \
+    --hash=sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172 \
+    --hash=sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569 \
+    --hash=sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f \
+    --hash=sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5
 aioresponses==0.7.6 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d2c26defbb9b440ea2685ec132e90700907fd10bcca3e85ec2f157219f0d26f7 \
     --hash=sha256:f795d9dbda2d61774840e7e32f5366f45752d1adc1b74c9362afd017296c7ee1
@@ -114,9 +129,9 @@ beautifulsoup4==4.11.1 ; python_version >= "3.10" and python_version < "4.0" \
 censys==2.1.8 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2ddd6d0ee6df70acf15792328df8bb4d0dd5a76b50883adac62989f1641820c1 \
     --hash=sha256:665acf8777a871098832527ab8e0c5b1b9f9a548be928239747a6fcde8b613eb
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 cffi==1.17.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f \
     --hash=sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab \
@@ -288,39 +303,37 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \
 configparser==7.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:af3c618a67aaaedc4d689fd7317d238f566b9aa03cae50102e92d7f0dfe78ba0 \
     --hash=sha256:f46d52a12811c637104c6bb8eb33693be0038ab6bf01d69aae009c39ec8c2017
-cryptography==42.0.8 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad \
-    --hash=sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583 \
-    --hash=sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b \
-    --hash=sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c \
-    --hash=sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1 \
-    --hash=sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648 \
-    --hash=sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949 \
-    --hash=sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba \
-    --hash=sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c \
-    --hash=sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9 \
-    --hash=sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d \
-    --hash=sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c \
-    --hash=sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e \
-    --hash=sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2 \
-    --hash=sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d \
-    --hash=sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7 \
-    --hash=sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70 \
-    --hash=sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2 \
-    --hash=sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7 \
-    --hash=sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14 \
-    --hash=sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe \
-    --hash=sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e \
-    --hash=sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71 \
-    --hash=sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961 \
-    --hash=sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7 \
-    --hash=sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c \
-    --hash=sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28 \
-    --hash=sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842 \
-    --hash=sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902 \
-    --hash=sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801 \
-    --hash=sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a \
-    --hash=sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e
+croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
+    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
+    --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \
+    --hash=sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d \
+    --hash=sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062 \
+    --hash=sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2 \
+    --hash=sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4 \
+    --hash=sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1 \
+    --hash=sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85 \
+    --hash=sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84 \
+    --hash=sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042 \
+    --hash=sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d \
+    --hash=sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962 \
+    --hash=sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2 \
+    --hash=sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa \
+    --hash=sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d \
+    --hash=sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365 \
+    --hash=sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96 \
+    --hash=sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47 \
+    --hash=sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d \
+    --hash=sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d \
+    --hash=sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c \
+    --hash=sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb \
+    --hash=sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277 \
+    --hash=sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172 \
+    --hash=sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034 \
+    --hash=sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a \
+    --hash=sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289
 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
     --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
@@ -488,53 +501,53 @@ greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
@@ -543,9 +556,9 @@ httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
 httpretty==1.1.4 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -567,149 +580,145 @@ langcodes==3.4.0 ; python_version >= "3.10" and python_version < "4.0" \
 language-data==1.2.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:77d5cab917f91ee0b2f1aa7018443e911cf8985ef734ca2ba3940770f6a3816b \
     --hash=sha256:82a86050bbd677bfde87d97885b17566cfe75dad3ac4f5ce44b52c28f752e773
-lxml==5.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:02437fb7308386867c8b7b0e5bc4cd4b04548b1c5d089ffb8e7b31009b961dc3 \
-    --hash=sha256:02f6a8eb6512fdc2fd4ca10a49c341c4e109aa6e9448cc4859af5b949622715a \
-    --hash=sha256:05f8757b03208c3f50097761be2dea0aba02e94f0dc7023ed73a7bb14ff11eb0 \
-    --hash=sha256:06668e39e1f3c065349c51ac27ae430719d7806c026fec462e5693b08b95696b \
-    --hash=sha256:07542787f86112d46d07d4f3c4e7c760282011b354d012dc4141cc12a68cef5f \
-    --hash=sha256:08ea0f606808354eb8f2dfaac095963cb25d9d28e27edcc375d7b30ab01abbf6 \
-    --hash=sha256:0969e92af09c5687d769731e3f39ed62427cc72176cebb54b7a9d52cc4fa3b73 \
-    --hash=sha256:0a028b61a2e357ace98b1615fc03f76eb517cc028993964fe08ad514b1e8892d \
-    --hash=sha256:0b3f5016e00ae7630a4b83d0868fca1e3d494c78a75b1c7252606a3a1c5fc2ad \
-    --hash=sha256:13e69be35391ce72712184f69000cda04fc89689429179bc4c0ae5f0b7a8c21b \
-    --hash=sha256:16a8326e51fcdffc886294c1e70b11ddccec836516a343f9ed0f82aac043c24a \
-    --hash=sha256:19b4e485cd07b7d83e3fe3b72132e7df70bfac22b14fe4bf7a23822c3a35bff5 \
-    --hash=sha256:1a2569a1f15ae6c8c64108a2cd2b4a858fc1e13d25846be0666fc144715e32ab \
-    --hash=sha256:1a7aca7964ac4bb07680d5c9d63b9d7028cace3e2d43175cb50bba8c5ad33316 \
-    --hash=sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6 \
-    --hash=sha256:1d8a701774dfc42a2f0b8ccdfe7dbc140500d1049e0632a611985d943fcf12df \
-    --hash=sha256:1e275ea572389e41e8b039ac076a46cb87ee6b8542df3fff26f5baab43713bca \
-    --hash=sha256:2304d3c93f2258ccf2cf7a6ba8c761d76ef84948d87bf9664e14d203da2cd264 \
-    --hash=sha256:23441e2b5339bc54dc949e9e675fa35efe858108404ef9aa92f0456929ef6fe8 \
-    --hash=sha256:23cfafd56887eaed93d07bc4547abd5e09d837a002b791e9767765492a75883f \
-    --hash=sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b \
-    --hash=sha256:2eb2227ce1ff998faf0cd7fe85bbf086aa41dfc5af3b1d80867ecfe75fb68df3 \
-    --hash=sha256:2fb0ba3e8566548d6c8e7dd82a8229ff47bd8fb8c2da237607ac8e5a1b8312e5 \
-    --hash=sha256:303f540ad2dddd35b92415b74b900c749ec2010e703ab3bfd6660979d01fd4ed \
-    --hash=sha256:339ee4a4704bc724757cd5dd9dc8cf4d00980f5d3e6e06d5847c1b594ace68ab \
-    --hash=sha256:33ce9e786753743159799fdf8e92a5da351158c4bfb6f2db0bf31e7892a1feb5 \
-    --hash=sha256:343ab62e9ca78094f2306aefed67dcfad61c4683f87eee48ff2fd74902447726 \
-    --hash=sha256:34e17913c431f5ae01d8658dbf792fdc457073dcdfbb31dc0cc6ab256e664a8d \
-    --hash=sha256:364d03207f3e603922d0d3932ef363d55bbf48e3647395765f9bfcbdf6d23632 \
-    --hash=sha256:38b67afb0a06b8575948641c1d6d68e41b83a3abeae2ca9eed2ac59892b36706 \
-    --hash=sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8 \
-    --hash=sha256:3b019d4ee84b683342af793b56bb35034bd749e4cbdd3d33f7d1107790f8c472 \
-    --hash=sha256:3b6a30a9ab040b3f545b697cb3adbf3696c05a3a68aad172e3fd7ca73ab3c835 \
-    --hash=sha256:3d1e35572a56941b32c239774d7e9ad724074d37f90c7a7d499ab98761bd80cf \
-    --hash=sha256:3d98de734abee23e61f6b8c2e08a88453ada7d6486dc7cdc82922a03968928db \
-    --hash=sha256:453d037e09a5176d92ec0fd282e934ed26d806331a8b70ab431a81e2fbabf56d \
-    --hash=sha256:45f9494613160d0405682f9eee781c7e6d1bf45f819654eb249f8f46a2c22545 \
-    --hash=sha256:4820c02195d6dfb7b8508ff276752f6b2ff8b64ae5d13ebe02e7667e035000b9 \
-    --hash=sha256:49095a38eb333aaf44c06052fd2ec3b8f23e19747ca7ec6f6c954ffea6dbf7be \
-    --hash=sha256:4aefd911793b5d2d7a921233a54c90329bf3d4a6817dc465f12ffdfe4fc7b8fe \
-    --hash=sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905 \
-    --hash=sha256:4c30a2f83677876465f44c018830f608fa3c6a8a466eb223535035fbc16f3438 \
-    --hash=sha256:50127c186f191b8917ea2fb8b206fbebe87fd414a6084d15568c27d0a21d60db \
-    --hash=sha256:50ccb5d355961c0f12f6cf24b7187dbabd5433f29e15147a67995474f27d1776 \
-    --hash=sha256:519895c99c815a1a24a926d5b60627ce5ea48e9f639a5cd328bda0515ea0f10c \
-    --hash=sha256:54401c77a63cc7d6dc4b4e173bb484f28a5607f3df71484709fe037c92d4f0ed \
-    --hash=sha256:546cf886f6242dff9ec206331209db9c8e1643ae642dea5fdbecae2453cb50fd \
-    --hash=sha256:55ce6b6d803890bd3cc89975fca9de1dff39729b43b73cb15ddd933b8bc20484 \
-    --hash=sha256:56793b7a1a091a7c286b5f4aa1fe4ae5d1446fe742d00cdf2ffb1077865db10d \
-    --hash=sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6 \
-    --hash=sha256:5b8c041b6265e08eac8a724b74b655404070b636a8dd6d7a13c3adc07882ef30 \
-    --hash=sha256:5e097646944b66207023bc3c634827de858aebc226d5d4d6d16f0b77566ea182 \
-    --hash=sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61 \
-    --hash=sha256:610b5c77428a50269f38a534057444c249976433f40f53e3b47e68349cca1425 \
-    --hash=sha256:625e3ef310e7fa3a761d48ca7ea1f9d8718a32b1542e727d584d82f4453d5eeb \
-    --hash=sha256:657a972f46bbefdbba2d4f14413c0d079f9ae243bd68193cb5061b9732fa54c1 \
-    --hash=sha256:69ab77a1373f1e7563e0fb5a29a8440367dec051da6c7405333699d07444f511 \
-    --hash=sha256:6a520b4f9974b0a0a6ed73c2154de57cdfd0c8800f4f15ab2b73238ffed0b36e \
-    --hash=sha256:6d68ce8e7b2075390e8ac1e1d3a99e8b6372c694bbe612632606d1d546794207 \
-    --hash=sha256:6dcc3d17eac1df7859ae01202e9bb11ffa8c98949dcbeb1069c8b9a75917e01b \
-    --hash=sha256:6dfdc2bfe69e9adf0df4915949c22a25b39d175d599bf98e7ddf620a13678585 \
-    --hash=sha256:739e36ef7412b2bd940f75b278749106e6d025e40027c0b94a17ef7968d55d56 \
-    --hash=sha256:7429e7faa1a60cad26ae4227f4dd0459efde239e494c7312624ce228e04f6391 \
-    --hash=sha256:74da9f97daec6928567b48c90ea2c82a106b2d500f397eeb8941e47d30b1ca85 \
-    --hash=sha256:74e4f025ef3db1c6da4460dd27c118d8cd136d0391da4e387a15e48e5c975147 \
-    --hash=sha256:75a9632f1d4f698b2e6e2e1ada40e71f369b15d69baddb8968dcc8e683839b18 \
-    --hash=sha256:76acba4c66c47d27c8365e7c10b3d8016a7da83d3191d053a58382311a8bf4e1 \
-    --hash=sha256:79d1fb9252e7e2cfe4de6e9a6610c7cbb99b9708e2c3e29057f487de5a9eaefa \
-    --hash=sha256:7ce7ad8abebe737ad6143d9d3bf94b88b93365ea30a5b81f6877ec9c0dee0a48 \
-    --hash=sha256:7ed07b3062b055d7a7f9d6557a251cc655eed0b3152b76de619516621c56f5d3 \
-    --hash=sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184 \
-    --hash=sha256:8268cbcd48c5375f46e000adb1390572c98879eb4f77910c6053d25cc3ac2c67 \
-    --hash=sha256:875a3f90d7eb5c5d77e529080d95140eacb3c6d13ad5b616ee8095447b1d22e7 \
-    --hash=sha256:89feb82ca055af0fe797a2323ec9043b26bc371365847dbe83c7fd2e2f181c34 \
-    --hash=sha256:8a7e24cb69ee5f32e003f50e016d5fde438010c1022c96738b04fc2423e61706 \
-    --hash=sha256:8ab6a358d1286498d80fe67bd3d69fcbc7d1359b45b41e74c4a26964ca99c3f8 \
-    --hash=sha256:8b8df03a9e995b6211dafa63b32f9d405881518ff1ddd775db4e7b98fb545e1c \
-    --hash=sha256:8cf85a6e40ff1f37fe0f25719aadf443686b1ac7652593dc53c7ef9b8492b115 \
-    --hash=sha256:8e8d351ff44c1638cb6e980623d517abd9f580d2e53bfcd18d8941c052a5a009 \
-    --hash=sha256:9164361769b6ca7769079f4d426a41df6164879f7f3568be9086e15baca61466 \
-    --hash=sha256:96e85aa09274955bb6bd483eaf5b12abadade01010478154b0ec70284c1b1526 \
-    --hash=sha256:981a06a3076997adf7c743dcd0d7a0415582661e2517c7d961493572e909aa1d \
-    --hash=sha256:9cd5323344d8ebb9fb5e96da5de5ad4ebab993bbf51674259dbe9d7a18049525 \
-    --hash=sha256:9d6c6ea6a11ca0ff9cd0390b885984ed31157c168565702959c25e2191674a14 \
-    --hash=sha256:a02d3c48f9bb1e10c7788d92c0c7db6f2002d024ab6e74d6f45ae33e3d0288a3 \
-    --hash=sha256:a233bb68625a85126ac9f1fc66d24337d6e8a0f9207b688eec2e7c880f012ec0 \
-    --hash=sha256:a2f6a1bc2460e643785a2cde17293bd7a8f990884b822f7bca47bee0a82fc66b \
-    --hash=sha256:a6d17e0370d2516d5bb9062c7b4cb731cff921fc875644c3d751ad857ba9c5b1 \
-    --hash=sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f \
-    --hash=sha256:ab67ed772c584b7ef2379797bf14b82df9aa5f7438c5b9a09624dd834c1c1aaf \
-    --hash=sha256:ac6540c9fff6e3813d29d0403ee7a81897f1d8ecc09a8ff84d2eea70ede1cdbf \
-    --hash=sha256:ae4073a60ab98529ab8a72ebf429f2a8cc612619a8c04e08bed27450d52103c0 \
-    --hash=sha256:ae791f6bd43305aade8c0e22f816b34f3b72b6c820477aab4d18473a37e8090b \
-    --hash=sha256:aef5474d913d3b05e613906ba4090433c515e13ea49c837aca18bde190853dff \
-    --hash=sha256:b0b3f2df149efb242cee2ffdeb6674b7f30d23c9a7af26595099afaf46ef4e88 \
-    --hash=sha256:b128092c927eaf485928cec0c28f6b8bead277e28acf56800e972aa2c2abd7a2 \
-    --hash=sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40 \
-    --hash=sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716 \
-    --hash=sha256:b47633251727c8fe279f34025844b3b3a3e40cd1b198356d003aa146258d13a2 \
-    --hash=sha256:b537bd04d7ccd7c6350cdaaaad911f6312cbd61e6e6045542f781c7f8b2e99d2 \
-    --hash=sha256:b5e4ef22ff25bfd4ede5f8fb30f7b24446345f3e79d9b7455aef2836437bc38a \
-    --hash=sha256:b74b9ea10063efb77a965a8d5f4182806fbf59ed068b3c3fd6f30d2ac7bee734 \
-    --hash=sha256:bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87 \
-    --hash=sha256:bbc4b80af581e18568ff07f6395c02114d05f4865c2812a1f02f2eaecf0bfd48 \
-    --hash=sha256:bcc98f911f10278d1daf14b87d65325851a1d29153caaf146877ec37031d5f36 \
-    --hash=sha256:be49ad33819d7dcc28a309b86d4ed98e1a65f3075c6acd3cd4fe32103235222b \
-    --hash=sha256:bec4bd9133420c5c52d562469c754f27c5c9e36ee06abc169612c959bd7dbb07 \
-    --hash=sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c \
-    --hash=sha256:c689d0d5381f56de7bd6966a4541bff6e08bf8d3871bbd89a0c6ab18aa699573 \
-    --hash=sha256:c7079d5eb1c1315a858bbf180000757db8ad904a89476653232db835c3114001 \
-    --hash=sha256:cb3942960f0beb9f46e2a71a3aca220d1ca32feb5a398656be934320804c0df9 \
-    --hash=sha256:cd9e78285da6c9ba2d5c769628f43ef66d96ac3085e59b10ad4f3707980710d3 \
-    --hash=sha256:cf2a978c795b54c539f47964ec05e35c05bd045db5ca1e8366988c7f2fe6b3ce \
-    --hash=sha256:d14a0d029a4e176795cef99c056d58067c06195e0c7e2dbb293bf95c08f772a3 \
-    --hash=sha256:d237ba6664b8e60fd90b8549a149a74fcc675272e0e95539a00522e4ca688b04 \
-    --hash=sha256:d26a618ae1766279f2660aca0081b2220aca6bd1aa06b2cf73f07383faf48927 \
-    --hash=sha256:d28cb356f119a437cc58a13f8135ab8a4c8ece18159eb9194b0d269ec4e28083 \
-    --hash=sha256:d4ed0c7cbecde7194cd3228c044e86bf73e30a23505af852857c09c24e77ec5d \
-    --hash=sha256:d83e2d94b69bf31ead2fa45f0acdef0757fa0458a129734f59f67f3d2eb7ef32 \
-    --hash=sha256:d8bbcd21769594dbba9c37d3c819e2d5847656ca99c747ddb31ac1701d0c0ed9 \
-    --hash=sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f \
-    --hash=sha256:dc911208b18842a3a57266d8e51fc3cfaccee90a5351b92079beed912a7914c2 \
-    --hash=sha256:dfa7c241073d8f2b8e8dbc7803c434f57dbb83ae2a3d7892dd068d99e96efe2c \
-    --hash=sha256:e282aedd63c639c07c3857097fc0e236f984ceb4089a8b284da1c526491e3f3d \
-    --hash=sha256:e290d79a4107d7d794634ce3e985b9ae4f920380a813717adf61804904dc4393 \
-    --hash=sha256:e3d9d13603410b72787579769469af730c38f2f25505573a5888a94b62b920f8 \
-    --hash=sha256:e481bba1e11ba585fb06db666bfc23dbe181dbafc7b25776156120bf12e0d5a6 \
-    --hash=sha256:e49b052b768bb74f58c7dda4e0bdf7b79d43a9204ca584ffe1fb48a6f3c84c66 \
-    --hash=sha256:eb00b549b13bd6d884c863554566095bf6fa9c3cecb2e7b399c4bc7904cb33b5 \
-    --hash=sha256:ec87c44f619380878bd49ca109669c9f221d9ae6883a5bcb3616785fa8f94c97 \
-    --hash=sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196 \
-    --hash=sha256:f11ae142f3a322d44513de1018b50f474f8f736bc3cd91d969f464b5bfef8836 \
-    --hash=sha256:f2a09f6184f17a80897172863a655467da2b11151ec98ba8d7af89f17bf63dae \
-    --hash=sha256:f5b65529bb2f21ac7861a0e94fdbf5dc0daab41497d18223b46ee8515e5ad297 \
-    --hash=sha256:f60fdd125d85bf9c279ffb8e94c78c51b3b6a37711464e1f5f31078b45002421 \
-    --hash=sha256:f61efaf4bed1cc0860e567d2ecb2363974d414f7f1f124b1df368bbf183453a6 \
-    --hash=sha256:f90e552ecbad426eab352e7b2933091f2be77115bb16f09f78404861c8322981 \
-    --hash=sha256:f956196ef61369f1685d14dad80611488d8dc1ef00be57c0c5a03064005b0f30 \
-    --hash=sha256:fb91819461b1b56d06fa4bcf86617fac795f6a99d12239fb0c68dbeba41a0a30 \
-    --hash=sha256:fbc9d316552f9ef7bba39f4edfad4a734d3d6f93341232a9dddadec4f15d425f \
-    --hash=sha256:ff69a9a0b4b17d78170c73abe2ab12084bdf1691550c5629ad1fe7849433f324 \
-    --hash=sha256:ffb2be176fed4457e445fe540617f0252a72a8bc56208fd65a690fdb1f57660b
+lxml==5.3.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:01220dca0d066d1349bd6a1726856a78f7929f3878f7e2ee83c296c69495309e \
+    --hash=sha256:02ced472497b8362c8e902ade23e3300479f4f43e45f4105c85ef43b8db85229 \
+    --hash=sha256:052d99051e77a4f3e8482c65014cf6372e61b0a6f4fe9edb98503bb5364cfee3 \
+    --hash=sha256:07da23d7ee08577760f0a71d67a861019103e4812c87e2fab26b039054594cc5 \
+    --hash=sha256:094cb601ba9f55296774c2d57ad68730daa0b13dc260e1f941b4d13678239e70 \
+    --hash=sha256:0a7056921edbdd7560746f4221dca89bb7a3fe457d3d74267995253f46343f15 \
+    --hash=sha256:0c120f43553ec759f8de1fee2f4794452b0946773299d44c36bfe18e83caf002 \
+    --hash=sha256:0d7b36afa46c97875303a94e8f3ad932bf78bace9e18e603f2085b652422edcd \
+    --hash=sha256:0fdf3a3059611f7585a78ee10399a15566356116a4288380921a4b598d807a22 \
+    --hash=sha256:109fa6fede314cc50eed29e6e56c540075e63d922455346f11e4d7a036d2b8cf \
+    --hash=sha256:146173654d79eb1fc97498b4280c1d3e1e5d58c398fa530905c9ea50ea849b22 \
+    --hash=sha256:1473427aff3d66a3fa2199004c3e601e6c4500ab86696edffdbc84954c72d832 \
+    --hash=sha256:1483fd3358963cc5c1c9b122c80606a3a79ee0875bcac0204149fa09d6ff2727 \
+    --hash=sha256:168f2dfcfdedf611eb285efac1516c8454c8c99caf271dccda8943576b67552e \
+    --hash=sha256:17e8d968d04a37c50ad9c456a286b525d78c4a1c15dd53aa46c1d8e06bf6fa30 \
+    --hash=sha256:18feb4b93302091b1541221196a2155aa296c363fd233814fa11e181adebc52f \
+    --hash=sha256:1afe0a8c353746e610bd9031a630a95bcfb1a720684c3f2b36c4710a0a96528f \
+    --hash=sha256:1d04f064bebdfef9240478f7a779e8c5dc32b8b7b0b2fc6a62e39b928d428e51 \
+    --hash=sha256:1fdc9fae8dd4c763e8a31e7630afef517eab9f5d5d31a278df087f307bf601f4 \
+    --hash=sha256:1ffc23010330c2ab67fac02781df60998ca8fe759e8efde6f8b756a20599c5de \
+    --hash=sha256:20094fc3f21ea0a8669dc4c61ed7fa8263bd37d97d93b90f28fc613371e7a875 \
+    --hash=sha256:213261f168c5e1d9b7535a67e68b1f59f92398dd17a56d934550837143f79c42 \
+    --hash=sha256:218c1b2e17a710e363855594230f44060e2025b05c80d1f0661258142b2add2e \
+    --hash=sha256:23e0553b8055600b3bf4a00b255ec5c92e1e4aebf8c2c09334f8368e8bd174d6 \
+    --hash=sha256:25f1b69d41656b05885aa185f5fdf822cb01a586d1b32739633679699f220391 \
+    --hash=sha256:2b3778cb38212f52fac9fe913017deea2fdf4eb1a4f8e4cfc6b009a13a6d3fcc \
+    --hash=sha256:2bc9fd5ca4729af796f9f59cd8ff160fe06a474da40aca03fcc79655ddee1a8b \
+    --hash=sha256:2c226a06ecb8cdef28845ae976da407917542c5e6e75dcac7cc33eb04aaeb237 \
+    --hash=sha256:2c3406b63232fc7e9b8783ab0b765d7c59e7c59ff96759d8ef9632fca27c7ee4 \
+    --hash=sha256:2c86bf781b12ba417f64f3422cfc302523ac9cd1d8ae8c0f92a1c66e56ef2e86 \
+    --hash=sha256:2d9b8d9177afaef80c53c0a9e30fa252ff3036fb1c6494d427c066a4ce6a282f \
+    --hash=sha256:2dec2d1130a9cda5b904696cec33b2cfb451304ba9081eeda7f90f724097300a \
+    --hash=sha256:2dfab5fa6a28a0b60a20638dc48e6343c02ea9933e3279ccb132f555a62323d8 \
+    --hash=sha256:2ecdd78ab768f844c7a1d4a03595038c166b609f6395e25af9b0f3f26ae1230f \
+    --hash=sha256:315f9542011b2c4e1d280e4a20ddcca1761993dda3afc7a73b01235f8641e903 \
+    --hash=sha256:36aef61a1678cb778097b4a6eeae96a69875d51d1e8f4d4b491ab3cfb54b5a03 \
+    --hash=sha256:384aacddf2e5813a36495233b64cb96b1949da72bef933918ba5c84e06af8f0e \
+    --hash=sha256:3879cc6ce938ff4eb4900d901ed63555c778731a96365e53fadb36437a131a99 \
+    --hash=sha256:3c174dc350d3ec52deb77f2faf05c439331d6ed5e702fc247ccb4e6b62d884b7 \
+    --hash=sha256:3eb44520c4724c2e1a57c0af33a379eee41792595023f367ba3952a2d96c2aab \
+    --hash=sha256:406246b96d552e0503e17a1006fd27edac678b3fcc9f1be71a2f94b4ff61528d \
+    --hash=sha256:41ce1f1e2c7755abfc7e759dc34d7d05fd221723ff822947132dc934d122fe22 \
+    --hash=sha256:423b121f7e6fa514ba0c7918e56955a1d4470ed35faa03e3d9f0e3baa4c7e492 \
+    --hash=sha256:44264ecae91b30e5633013fb66f6ddd05c006d3e0e884f75ce0b4755b3e3847b \
+    --hash=sha256:482c2f67761868f0108b1743098640fbb2a28a8e15bf3f47ada9fa59d9fe08c3 \
+    --hash=sha256:4b0c7a688944891086ba192e21c5229dea54382f4836a209ff8d0a660fac06be \
+    --hash=sha256:4c1fefd7e3d00921c44dc9ca80a775af49698bbfd92ea84498e56acffd4c5469 \
+    --hash=sha256:4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f \
+    --hash=sha256:501d0d7e26b4d261fca8132854d845e4988097611ba2531408ec91cf3fd9d20a \
+    --hash=sha256:516f491c834eb320d6c843156440fe7fc0d50b33e44387fcec5b02f0bc118a4c \
+    --hash=sha256:51806cfe0279e06ed8500ce19479d757db42a30fd509940b1701be9c86a5ff9a \
+    --hash=sha256:562e7494778a69086f0312ec9689f6b6ac1c6b65670ed7d0267e49f57ffa08c4 \
+    --hash=sha256:56b9861a71575f5795bde89256e7467ece3d339c9b43141dbdd54544566b3b94 \
+    --hash=sha256:5b8f5db71b28b8c404956ddf79575ea77aa8b1538e8b2ef9ec877945b3f46442 \
+    --hash=sha256:5c2fb570d7823c2bbaf8b419ba6e5662137f8166e364a8b2b91051a1fb40ab8b \
+    --hash=sha256:5c54afdcbb0182d06836cc3d1be921e540be3ebdf8b8a51ee3ef987537455f84 \
+    --hash=sha256:5d6a6972b93c426ace71e0be9a6f4b2cfae9b1baed2eed2006076a746692288c \
+    --hash=sha256:609251a0ca4770e5a8768ff902aa02bf636339c5a93f9349b48eb1f606f7f3e9 \
+    --hash=sha256:62d172f358f33a26d6b41b28c170c63886742f5b6772a42b59b4f0fa10526cb1 \
+    --hash=sha256:62f7fdb0d1ed2065451f086519865b4c90aa19aed51081979ecd05a21eb4d1be \
+    --hash=sha256:658f2aa69d31e09699705949b5fc4719cbecbd4a97f9656a232e7d6c7be1a367 \
+    --hash=sha256:65ab5685d56914b9a2a34d67dd5488b83213d680b0c5d10b47f81da5a16b0b0e \
+    --hash=sha256:68934b242c51eb02907c5b81d138cb977b2129a0a75a8f8b60b01cb8586c7b21 \
+    --hash=sha256:68b87753c784d6acb8a25b05cb526c3406913c9d988d51f80adecc2b0775d6aa \
+    --hash=sha256:69959bd3167b993e6e710b99051265654133a98f20cec1d9b493b931942e9c16 \
+    --hash=sha256:6a7095eeec6f89111d03dabfe5883a1fd54da319c94e0fb104ee8f23616b572d \
+    --hash=sha256:6b038cc86b285e4f9fea2ba5ee76e89f21ed1ea898e287dc277a25884f3a7dfe \
+    --hash=sha256:6ba0d3dcac281aad8a0e5b14c7ed6f9fa89c8612b47939fc94f80b16e2e9bc83 \
+    --hash=sha256:6e91cf736959057f7aac7adfc83481e03615a8e8dd5758aa1d95ea69e8931dba \
+    --hash=sha256:6ee8c39582d2652dcd516d1b879451500f8db3fe3607ce45d7c5957ab2596040 \
+    --hash=sha256:6f651ebd0b21ec65dfca93aa629610a0dbc13dbc13554f19b0113da2e61a4763 \
+    --hash=sha256:71a8dd38fbd2f2319136d4ae855a7078c69c9a38ae06e0c17c73fd70fc6caad8 \
+    --hash=sha256:74068c601baff6ff021c70f0935b0c7bc528baa8ea210c202e03757c68c5a4ff \
+    --hash=sha256:7437237c6a66b7ca341e868cda48be24b8701862757426852c9b3186de1da8a2 \
+    --hash=sha256:747a3d3e98e24597981ca0be0fd922aebd471fa99d0043a3842d00cdcad7ad6a \
+    --hash=sha256:74bcb423462233bc5d6066e4e98b0264e7c1bed7541fff2f4e34fe6b21563c8b \
+    --hash=sha256:78d9b952e07aed35fe2e1a7ad26e929595412db48535921c5013edc8aa4a35ce \
+    --hash=sha256:7b1cd427cb0d5f7393c31b7496419da594fe600e6fdc4b105a54f82405e6626c \
+    --hash=sha256:7d3d1ca42870cdb6d0d29939630dbe48fa511c203724820fc0fd507b2fb46577 \
+    --hash=sha256:7e2f58095acc211eb9d8b5771bf04df9ff37d6b87618d1cbf85f92399c98dae8 \
+    --hash=sha256:7f41026c1d64043a36fda21d64c5026762d53a77043e73e94b71f0521939cc71 \
+    --hash=sha256:81b4e48da4c69313192d8c8d4311e5d818b8be1afe68ee20f6385d0e96fc9512 \
+    --hash=sha256:86a6b24b19eaebc448dc56b87c4865527855145d851f9fc3891673ff97950540 \
+    --hash=sha256:874a216bf6afaf97c263b56371434e47e2c652d215788396f60477540298218f \
+    --hash=sha256:89e043f1d9d341c52bf2af6d02e6adde62e0a46e6755d5eb60dc6e4f0b8aeca2 \
+    --hash=sha256:8c72e9563347c7395910de6a3100a4840a75a6f60e05af5e58566868d5eb2d6a \
+    --hash=sha256:8dc2c0395bea8254d8daebc76dcf8eb3a95ec2a46fa6fae5eaccee366bfe02ce \
+    --hash=sha256:8f0de2d390af441fe8b2c12626d103540b5d850d585b18fcada58d972b74a74e \
+    --hash=sha256:92e67a0be1639c251d21e35fe74df6bcc40cba445c2cda7c4a967656733249e2 \
+    --hash=sha256:94d6c3782907b5e40e21cadf94b13b0842ac421192f26b84c45f13f3c9d5dc27 \
+    --hash=sha256:97acf1e1fd66ab53dacd2c35b319d7e548380c2e9e8c54525c6e76d21b1ae3b1 \
+    --hash=sha256:9ada35dd21dc6c039259596b358caab6b13f4db4d4a7f8665764d616daf9cc1d \
+    --hash=sha256:9c52100e2c2dbb0649b90467935c4b0de5528833c76a35ea1a2691ec9f1ee7a1 \
+    --hash=sha256:9e41506fec7a7f9405b14aa2d5c8abbb4dbbd09d88f9496958b6d00cb4d45330 \
+    --hash=sha256:9e4b47ac0f5e749cfc618efdf4726269441014ae1d5583e047b452a32e221920 \
+    --hash=sha256:9fb81d2824dff4f2e297a276297e9031f46d2682cafc484f49de182aa5e5df99 \
+    --hash=sha256:a0eabd0a81625049c5df745209dc7fcef6e2aea7793e5f003ba363610aa0a3ff \
+    --hash=sha256:a3d819eb6f9b8677f57f9664265d0a10dd6551d227afb4af2b9cd7bdc2ccbf18 \
+    --hash=sha256:a87de7dd873bf9a792bf1e58b1c3887b9264036629a5bf2d2e6579fe8e73edff \
+    --hash=sha256:aa617107a410245b8660028a7483b68e7914304a6d4882b5ff3d2d3eb5948d8c \
+    --hash=sha256:aac0bbd3e8dd2d9c45ceb82249e8bdd3ac99131a32b4d35c8af3cc9db1657179 \
+    --hash=sha256:ab6dd83b970dc97c2d10bc71aa925b84788c7c05de30241b9e96f9b6d9ea3080 \
+    --hash=sha256:ace2c2326a319a0bb8a8b0e5b570c764962e95818de9f259ce814ee666603f19 \
+    --hash=sha256:ae5fe5c4b525aa82b8076c1a59d642c17b6e8739ecf852522c6321852178119d \
+    --hash=sha256:b11a5d918a6216e521c715b02749240fb07ae5a1fefd4b7bf12f833bc8b4fe70 \
+    --hash=sha256:b1c8c20847b9f34e98080da785bb2336ea982e7f913eed5809e5a3c872900f32 \
+    --hash=sha256:b369d3db3c22ed14c75ccd5af429086f166a19627e84a8fdade3f8f31426e52a \
+    --hash=sha256:b710bc2b8292966b23a6a0121f7a6c51d45d2347edcc75f016ac123b8054d3f2 \
+    --hash=sha256:bd96517ef76c8654446fc3db9242d019a1bb5fe8b751ba414765d59f99210b79 \
+    --hash=sha256:c00f323cc00576df6165cc9d21a4c21285fa6b9989c5c39830c3903dc4303ef3 \
+    --hash=sha256:c162b216070f280fa7da844531169be0baf9ccb17263cf5a8bf876fcd3117fa5 \
+    --hash=sha256:c1a69e58a6bb2de65902051d57fde951febad631a20a64572677a1052690482f \
+    --hash=sha256:c1f794c02903c2824fccce5b20c339a1a14b114e83b306ff11b597c5f71a1c8d \
+    --hash=sha256:c24037349665434f375645fa9d1f5304800cec574d0310f618490c871fd902b3 \
+    --hash=sha256:c300306673aa0f3ed5ed9372b21867690a17dba38c68c44b287437c362ce486b \
+    --hash=sha256:c56a1d43b2f9ee4786e4658c7903f05da35b923fb53c11025712562d5cc02753 \
+    --hash=sha256:c6379f35350b655fd817cd0d6cbeef7f265f3ae5fedb1caae2eb442bbeae9ab9 \
+    --hash=sha256:c802e1c2ed9f0c06a65bc4ed0189d000ada8049312cfeab6ca635e39c9608957 \
+    --hash=sha256:cb83f8a875b3d9b458cada4f880fa498646874ba4011dc974e071a0a84a1b033 \
+    --hash=sha256:cf120cce539453ae086eacc0130a324e7026113510efa83ab42ef3fcfccac7fb \
+    --hash=sha256:dd36439be765e2dde7660212b5275641edbc813e7b24668831a5c8ac91180656 \
+    --hash=sha256:dd5350b55f9fecddc51385463a4f67a5da829bc741e38cf689f38ec9023f54ab \
+    --hash=sha256:df5c7333167b9674aa8ae1d4008fa4bc17a313cc490b2cca27838bbdcc6bb15b \
+    --hash=sha256:e63601ad5cd8f860aa99d109889b5ac34de571c7ee902d6812d5d9ddcc77fa7d \
+    --hash=sha256:e92ce66cd919d18d14b3856906a61d3f6b6a8500e0794142338da644260595cd \
+    --hash=sha256:e99f5507401436fdcc85036a2e7dc2e28d962550afe1cbfc07c40e454256a859 \
+    --hash=sha256:ea2e2f6f801696ad7de8aec061044d6c8c0dd4037608c7cab38a9a4d316bfb11 \
+    --hash=sha256:eafa2c8658f4e560b098fe9fc54539f86528651f61849b22111a9b107d18910c \
+    --hash=sha256:ecd4ad8453ac17bc7ba3868371bffb46f628161ad0eefbd0a855d2c8c32dd81a \
+    --hash=sha256:ee70d08fd60c9565ba8190f41a46a54096afa0eeb8f76bd66f2c25d3b1b83005 \
+    --hash=sha256:eec1bb8cdbba2925bedc887bc0609a80e599c75b12d87ae42ac23fd199445654 \
+    --hash=sha256:ef0c1fe22171dd7c7c27147f2e9c3e86f8bdf473fed75f16b0c2e84a5030ce80 \
+    --hash=sha256:f2901429da1e645ce548bf9171784c0f74f0718c3f6150ce166be39e4dd66c3e \
+    --hash=sha256:f422a209d2455c56849442ae42f25dbaaba1c6c3f501d58761c619c7836642ec \
+    --hash=sha256:f65e5120863c2b266dbcc927b306c5b78e502c71edf3295dfcb9501ec96e5fc7 \
+    --hash=sha256:f7d4a670107d75dfe5ad080bed6c341d18c4442f9378c9f58e5851e86eb79965 \
+    --hash=sha256:f914c03e6a31deb632e2daa881fe198461f4d06e57ac3d0e05bbcab8eae01945 \
+    --hash=sha256:fb66442c2546446944437df74379e9cf9e9db353e61301d1a0e26482f43f0dd8
 mako==1.3.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a \
     --hash=sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc
@@ -939,97 +948,99 @@ maxminddb==2.6.2 ; python_version >= "3.10" and python_version < "4.0" \
 mdurl==0.1.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-multidict==6.0.5 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556 \
-    --hash=sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c \
-    --hash=sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29 \
-    --hash=sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b \
-    --hash=sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8 \
-    --hash=sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7 \
-    --hash=sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd \
-    --hash=sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40 \
-    --hash=sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6 \
-    --hash=sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3 \
-    --hash=sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c \
-    --hash=sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9 \
-    --hash=sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5 \
-    --hash=sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae \
-    --hash=sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442 \
-    --hash=sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9 \
-    --hash=sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc \
-    --hash=sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c \
-    --hash=sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea \
-    --hash=sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5 \
-    --hash=sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50 \
-    --hash=sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182 \
-    --hash=sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453 \
-    --hash=sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e \
-    --hash=sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600 \
-    --hash=sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733 \
-    --hash=sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda \
-    --hash=sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241 \
-    --hash=sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461 \
-    --hash=sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e \
-    --hash=sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e \
-    --hash=sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b \
-    --hash=sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e \
-    --hash=sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7 \
-    --hash=sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386 \
-    --hash=sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd \
-    --hash=sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9 \
-    --hash=sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf \
-    --hash=sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee \
-    --hash=sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5 \
-    --hash=sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a \
-    --hash=sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271 \
-    --hash=sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54 \
-    --hash=sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4 \
-    --hash=sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496 \
-    --hash=sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb \
-    --hash=sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319 \
-    --hash=sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3 \
-    --hash=sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f \
-    --hash=sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527 \
-    --hash=sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed \
-    --hash=sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604 \
-    --hash=sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef \
-    --hash=sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8 \
-    --hash=sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5 \
-    --hash=sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5 \
-    --hash=sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626 \
-    --hash=sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c \
-    --hash=sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d \
-    --hash=sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c \
-    --hash=sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc \
-    --hash=sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc \
-    --hash=sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b \
-    --hash=sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38 \
-    --hash=sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450 \
-    --hash=sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1 \
-    --hash=sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f \
-    --hash=sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3 \
-    --hash=sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755 \
-    --hash=sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226 \
-    --hash=sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a \
-    --hash=sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046 \
-    --hash=sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf \
-    --hash=sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479 \
-    --hash=sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e \
-    --hash=sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1 \
-    --hash=sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a \
-    --hash=sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83 \
-    --hash=sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929 \
-    --hash=sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93 \
-    --hash=sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a \
-    --hash=sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c \
-    --hash=sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44 \
-    --hash=sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89 \
-    --hash=sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba \
-    --hash=sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e \
-    --hash=sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da \
-    --hash=sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24 \
-    --hash=sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423 \
-    --hash=sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef
+multidict==6.1.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f \
+    --hash=sha256:06809f4f0f7ab7ea2cabf9caca7d79c22c0758b58a71f9d32943ae13c7ace056 \
+    --hash=sha256:071120490b47aa997cca00666923a83f02c7fbb44f71cf7f136df753f7fa8761 \
+    --hash=sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3 \
+    --hash=sha256:0e2b90b43e696f25c62656389d32236e049568b39320e2735d51f08fd362761b \
+    --hash=sha256:0e5f362e895bc5b9e67fe6e4ded2492d8124bdf817827f33c5b46c2fe3ffaca6 \
+    --hash=sha256:10524ebd769727ac77ef2278390fb0068d83f3acb7773792a5080f2b0abf7748 \
+    --hash=sha256:10a9b09aba0c5b48c53761b7c720aaaf7cf236d5fe394cd399c7ba662d5f9966 \
+    --hash=sha256:16e5f4bf4e603eb1fdd5d8180f1a25f30056f22e55ce51fb3d6ad4ab29f7d96f \
+    --hash=sha256:188215fc0aafb8e03341995e7c4797860181562380f81ed0a87ff455b70bf1f1 \
+    --hash=sha256:189f652a87e876098bbc67b4da1049afb5f5dfbaa310dd67c594b01c10388db6 \
+    --hash=sha256:1ca0083e80e791cffc6efce7660ad24af66c8d4079d2a750b29001b53ff59ada \
+    --hash=sha256:1e16bf3e5fc9f44632affb159d30a437bfe286ce9e02754759be5536b169b305 \
+    --hash=sha256:2090f6a85cafc5b2db085124d752757c9d251548cedabe9bd31afe6363e0aff2 \
+    --hash=sha256:20b9b5fbe0b88d0bdef2012ef7dee867f874b72528cf1d08f1d59b0e3850129d \
+    --hash=sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a \
+    --hash=sha256:22f3105d4fb15c8f57ff3959a58fcab6ce36814486500cd7485651230ad4d4ef \
+    --hash=sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c \
+    --hash=sha256:27e5fc84ccef8dfaabb09d82b7d179c7cf1a3fbc8a966f8274fcb4ab2eb4cadb \
+    --hash=sha256:3380252550e372e8511d49481bd836264c009adb826b23fefcc5dd3c69692f60 \
+    --hash=sha256:3702ea6872c5a2a4eeefa6ffd36b042e9773f05b1f37ae3ef7264b1163c2dcf6 \
+    --hash=sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4 \
+    --hash=sha256:3914f5aaa0f36d5d60e8ece6a308ee1c9784cd75ec8151062614657a114c4478 \
+    --hash=sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81 \
+    --hash=sha256:3c8b88a2ccf5493b6c8da9076fb151ba106960a2df90c2633f342f120751a9e7 \
+    --hash=sha256:3e97b5e938051226dc025ec80980c285b053ffb1e25a3db2a3aa3bc046bf7f56 \
+    --hash=sha256:3ec660d19bbc671e3a6443325f07263be452c453ac9e512f5eb935e7d4ac28b3 \
+    --hash=sha256:3efe2c2cb5763f2f1b275ad2bf7a287d3f7ebbef35648a9726e3b69284a4f3d6 \
+    --hash=sha256:483a6aea59cb89904e1ceabd2b47368b5600fb7de78a6e4a2c2987b2d256cf30 \
+    --hash=sha256:4867cafcbc6585e4b678876c489b9273b13e9fff9f6d6d66add5e15d11d926cb \
+    --hash=sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506 \
+    --hash=sha256:4a9cb68166a34117d6646c0023c7b759bf197bee5ad4272f420a0141d7eb03a0 \
+    --hash=sha256:4b820514bfc0b98a30e3d85462084779900347e4d49267f747ff54060cc33925 \
+    --hash=sha256:4e18b656c5e844539d506a0a06432274d7bd52a7487e6828c63a63d69185626c \
+    --hash=sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6 \
+    --hash=sha256:50b3a2710631848991d0bf7de077502e8994c804bb805aeb2925a981de58ec2e \
+    --hash=sha256:55b6d90641869892caa9ca42ff913f7ff1c5ece06474fbd32fb2cf6834726c95 \
+    --hash=sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2 \
+    --hash=sha256:58130ecf8f7b8112cdb841486404f1282b9c86ccb30d3519faf301b2e5659133 \
+    --hash=sha256:5845c1fd4866bb5dd3125d89b90e57ed3138241540897de748cdf19de8a2fca2 \
+    --hash=sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa \
+    --hash=sha256:5b48204e8d955c47c55b72779802b219a39acc3ee3d0116d5080c388970b76e3 \
+    --hash=sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3 \
+    --hash=sha256:6180c0ae073bddeb5a97a38c03f30c233e0a4d39cd86166251617d1bbd0af436 \
+    --hash=sha256:682b987361e5fd7a139ed565e30d81fd81e9629acc7d925a205366877d8c8657 \
+    --hash=sha256:6b5d83030255983181005e6cfbac1617ce9746b219bc2aad52201ad121226581 \
+    --hash=sha256:6bb5992037f7a9eff7991ebe4273ea7f51f1c1c511e6a2ce511d0e7bdb754492 \
+    --hash=sha256:73eae06aa53af2ea5270cc066dcaf02cc60d2994bbb2c4ef5764949257d10f43 \
+    --hash=sha256:76f364861c3bfc98cbbcbd402d83454ed9e01a5224bb3a28bf70002a230f73e2 \
+    --hash=sha256:820c661588bd01a0aa62a1283f20d2be4281b086f80dad9e955e690c75fb54a2 \
+    --hash=sha256:82176036e65644a6cc5bd619f65f6f19781e8ec2e5330f51aa9ada7504cc1926 \
+    --hash=sha256:87701f25a2352e5bf7454caa64757642734da9f6b11384c1f9d1a8e699758057 \
+    --hash=sha256:9079dfc6a70abe341f521f78405b8949f96db48da98aeb43f9907f342f627cdc \
+    --hash=sha256:90f8717cb649eea3504091e640a1b8568faad18bd4b9fcd692853a04475a4b80 \
+    --hash=sha256:957cf8e4b6e123a9eea554fa7ebc85674674b713551de587eb318a2df3e00255 \
+    --hash=sha256:99f826cbf970077383d7de805c0681799491cb939c25450b9b5b3ced03ca99f1 \
+    --hash=sha256:9f636b730f7e8cb19feb87094949ba54ee5357440b9658b2a32a5ce4bce53972 \
+    --hash=sha256:a114d03b938376557927ab23f1e950827c3b893ccb94b62fd95d430fd0e5cf53 \
+    --hash=sha256:a185f876e69897a6f3325c3f19f26a297fa058c5e456bfcff8015e9a27e83ae1 \
+    --hash=sha256:a7a9541cd308eed5e30318430a9c74d2132e9a8cb46b901326272d780bf2d423 \
+    --hash=sha256:aa466da5b15ccea564bdab9c89175c762bc12825f4659c11227f515cee76fa4a \
+    --hash=sha256:aaed8b0562be4a0876ee3b6946f6869b7bcdb571a5d1496683505944e268b160 \
+    --hash=sha256:ab7c4ceb38d91570a650dba194e1ca87c2b543488fe9309b4212694174fd539c \
+    --hash=sha256:ac10f4c2b9e770c4e393876e35a7046879d195cd123b4f116d299d442b335bcd \
+    --hash=sha256:b04772ed465fa3cc947db808fa306d79b43e896beb677a56fb2347ca1a49c1fa \
+    --hash=sha256:b1c416351ee6271b2f49b56ad7f308072f6f44b37118d69c2cad94f3fa8a40d5 \
+    --hash=sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b \
+    --hash=sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa \
+    --hash=sha256:b58c621844d55e71c1b7f7c498ce5aa6985d743a1a59034c57a905b3f153c1ef \
+    --hash=sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44 \
+    --hash=sha256:c08be4f460903e5a9d0f76818db3250f12e9c344e79314d1d570fc69d7f4eae4 \
+    --hash=sha256:c7053d3b0353a8b9de430a4f4b4268ac9a4fb3481af37dfe49825bf45ca24156 \
+    --hash=sha256:c943a53e9186688b45b323602298ab727d8865d8c9ee0b17f8d62d14b56f0753 \
+    --hash=sha256:ce2186a7df133a9c895dea3331ddc5ddad42cdd0d1ea2f0a51e5d161e4762f28 \
+    --hash=sha256:d093be959277cb7dee84b801eb1af388b6ad3ca6a6b6bf1ed7585895789d027d \
+    --hash=sha256:d094ddec350a2fb899fec68d8353c78233debde9b7d8b4beeafa70825f1c281a \
+    --hash=sha256:d1a9dd711d0877a1ece3d2e4fea11a8e75741ca21954c919406b44e7cf971304 \
+    --hash=sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008 \
+    --hash=sha256:d618649d4e70ac6efcbba75be98b26ef5078faad23592f9b51ca492953012429 \
+    --hash=sha256:d83a047959d38a7ff552ff94be767b7fd79b831ad1cd9920662db05fec24fe72 \
+    --hash=sha256:d8fff389528cad1618fb4b26b95550327495462cd745d879a8c7c2115248e399 \
+    --hash=sha256:da1758c76f50c39a2efd5e9859ce7d776317eb1dd34317c8152ac9251fc574a3 \
+    --hash=sha256:db7457bac39421addd0c8449933ac32d8042aae84a14911a757ae6ca3eef1392 \
+    --hash=sha256:e27bbb6d14416713a8bd7aaa1313c0fc8d44ee48d74497a0ff4c3a1b6ccb5167 \
+    --hash=sha256:e617fb6b0b6953fffd762669610c1c4ffd05632c138d61ac7e14ad187870669c \
+    --hash=sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774 \
+    --hash=sha256:ec2abea24d98246b94913b76a125e855eb5c434f7c46546046372fe60f666351 \
+    --hash=sha256:f179dee3b863ab1c59580ff60f9d99f632f34ccb38bf67a33ec6b3ecadd0fd76 \
+    --hash=sha256:f4c035da3f544b1882bac24115f3e2e8760f10a0107614fc9839fd232200b875 \
+    --hash=sha256:f67f217af4b1ff66c68a87318012de788dd95fcfeb24cc889011f4e1c7454dfd \
+    --hash=sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28 \
+    --hash=sha256:ff3827aef427c89a25cc96ded1759271a93603aba9fb977a6d264648ebf989db
 netaddr==0.9.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:5148b1055679d2a1ec070c521b7db82137887fabd6d7e37f5199b44f775c3bb1 \
     --hash=sha256:7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128
@@ -1195,102 +1206,102 @@ pybinaryedge==0.5 ; python_version >= "3.10" and python_version < "4.0" \
 pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
     --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.4.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315 \
-    --hash=sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pydicom==2.4.4 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:90b4801d851ce65be3df520e16bbfa3d6c767cf2a3a3b1c18f6780e6b670b87a \
     --hash=sha256:f9f8e19b78525be57aa6384484298833e4d06ac1d6226c79459131ddb0bd7c42
@@ -1314,6 +1325,9 @@ pynetdicom==2.0.2 ; python_version >= "3.10" and python_version < "4.0" \
 pytest-env==1.1.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:aada77e6d09fcfb04540a6e462c58533c37df35fa853da78707b17ec04d17dfc \
     --hash=sha256:fcd7dc23bb71efd3d35632bde1bbe5ee8c8dc4489d6617fb010674880d96216b
+pytest-mock==3.14.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0b72c38033392a5f4621342fe11e9219ac11ec9d375f8e2a0c164539e0d70f6f \
+    --hash=sha256:2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0
 pytest==8.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4ba08f9ae7dcf84ded419494d229b48d0903ea6407b030eaec46df5e6a73bba5 \
     --hash=sha256:c132345d12ce551242c87269de812483f5bcc87cdbb4722e48487ba194f9fdce
@@ -1326,6 +1340,9 @@ python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
 python-libnmap==0.7.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d03629256c2ee9ab37390c28d4c4c2ae9637cd0861dd8ab9e0f32779545936c0
 python-wappalyzer @ git+https://github.com/chorsley/python-Wappalyzer.git@ac651718af77804e52b826944933be831d491387 ; python_version >= "3.10" and python_version < "4.0"
+pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a \
+    --hash=sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725
 pywin32==306 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" \
     --hash=sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d \
     --hash=sha256:1c73ea9a0d2283d889001998059f5eaaba3b6238f767c9cf2833b13e6a685f65 \
@@ -1534,9 +1551,9 @@ tomli==2.0.1 ; python_version >= "3.10" and python_version < "3.11" \
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -1619,97 +1636,99 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
 xlsxwriter==3.2.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:9977d0c661a72866a61f9f7a809e25ebbb0fb7036baa3b9fe74afcfca6b3cb8c \
     --hash=sha256:ecfd5405b3e0e228219bcaf24c2ca0915e012ca9464a14048021d21a995d490e
-yarl==1.9.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51 \
-    --hash=sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce \
-    --hash=sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559 \
-    --hash=sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0 \
-    --hash=sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81 \
-    --hash=sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc \
-    --hash=sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4 \
-    --hash=sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c \
-    --hash=sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130 \
-    --hash=sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136 \
-    --hash=sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e \
-    --hash=sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec \
-    --hash=sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7 \
-    --hash=sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1 \
-    --hash=sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455 \
-    --hash=sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099 \
-    --hash=sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129 \
-    --hash=sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10 \
-    --hash=sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142 \
-    --hash=sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98 \
-    --hash=sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa \
-    --hash=sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7 \
-    --hash=sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525 \
-    --hash=sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c \
-    --hash=sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9 \
-    --hash=sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c \
-    --hash=sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8 \
-    --hash=sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b \
-    --hash=sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf \
-    --hash=sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23 \
-    --hash=sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd \
-    --hash=sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27 \
-    --hash=sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f \
-    --hash=sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece \
-    --hash=sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434 \
-    --hash=sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec \
-    --hash=sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff \
-    --hash=sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78 \
-    --hash=sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d \
-    --hash=sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863 \
-    --hash=sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53 \
-    --hash=sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31 \
-    --hash=sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15 \
-    --hash=sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5 \
-    --hash=sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b \
-    --hash=sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57 \
-    --hash=sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3 \
-    --hash=sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1 \
-    --hash=sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f \
-    --hash=sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad \
-    --hash=sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c \
-    --hash=sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7 \
-    --hash=sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2 \
-    --hash=sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b \
-    --hash=sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2 \
-    --hash=sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b \
-    --hash=sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9 \
-    --hash=sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be \
-    --hash=sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e \
-    --hash=sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984 \
-    --hash=sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4 \
-    --hash=sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074 \
-    --hash=sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2 \
-    --hash=sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392 \
-    --hash=sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91 \
-    --hash=sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541 \
-    --hash=sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf \
-    --hash=sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572 \
-    --hash=sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66 \
-    --hash=sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575 \
-    --hash=sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14 \
-    --hash=sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5 \
-    --hash=sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1 \
-    --hash=sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e \
-    --hash=sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551 \
-    --hash=sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17 \
-    --hash=sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead \
-    --hash=sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0 \
-    --hash=sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe \
-    --hash=sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234 \
-    --hash=sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0 \
-    --hash=sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7 \
-    --hash=sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34 \
-    --hash=sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42 \
-    --hash=sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385 \
-    --hash=sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78 \
-    --hash=sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be \
-    --hash=sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958 \
-    --hash=sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749 \
-    --hash=sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+yarl==1.11.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:01a8697ec24f17c349c4f655763c4db70eebc56a5f82995e5e26e837c6eb0e49 \
+    --hash=sha256:02da8759b47d964f9173c8675710720b468aa1c1693be0c9c64abb9d8d9a4867 \
+    --hash=sha256:04293941646647b3bfb1719d1d11ff1028e9c30199509a844da3c0f5919dc520 \
+    --hash=sha256:067b961853c8e62725ff2893226fef3d0da060656a9827f3f520fb1d19b2b68a \
+    --hash=sha256:077da604852be488c9a05a524068cdae1e972b7dc02438161c32420fb4ec5e14 \
+    --hash=sha256:09696438cb43ea6f9492ef237761b043f9179f455f405279e609f2bc9100212a \
+    --hash=sha256:0b8486f322d8f6a38539136a22c55f94d269addb24db5cb6f61adc61eabc9d93 \
+    --hash=sha256:0ea9682124fc062e3d931c6911934a678cb28453f957ddccf51f568c2f2b5e05 \
+    --hash=sha256:0f351fa31234699d6084ff98283cb1e852270fe9e250a3b3bf7804eb493bd937 \
+    --hash=sha256:14438dfc5015661f75f85bc5adad0743678eefee266ff0c9a8e32969d5d69f74 \
+    --hash=sha256:15061ce6584ece023457fb8b7a7a69ec40bf7114d781a8c4f5dcd68e28b5c53b \
+    --hash=sha256:15439f3c5c72686b6c3ff235279630d08936ace67d0fe5c8d5bbc3ef06f5a420 \
+    --hash=sha256:17b5a386d0d36fb828e2fb3ef08c8829c1ebf977eef88e5367d1c8c94b454639 \
+    --hash=sha256:18ac56c9dd70941ecad42b5a906820824ca72ff84ad6fa18db33c2537ae2e089 \
+    --hash=sha256:1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53 \
+    --hash=sha256:1e969fa4c1e0b1a391f3fcbcb9ec31e84440253325b534519be0d28f4b6b533e \
+    --hash=sha256:1fa2e7a406fbd45b61b4433e3aa254a2c3e14c4b3186f6e952d08a730807fa0c \
+    --hash=sha256:2164cd9725092761fed26f299e3f276bb4b537ca58e6ff6b252eae9631b5c96e \
+    --hash=sha256:21a7c12321436b066c11ec19c7e3cb9aec18884fe0d5b25d03d756a9e654edfe \
+    --hash=sha256:238a21849dd7554cb4d25a14ffbfa0ef380bb7ba201f45b144a14454a72ffa5a \
+    --hash=sha256:250e888fa62d73e721f3041e3a9abf427788a1934b426b45e1b92f62c1f68366 \
+    --hash=sha256:25861303e0be76b60fddc1250ec5986c42f0a5c0c50ff57cc30b1be199c00e63 \
+    --hash=sha256:267b24f891e74eccbdff42241c5fb4f974de2d6271dcc7d7e0c9ae1079a560d9 \
+    --hash=sha256:27fcb271a41b746bd0e2a92182df507e1c204759f460ff784ca614e12dd85145 \
+    --hash=sha256:2909fa3a7d249ef64eeb2faa04b7957e34fefb6ec9966506312349ed8a7e77bf \
+    --hash=sha256:3257978c870728a52dcce8c2902bf01f6c53b65094b457bf87b2644ee6238ddc \
+    --hash=sha256:327c724b01b8641a1bf1ab3b232fb638706e50f76c0b5bf16051ab65c868fac5 \
+    --hash=sha256:3de5292f9f0ee285e6bd168b2a77b2a00d74cbcfa420ed078456d3023d2f6dff \
+    --hash=sha256:3fce4da3703ee6048ad4138fe74619c50874afe98b1ad87b2698ef95bf92c96d \
+    --hash=sha256:3ff6b1617aa39279fe18a76c8d165469c48b159931d9b48239065767ee455b2b \
+    --hash=sha256:400cd42185f92de559d29eeb529e71d80dfbd2f45c36844914a4a34297ca6f00 \
+    --hash=sha256:4179522dc0305c3fc9782549175c8e8849252fefeb077c92a73889ccbcd508ad \
+    --hash=sha256:4307d9a3417eea87715c9736d050c83e8c1904e9b7aada6ce61b46361b733d92 \
+    --hash=sha256:476e20c433b356e16e9a141449f25161e6b69984fb4cdbd7cd4bd54c17844998 \
+    --hash=sha256:489fa8bde4f1244ad6c5f6d11bb33e09cf0d1d0367edb197619c3e3fc06f3d91 \
+    --hash=sha256:48a28bed68ab8fb7e380775f0029a079f08a17799cb3387a65d14ace16c12e2b \
+    --hash=sha256:48dfd117ab93f0129084577a07287376cc69c08138694396f305636e229caa1a \
+    --hash=sha256:4973eac1e2ff63cf187073cd4e1f1148dcd119314ab79b88e1b3fad74a18c9d5 \
+    --hash=sha256:498442e3af2a860a663baa14fbf23fb04b0dd758039c0e7c8f91cb9279799bff \
+    --hash=sha256:501c503eed2bb306638ccb60c174f856cc3246c861829ff40eaa80e2f0330367 \
+    --hash=sha256:504cf0d4c5e4579a51261d6091267f9fd997ef58558c4ffa7a3e1460bd2336fa \
+    --hash=sha256:61a5f2c14d0a1adfdd82258f756b23a550c13ba4c86c84106be4c111a3a4e413 \
+    --hash=sha256:637c7ddb585a62d4469f843dac221f23eec3cbad31693b23abbc2c366ad41ff4 \
+    --hash=sha256:66b63c504d2ca43bf7221a1f72fbe981ff56ecb39004c70a94485d13e37ebf45 \
+    --hash=sha256:67459cf8cf31da0e2cbdb4b040507e535d25cfbb1604ca76396a3a66b8ba37a6 \
+    --hash=sha256:688654f8507464745ab563b041d1fb7dab5d9912ca6b06e61d1c4708366832f5 \
+    --hash=sha256:6907daa4b9d7a688063ed098c472f96e8181733c525e03e866fb5db480a424df \
+    --hash=sha256:69721b8effdb588cb055cc22f7c5105ca6fdaa5aeb3ea09021d517882c4a904c \
+    --hash=sha256:6d23754b9939cbab02c63434776df1170e43b09c6a517585c7ce2b3d449b7318 \
+    --hash=sha256:7175a87ab8f7fbde37160a15e58e138ba3b2b0e05492d7351314a250d61b1591 \
+    --hash=sha256:72bf26f66456baa0584eff63e44545c9f0eaed9b73cb6601b647c91f14c11f38 \
+    --hash=sha256:74db2ef03b442276d25951749a803ddb6e270d02dda1d1c556f6ae595a0d76a8 \
+    --hash=sha256:750f656832d7d3cb0c76be137ee79405cc17e792f31e0a01eee390e383b2936e \
+    --hash=sha256:75e0ae31fb5ccab6eda09ba1494e87eb226dcbd2372dae96b87800e1dcc98804 \
+    --hash=sha256:768ecc550096b028754ea28bf90fde071c379c62c43afa574edc6f33ee5daaec \
+    --hash=sha256:7d51324a04fc4b0e097ff8a153e9276c2593106a811704025bbc1d6916f45ca6 \
+    --hash=sha256:7e975a2211952a8a083d1b9d9ba26472981ae338e720b419eb50535de3c02870 \
+    --hash=sha256:8215f6f21394d1f46e222abeb06316e77ef328d628f593502d8fc2a9117bde83 \
+    --hash=sha256:8258c86f47e080a258993eed877d579c71da7bda26af86ce6c2d2d072c11320d \
+    --hash=sha256:8418c053aeb236b20b0ab8fa6bacfc2feaaf7d4683dd96528610989c99723d5f \
+    --hash=sha256:87f020d010ba80a247c4abc335fc13421037800ca20b42af5ae40e5fd75e7909 \
+    --hash=sha256:884eab2ce97cbaf89f264372eae58388862c33c4f551c15680dd80f53c89a269 \
+    --hash=sha256:8a336eaa7ee7e87cdece3cedb395c9657d227bfceb6781295cf56abcd3386a26 \
+    --hash=sha256:8aef1b64da41d18026632d99a06b3fefe1d08e85dd81d849fa7c96301ed22f1b \
+    --hash=sha256:8aef97ba1dd2138112890ef848e17d8526fe80b21f743b4ee65947ea184f07a2 \
+    --hash=sha256:8ed653638ef669e0efc6fe2acb792275cb419bf9cb5c5049399f3556995f23c7 \
+    --hash=sha256:9361628f28f48dcf8b2f528420d4d68102f593f9c2e592bfc842f5fb337e44fd \
+    --hash=sha256:946eedc12895873891aaceb39bceb484b4977f70373e0122da483f6c38faaa68 \
+    --hash=sha256:94d0caaa912bfcdc702a4204cd5e2bb01eb917fc4f5ea2315aa23962549561b0 \
+    --hash=sha256:964a428132227edff96d6f3cf261573cb0f1a60c9a764ce28cda9525f18f7786 \
+    --hash=sha256:999bfee0a5b7385a0af5ffb606393509cfde70ecca4f01c36985be6d33e336da \
+    --hash=sha256:a08ea567c16f140af8ddc7cb58e27e9138a1386e3e6e53982abaa6f2377b38cc \
+    --hash=sha256:a28b70c9e2213de425d9cba5ab2e7f7a1c8ca23a99c4b5159bf77b9c31251447 \
+    --hash=sha256:a34e1e30f1774fa35d37202bbeae62423e9a79d78d0874e5556a593479fdf239 \
+    --hash=sha256:a4264515f9117be204935cd230fb2a052dd3792789cc94c101c535d349b3dab0 \
+    --hash=sha256:a7915ea49b0c113641dc4d9338efa9bd66b6a9a485ffe75b9907e8573ca94b84 \
+    --hash=sha256:aac44097d838dda26526cffb63bdd8737a2dbdf5f2c68efb72ad83aec6673c7e \
+    --hash=sha256:b91044952da03b6f95fdba398d7993dd983b64d3c31c358a4c89e3c19b6f7aef \
+    --hash=sha256:ba444bdd4caa2a94456ef67a2f383710928820dd0117aae6650a4d17029fa25e \
+    --hash=sha256:c2dc4250fe94d8cd864d66018f8344d4af50e3758e9d725e94fecfa27588ff82 \
+    --hash=sha256:c35f493b867912f6fda721a59cc7c4766d382040bdf1ddaeeaa7fa4d072f4675 \
+    --hash=sha256:c92261eb2ad367629dc437536463dc934030c9e7caca861cc51990fe6c565f26 \
+    --hash=sha256:ce928c9c6409c79e10f39604a7e214b3cb69552952fbda8d836c052832e6a979 \
+    --hash=sha256:d95b52fbef190ca87d8c42f49e314eace4fc52070f3dfa5f87a6594b0c1c6e46 \
+    --hash=sha256:dae7bd0daeb33aa3e79e72877d3d51052e8b19c9025ecf0374f542ea8ec120e4 \
+    --hash=sha256:e286580b6511aac7c3268a78cdb861ec739d3e5a2a53b4809faef6b49778eaff \
+    --hash=sha256:e4b53f73077e839b3f89c992223f15b1d2ab314bdbdf502afdc7bb18e95eae27 \
+    --hash=sha256:e8f63904df26d1a66aabc141bfd258bf738b9bc7bc6bdef22713b4f5ef789a4c \
+    --hash=sha256:f3a6d90cab0bdf07df8f176eae3a07127daafcf7457b997b2bf46776da2c7eb7 \
+    --hash=sha256:f41fa79114a1d2eddb5eea7b912d6160508f57440bd302ce96eaa384914cd265 \
+    --hash=sha256:f46f81501160c28d0c0b7333b4f7be8983dbbc161983b6fb814024d1b4952f79 \
+    --hash=sha256:f61db3b7e870914dbd9434b560075e0366771eecbe6d2b5561f5bc7485f39efd
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/boefjes/requirements.txt b/boefjes/requirements.txt
index 4ad7647fb2d..ed15784a992 100644
--- a/boefjes/requirements.txt
+++ b/boefjes/requirements.txt
@@ -1,83 +1,98 @@
 aiohappyeyeballs==2.3.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4d6dea59215537dbc746e93e779caea8178c866856a721c9c660d7a5a7b8be03 \
     --hash=sha256:6fa48b9f1317254f122a07a131a86b71ca6946ca989ce6326fff54a99a920105
-aiohttp==3.10.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:05d66203a530209cbe40f102ebaac0b2214aba2a33c075d0bf825987c36f1f0b \
-    --hash=sha256:08bd0754d257b2db27d6bab208c74601df6f21bfe4cb2ec7b258ba691aac64b3 \
-    --hash=sha256:0974f3b5b0132edcec92c3306f858ad4356a63d26b18021d859c9927616ebf27 \
-    --hash=sha256:09bc79275737d4dc066e0ae2951866bb36d9c6b460cb7564f111cc0427f14844 \
-    --hash=sha256:123e5819bfe1b87204575515cf448ab3bf1489cdeb3b61012bde716cda5853e7 \
-    --hash=sha256:13031e7ec1188274bad243255c328cc3019e36a5a907978501256000d57a7201 \
-    --hash=sha256:166de65e2e4e63357cfa8417cf952a519ac42f1654cb2d43ed76899e2319b1ee \
-    --hash=sha256:214277dcb07ab3875f17ee1c777d446dcce75bea85846849cc9d139ab8f5081f \
-    --hash=sha256:21650e7032cc2d31fc23d353d7123e771354f2a3d5b05a5647fc30fea214e696 \
-    --hash=sha256:24fade6dae446b183e2410a8628b80df9b7a42205c6bfc2eff783cbeedc224a2 \
-    --hash=sha256:2a5d0ea8a6467b15d53b00c4e8ea8811e47c3cc1bdbc62b1aceb3076403d551f \
-    --hash=sha256:2b0f670502100cdc567188c49415bebba947eb3edaa2028e1a50dd81bd13363f \
-    --hash=sha256:2bbc55a964b8eecb341e492ae91c3bd0848324d313e1e71a27e3d96e6ee7e8e8 \
-    --hash=sha256:32007fdcaab789689c2ecaaf4b71f8e37bf012a15cd02c0a9db8c4d0e7989fa8 \
-    --hash=sha256:3461d9294941937f07bbbaa6227ba799bc71cc3b22c40222568dc1cca5118f68 \
-    --hash=sha256:3731a73ddc26969d65f90471c635abd4e1546a25299b687e654ea6d2fc052394 \
-    --hash=sha256:38d91b98b4320ffe66efa56cb0f614a05af53b675ce1b8607cdb2ac826a8d58e \
-    --hash=sha256:3a9dcdccf50284b1b0dc72bc57e5bbd3cc9bf019060dfa0668f63241ccc16aa7 \
-    --hash=sha256:434b3ab75833accd0b931d11874e206e816f6e6626fd69f643d6a8269cd9166a \
-    --hash=sha256:43b09f38a67679e32d380fe512189ccb0b25e15afc79b23fbd5b5e48e4fc8fd9 \
-    --hash=sha256:44bb159b55926b57812dca1b21c34528e800963ffe130d08b049b2d6b994ada7 \
-    --hash=sha256:48665433bb59144aaf502c324694bec25867eb6630fcd831f7a893ca473fcde4 \
-    --hash=sha256:50544fe498c81cb98912afabfc4e4d9d85e89f86238348e3712f7ca6a2f01dab \
-    --hash=sha256:5337cc742a03f9e3213b097abff8781f79de7190bbfaa987bd2b7ceb5bb0bdec \
-    --hash=sha256:56fb94bae2be58f68d000d046172d8b8e6b1b571eb02ceee5535e9633dcd559c \
-    --hash=sha256:59c489661edbd863edb30a8bd69ecb044bd381d1818022bc698ba1b6f80e5dd1 \
-    --hash=sha256:5ba2e838b5e6a8755ac8297275c9460e729dc1522b6454aee1766c6de6d56e5e \
-    --hash=sha256:61ccb867b2f2f53df6598eb2a93329b5eee0b00646ee79ea67d68844747a418e \
-    --hash=sha256:671efce3a4a0281060edf9a07a2f7e6230dca3a1cbc61d110eee7753d28405f7 \
-    --hash=sha256:673bb6e3249dc8825df1105f6ef74e2eab779b7ff78e96c15cadb78b04a83752 \
-    --hash=sha256:6ae9ae382d1c9617a91647575255ad55a48bfdde34cc2185dd558ce476bf16e9 \
-    --hash=sha256:6c51ed03e19c885c8e91f574e4bbe7381793f56f93229731597e4a499ffef2a5 \
-    --hash=sha256:6d881353264e6156f215b3cb778c9ac3184f5465c2ece5e6fce82e68946868ef \
-    --hash=sha256:7084876352ba3833d5d214e02b32d794e3fd9cf21fdba99cff5acabeb90d9806 \
-    --hash=sha256:70b4a4984a70a2322b70e088d654528129783ac1ebbf7dd76627b3bd22db2f17 \
-    --hash=sha256:71bb1d97bfe7e6726267cea169fdf5df7658831bb68ec02c9c6b9f3511e108bb \
-    --hash=sha256:7c126f532caf238031c19d169cfae3c6a59129452c990a6e84d6e7b198a001dc \
-    --hash=sha256:7f9159ae530297f61a00116771e57516f89a3de6ba33f314402e41560872b50a \
-    --hash=sha256:812121a201f0c02491a5db335a737b4113151926a79ae9ed1a9f41ea225c0e3f \
-    --hash=sha256:8542c9e5bcb2bd3115acdf5adc41cda394e7360916197805e7e32b93d821ef93 \
-    --hash=sha256:85466b5a695c2a7db13eb2c200af552d13e6a9313d7fa92e4ffe04a2c0ea74c1 \
-    --hash=sha256:8d98c604c93403288591d7d6d7d6cc8a63459168f8846aeffd5b3a7f3b3e5e09 \
-    --hash=sha256:8da6b48c20ce78f5721068f383e0e113dde034e868f1b2f5ee7cb1e95f91db57 \
-    --hash=sha256:926e68438f05703e500b06fe7148ef3013dd6f276de65c68558fa9974eeb59ad \
-    --hash=sha256:9743fa34a10a36ddd448bba8a3adc2a66a1c575c3c2940301bacd6cc896c6bf1 \
-    --hash=sha256:a541414578ff47c0a9b0b8b77381ea86b0c8531ab37fc587572cb662ccd80b88 \
-    --hash=sha256:ab3361159fd3dcd0e48bbe804006d5cfb074b382666e6c064112056eb234f1a9 \
-    --hash=sha256:aed12a54d4e1ee647376fa541e1b7621505001f9f939debf51397b9329fd88b9 \
-    --hash=sha256:af4dbec58e37f5afff4f91cdf235e8e4b0bd0127a2a4fd1040e2cad3369d2f06 \
-    --hash=sha256:b031ce229114825f49cec4434fa844ccb5225e266c3e146cb4bdd025a6da52f1 \
-    --hash=sha256:b22cae3c9dd55a6b4c48c63081d31c00fc11fa9db1a20c8a50ee38c1a29539d2 \
-    --hash=sha256:b51aef59370baf7444de1572f7830f59ddbabd04e5292fa4218d02f085f8d299 \
-    --hash=sha256:b69d832e5f5fa15b1b6b2c8eb6a9fd2c0ec1fd7729cb4322ed27771afc9fc2ac \
-    --hash=sha256:b84857b66fa6510a163bb083c1199d1ee091a40163cfcbbd0642495fed096204 \
-    --hash=sha256:b97dc9a17a59f350c0caa453a3cb35671a2ffa3a29a6ef3568b523b9113d84e5 \
-    --hash=sha256:ba562736d3fbfe9241dad46c1a8994478d4a0e50796d80e29d50cabe8fbfcc3f \
-    --hash=sha256:bac352fceed158620ce2d701ad39d4c1c76d114255a7c530e057e2b9f55bdf9f \
-    --hash=sha256:baec1eb274f78b2de54471fc4c69ecbea4275965eab4b556ef7a7698dee18bf2 \
-    --hash=sha256:bc8e9f15939dacb0e1f2d15f9c41b786051c10472c7a926f5771e99b49a5957f \
-    --hash=sha256:bf75716377aad2c718cdf66451c5cf02042085d84522aec1f9246d3e4b8641a6 \
-    --hash=sha256:c124b9206b1befe0491f48185fd30a0dd51b0f4e0e7e43ac1236066215aff272 \
-    --hash=sha256:c9ed607dbbdd0d4d39b597e5bf6b0d40d844dfb0ac6a123ed79042ef08c1f87e \
-    --hash=sha256:cc36cbdedf6f259371dbbbcaae5bb0e95b879bc501668ab6306af867577eb5db \
-    --hash=sha256:cd788602e239ace64f257d1c9d39898ca65525583f0fbf0988bcba19418fe93f \
-    --hash=sha256:d1100e68e70eb72eadba2b932b185ebf0f28fd2f0dbfe576cfa9d9894ef49752 \
-    --hash=sha256:d35235a44ec38109b811c3600d15d8383297a8fab8e3dec6147477ec8636712a \
-    --hash=sha256:d3e66d5b506832e56add66af88c288c1d5ba0c38b535a1a59e436b300b57b23e \
-    --hash=sha256:d5548444ef60bf4c7b19ace21f032fa42d822e516a6940d36579f7bfa8513f9c \
-    --hash=sha256:d5a9ec959b5381271c8ec9310aae1713b2aec29efa32e232e5ef7dcca0df0279 \
-    --hash=sha256:d73b073a25a0bb8bf014345374fe2d0f63681ab5da4c22f9d2025ca3e3ea54fc \
-    --hash=sha256:e021c4c778644e8cdc09487d65564265e6b149896a17d7c0f52e9a088cc44e1b \
-    --hash=sha256:e1128c5d3a466279cb23c4aa32a0f6cb0e7d2961e74e9e421f90e74f75ec1edf \
-    --hash=sha256:e8cc0564b286b625e673a2615ede60a1704d0cbbf1b24604e28c31ed37dc62aa \
-    --hash=sha256:f25d6c4e82d7489be84f2b1c8212fafc021b3731abdb61a563c90e37cced3a21 \
-    --hash=sha256:f817a54059a4cfbc385a7f51696359c642088710e731e8df80d0607193ed2b73 \
-    --hash=sha256:fda91ad797e4914cca0afa8b6cccd5d2b3569ccc88731be202f6adce39503189
+aiohttp==3.10.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02594361128f780eecc2a29939d9dfc870e17b45178a867bf61a11b2a4367277 \
+    --hash=sha256:03f2645adbe17f274444953bdea69f8327e9d278d961d85657cb0d06864814c1 \
+    --hash=sha256:074d1bff0163e107e97bd48cad9f928fa5a3eb4b9d33366137ffce08a63e37fe \
+    --hash=sha256:0912b8a8fadeb32ff67a3ed44249448c20148397c1ed905d5dac185b4ca547bb \
+    --hash=sha256:0d277cfb304118079e7044aad0b76685d30ecb86f83a0711fc5fb257ffe832ca \
+    --hash=sha256:0d93400c18596b7dc4794d48a63fb361b01a0d8eb39f28800dc900c8fbdaca91 \
+    --hash=sha256:123dd5b16b75b2962d0fff566effb7a065e33cd4538c1692fb31c3bda2bfb972 \
+    --hash=sha256:17e997105bd1a260850272bfb50e2a328e029c941c2708170d9d978d5a30ad9a \
+    --hash=sha256:18a01eba2574fb9edd5f6e5fb25f66e6ce061da5dab5db75e13fe1558142e0a3 \
+    --hash=sha256:1923a5c44061bffd5eebeef58cecf68096e35003907d8201a4d0d6f6e387ccaa \
+    --hash=sha256:1942244f00baaacaa8155eca94dbd9e8cc7017deb69b75ef67c78e89fdad3c77 \
+    --hash=sha256:1b2c16a919d936ca87a3c5f0e43af12a89a3ce7ccbce59a2d6784caba945b68b \
+    --hash=sha256:1c19de68896747a2aa6257ae4cf6ef59d73917a36a35ee9d0a6f48cff0f94db8 \
+    --hash=sha256:1e72589da4c90337837fdfe2026ae1952c0f4a6e793adbbfbdd40efed7c63599 \
+    --hash=sha256:22c0a23a3b3138a6bf76fc553789cb1a703836da86b0f306b6f0dc1617398abc \
+    --hash=sha256:2c634a3207a5445be65536d38c13791904fda0748b9eabf908d3fe86a52941cf \
+    --hash=sha256:2d21ac12dc943c68135ff858c3a989f2194a709e6e10b4c8977d7fcd67dfd511 \
+    --hash=sha256:2f1f1c75c395991ce9c94d3e4aa96e5c59c8356a15b1c9231e783865e2772699 \
+    --hash=sha256:305be5ff2081fa1d283a76113b8df7a14c10d75602a38d9f012935df20731487 \
+    --hash=sha256:33e6bc4bab477c772a541f76cd91e11ccb6d2efa2b8d7d7883591dfb523e5987 \
+    --hash=sha256:349ef8a73a7c5665cca65c88ab24abe75447e28aa3bc4c93ea5093474dfdf0ff \
+    --hash=sha256:380f926b51b92d02a34119d072f178d80bbda334d1a7e10fa22d467a66e494db \
+    --hash=sha256:38172a70005252b6893088c0f5e8a47d173df7cc2b2bd88650957eb84fcf5022 \
+    --hash=sha256:391cc3a9c1527e424c6865e087897e766a917f15dddb360174a70467572ac6ce \
+    --hash=sha256:3a1c32a19ee6bbde02f1cb189e13a71b321256cc1d431196a9f824050b160d5a \
+    --hash=sha256:4120d7fefa1e2d8fb6f650b11489710091788de554e2b6f8347c7a20ceb003f5 \
+    --hash=sha256:424ae21498790e12eb759040bbb504e5e280cab64693d14775c54269fd1d2bb7 \
+    --hash=sha256:44b324a6b8376a23e6ba25d368726ee3bc281e6ab306db80b5819999c737d820 \
+    --hash=sha256:4790f0e15f00058f7599dab2b206d3049d7ac464dc2e5eae0e93fa18aee9e7bf \
+    --hash=sha256:4aff049b5e629ef9b3e9e617fa6e2dfeda1bf87e01bcfecaf3949af9e210105e \
+    --hash=sha256:4b38b1570242fbab8d86a84128fb5b5234a2f70c2e32f3070143a6d94bc854cf \
+    --hash=sha256:4d46c7b4173415d8e583045fbc4daa48b40e31b19ce595b8d92cf639396c15d5 \
+    --hash=sha256:4f1c9866ccf48a6df2b06823e6ae80573529f2af3a0992ec4fe75b1a510df8a6 \
+    --hash=sha256:4f7acae3cf1a2a2361ec4c8e787eaaa86a94171d2417aae53c0cca6ca3118ff6 \
+    --hash=sha256:54d9ddea424cd19d3ff6128601a4a4d23d54a421f9b4c0fff740505813739a91 \
+    --hash=sha256:58718e181c56a3c02d25b09d4115eb02aafe1a732ce5714ab70326d9776457c3 \
+    --hash=sha256:5ede29d91a40ba22ac1b922ef510aab871652f6c88ef60b9dcdf773c6d32ad7a \
+    --hash=sha256:61645818edd40cc6f455b851277a21bf420ce347baa0b86eaa41d51ef58ba23d \
+    --hash=sha256:66bf9234e08fe561dccd62083bf67400bdbf1c67ba9efdc3dac03650e97c6088 \
+    --hash=sha256:673f988370f5954df96cc31fd99c7312a3af0a97f09e407399f61583f30da9bc \
+    --hash=sha256:676f94c5480d8eefd97c0c7e3953315e4d8c2b71f3b49539beb2aa676c58272f \
+    --hash=sha256:6c225286f2b13bab5987425558baa5cbdb2bc925b2998038fa028245ef421e75 \
+    --hash=sha256:7384d0b87d4635ec38db9263e6a3f1eb609e2e06087f0aa7f63b76833737b471 \
+    --hash=sha256:7e2fe37ac654032db1f3499fe56e77190282534810e2a8e833141a021faaab0e \
+    --hash=sha256:7f2bfc0032a00405d4af2ba27f3c429e851d04fad1e5ceee4080a1c570476697 \
+    --hash=sha256:7f6b639c36734eaa80a6c152a238242bedcee9b953f23bb887e9102976343092 \
+    --hash=sha256:814375093edae5f1cb31e3407997cf3eacefb9010f96df10d64829362ae2df69 \
+    --hash=sha256:8224f98be68a84b19f48e0bdc14224b5a71339aff3a27df69989fa47d01296f3 \
+    --hash=sha256:898715cf566ec2869d5cb4d5fb4be408964704c46c96b4be267442d265390f32 \
+    --hash=sha256:8989f46f3d7ef79585e98fa991e6ded55d2f48ae56d2c9fa5e491a6e4effb589 \
+    --hash=sha256:8ba01ebc6175e1e6b7275c907a3a36be48a2d487549b656aa90c8a910d9f3178 \
+    --hash=sha256:8c5c6fa16412b35999320f5c9690c0f554392dc222c04e559217e0f9ae244b92 \
+    --hash=sha256:8c6a4e5e40156d72a40241a25cc226051c0a8d816610097a8e8f517aeacd59a2 \
+    --hash=sha256:8eaf44ccbc4e35762683078b72bf293f476561d8b68ec8a64f98cf32811c323e \
+    --hash=sha256:8fb4fc029e135859f533025bc82047334e24b0d489e75513144f25408ecaf058 \
+    --hash=sha256:9093a81e18c45227eebe4c16124ebf3e0d893830c6aca7cc310bfca8fe59d857 \
+    --hash=sha256:94c4381ffba9cc508b37d2e536b418d5ea9cfdc2848b9a7fea6aebad4ec6aac1 \
+    --hash=sha256:94fac7c6e77ccb1ca91e9eb4cb0ac0270b9fb9b289738654120ba8cebb1189c6 \
+    --hash=sha256:95c4dc6f61d610bc0ee1edc6f29d993f10febfe5b76bb470b486d90bbece6b22 \
+    --hash=sha256:975218eee0e6d24eb336d0328c768ebc5d617609affaca5dbbd6dd1984f16ed0 \
+    --hash=sha256:ad146dae5977c4dd435eb31373b3fe9b0b1bf26858c6fc452bf6af394067e10b \
+    --hash=sha256:afe16a84498441d05e9189a15900640a2d2b5e76cf4efe8cbb088ab4f112ee57 \
+    --hash=sha256:b1c43eb1ab7cbf411b8e387dc169acb31f0ca0d8c09ba63f9eac67829585b44f \
+    --hash=sha256:b90078989ef3fc45cf9221d3859acd1108af7560c52397ff4ace8ad7052a132e \
+    --hash=sha256:b98e698dc34966e5976e10bbca6d26d6724e6bdea853c7c10162a3235aba6e16 \
+    --hash=sha256:ba5a8b74c2a8af7d862399cdedce1533642fa727def0b8c3e3e02fcb52dca1b1 \
+    --hash=sha256:c31ad0c0c507894e3eaa843415841995bf8de4d6b2d24c6e33099f4bc9fc0d4f \
+    --hash=sha256:c3b9162bab7e42f21243effc822652dc5bb5e8ff42a4eb62fe7782bcbcdfacf6 \
+    --hash=sha256:c58c6837a2c2a7cf3133983e64173aec11f9c2cd8e87ec2fdc16ce727bcf1a04 \
+    --hash=sha256:c83f7a107abb89a227d6c454c613e7606c12a42b9a4ca9c5d7dad25d47c776ae \
+    --hash=sha256:cde98f323d6bf161041e7627a5fd763f9fd829bcfcd089804a5fdce7bb6e1b7d \
+    --hash=sha256:ce91db90dbf37bb6fa0997f26574107e1b9d5ff939315247b7e615baa8ec313b \
+    --hash=sha256:d00f3c5e0d764a5c9aa5a62d99728c56d455310bcc288a79cab10157b3af426f \
+    --hash=sha256:d17920f18e6ee090bdd3d0bfffd769d9f2cb4c8ffde3eb203777a3895c128862 \
+    --hash=sha256:d55f011da0a843c3d3df2c2cf4e537b8070a419f891c930245f05d329c4b0689 \
+    --hash=sha256:d742c36ed44f2798c8d3f4bc511f479b9ceef2b93f348671184139e7d708042c \
+    --hash=sha256:d9a487ef090aea982d748b1b0d74fe7c3950b109df967630a20584f9a99c0683 \
+    --hash=sha256:d9ef084e3dc690ad50137cc05831c52b6ca428096e6deb3c43e95827f531d5ef \
+    --hash=sha256:da452c2c322e9ce0cfef392e469a26d63d42860f829026a63374fde6b5c5876f \
+    --hash=sha256:dc4826823121783dccc0871e3f405417ac116055bf184ac04c36f98b75aacd12 \
+    --hash=sha256:de7a5299827253023c55ea549444e058c0eb496931fa05d693b95140a947cb73 \
+    --hash=sha256:e04a1f2a65ad2f93aa20f9ff9f1b672bf912413e5547f60749fa2ef8a644e061 \
+    --hash=sha256:e1ca1ef5ba129718a8fc827b0867f6aa4e893c56eb00003b7367f8a733a9b072 \
+    --hash=sha256:ee40b40aa753d844162dcc80d0fe256b87cba48ca0054f64e68000453caead11 \
+    --hash=sha256:f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691 \
+    --hash=sha256:f29930bc2921cef955ba39a3ff87d2c4398a0394ae217f41cb02d5c26c8b1b77 \
+    --hash=sha256:f489a2c9e6455d87eabf907ac0b7d230a9786be43fbe884ad184ddf9e9c1e385 \
+    --hash=sha256:f5bf3ead3cb66ab990ee2561373b009db5bc0e857549b6c9ba84b20bc462e172 \
+    --hash=sha256:f6f18898ace4bcd2d41a122916475344a87f1dfdec626ecde9ee802a711bc569 \
+    --hash=sha256:f8112fb501b1e0567a1251a2fd0747baae60a4ab325a871e975b7bb67e59221f \
+    --hash=sha256:fd31f176429cecbc1ba499d4aba31aaccfea488f418d60376b911269d3b883c5
 aioresponses==0.7.6 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d2c26defbb9b440ea2685ec132e90700907fd10bcca3e85ec2f157219f0d26f7 \
     --hash=sha256:f795d9dbda2d61774840e7e32f5366f45752d1adc1b74c9362afd017296c7ee1
@@ -114,9 +129,9 @@ beautifulsoup4==4.11.1 ; python_version >= "3.10" and python_version < "4.0" \
 censys==2.1.8 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2ddd6d0ee6df70acf15792328df8bb4d0dd5a76b50883adac62989f1641820c1 \
     --hash=sha256:665acf8777a871098832527ab8e0c5b1b9f9a548be928239747a6fcde8b613eb
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 cffi==1.17.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f \
     --hash=sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab \
@@ -288,39 +303,37 @@ colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" \
 configparser==7.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:af3c618a67aaaedc4d689fd7317d238f566b9aa03cae50102e92d7f0dfe78ba0 \
     --hash=sha256:f46d52a12811c637104c6bb8eb33693be0038ab6bf01d69aae009c39ec8c2017
-cryptography==42.0.8 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad \
-    --hash=sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583 \
-    --hash=sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b \
-    --hash=sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c \
-    --hash=sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1 \
-    --hash=sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648 \
-    --hash=sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949 \
-    --hash=sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba \
-    --hash=sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c \
-    --hash=sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9 \
-    --hash=sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d \
-    --hash=sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c \
-    --hash=sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e \
-    --hash=sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2 \
-    --hash=sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d \
-    --hash=sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7 \
-    --hash=sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70 \
-    --hash=sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2 \
-    --hash=sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7 \
-    --hash=sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14 \
-    --hash=sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe \
-    --hash=sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e \
-    --hash=sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71 \
-    --hash=sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961 \
-    --hash=sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7 \
-    --hash=sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c \
-    --hash=sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28 \
-    --hash=sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842 \
-    --hash=sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902 \
-    --hash=sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801 \
-    --hash=sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a \
-    --hash=sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e
+croniter==3.0.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668 \
+    --hash=sha256:b3bd11f270dc54ccd1f2397b813436015a86d30ffc5a7a9438eec1ed916f2101
+cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
+    --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \
+    --hash=sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d \
+    --hash=sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062 \
+    --hash=sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2 \
+    --hash=sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4 \
+    --hash=sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1 \
+    --hash=sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85 \
+    --hash=sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84 \
+    --hash=sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042 \
+    --hash=sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d \
+    --hash=sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962 \
+    --hash=sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2 \
+    --hash=sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa \
+    --hash=sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d \
+    --hash=sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365 \
+    --hash=sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96 \
+    --hash=sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47 \
+    --hash=sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d \
+    --hash=sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d \
+    --hash=sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c \
+    --hash=sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb \
+    --hash=sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277 \
+    --hash=sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172 \
+    --hash=sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034 \
+    --hash=sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a \
+    --hash=sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289
 decorator==5.1.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330 \
     --hash=sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186
@@ -488,53 +501,53 @@ greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
@@ -543,9 +556,9 @@ httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
 httpretty==1.1.4 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -564,149 +577,145 @@ langcodes==3.4.0 ; python_version >= "3.10" and python_version < "4.0" \
 language-data==1.2.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:77d5cab917f91ee0b2f1aa7018443e911cf8985ef734ca2ba3940770f6a3816b \
     --hash=sha256:82a86050bbd677bfde87d97885b17566cfe75dad3ac4f5ce44b52c28f752e773
-lxml==5.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:02437fb7308386867c8b7b0e5bc4cd4b04548b1c5d089ffb8e7b31009b961dc3 \
-    --hash=sha256:02f6a8eb6512fdc2fd4ca10a49c341c4e109aa6e9448cc4859af5b949622715a \
-    --hash=sha256:05f8757b03208c3f50097761be2dea0aba02e94f0dc7023ed73a7bb14ff11eb0 \
-    --hash=sha256:06668e39e1f3c065349c51ac27ae430719d7806c026fec462e5693b08b95696b \
-    --hash=sha256:07542787f86112d46d07d4f3c4e7c760282011b354d012dc4141cc12a68cef5f \
-    --hash=sha256:08ea0f606808354eb8f2dfaac095963cb25d9d28e27edcc375d7b30ab01abbf6 \
-    --hash=sha256:0969e92af09c5687d769731e3f39ed62427cc72176cebb54b7a9d52cc4fa3b73 \
-    --hash=sha256:0a028b61a2e357ace98b1615fc03f76eb517cc028993964fe08ad514b1e8892d \
-    --hash=sha256:0b3f5016e00ae7630a4b83d0868fca1e3d494c78a75b1c7252606a3a1c5fc2ad \
-    --hash=sha256:13e69be35391ce72712184f69000cda04fc89689429179bc4c0ae5f0b7a8c21b \
-    --hash=sha256:16a8326e51fcdffc886294c1e70b11ddccec836516a343f9ed0f82aac043c24a \
-    --hash=sha256:19b4e485cd07b7d83e3fe3b72132e7df70bfac22b14fe4bf7a23822c3a35bff5 \
-    --hash=sha256:1a2569a1f15ae6c8c64108a2cd2b4a858fc1e13d25846be0666fc144715e32ab \
-    --hash=sha256:1a7aca7964ac4bb07680d5c9d63b9d7028cace3e2d43175cb50bba8c5ad33316 \
-    --hash=sha256:1b590b39ef90c6b22ec0be925b211298e810b4856909c8ca60d27ffbca6c12e6 \
-    --hash=sha256:1d8a701774dfc42a2f0b8ccdfe7dbc140500d1049e0632a611985d943fcf12df \
-    --hash=sha256:1e275ea572389e41e8b039ac076a46cb87ee6b8542df3fff26f5baab43713bca \
-    --hash=sha256:2304d3c93f2258ccf2cf7a6ba8c761d76ef84948d87bf9664e14d203da2cd264 \
-    --hash=sha256:23441e2b5339bc54dc949e9e675fa35efe858108404ef9aa92f0456929ef6fe8 \
-    --hash=sha256:23cfafd56887eaed93d07bc4547abd5e09d837a002b791e9767765492a75883f \
-    --hash=sha256:28bf95177400066596cdbcfc933312493799382879da504633d16cf60bba735b \
-    --hash=sha256:2eb2227ce1ff998faf0cd7fe85bbf086aa41dfc5af3b1d80867ecfe75fb68df3 \
-    --hash=sha256:2fb0ba3e8566548d6c8e7dd82a8229ff47bd8fb8c2da237607ac8e5a1b8312e5 \
-    --hash=sha256:303f540ad2dddd35b92415b74b900c749ec2010e703ab3bfd6660979d01fd4ed \
-    --hash=sha256:339ee4a4704bc724757cd5dd9dc8cf4d00980f5d3e6e06d5847c1b594ace68ab \
-    --hash=sha256:33ce9e786753743159799fdf8e92a5da351158c4bfb6f2db0bf31e7892a1feb5 \
-    --hash=sha256:343ab62e9ca78094f2306aefed67dcfad61c4683f87eee48ff2fd74902447726 \
-    --hash=sha256:34e17913c431f5ae01d8658dbf792fdc457073dcdfbb31dc0cc6ab256e664a8d \
-    --hash=sha256:364d03207f3e603922d0d3932ef363d55bbf48e3647395765f9bfcbdf6d23632 \
-    --hash=sha256:38b67afb0a06b8575948641c1d6d68e41b83a3abeae2ca9eed2ac59892b36706 \
-    --hash=sha256:3a745cc98d504d5bd2c19b10c79c61c7c3df9222629f1b6210c0368177589fb8 \
-    --hash=sha256:3b019d4ee84b683342af793b56bb35034bd749e4cbdd3d33f7d1107790f8c472 \
-    --hash=sha256:3b6a30a9ab040b3f545b697cb3adbf3696c05a3a68aad172e3fd7ca73ab3c835 \
-    --hash=sha256:3d1e35572a56941b32c239774d7e9ad724074d37f90c7a7d499ab98761bd80cf \
-    --hash=sha256:3d98de734abee23e61f6b8c2e08a88453ada7d6486dc7cdc82922a03968928db \
-    --hash=sha256:453d037e09a5176d92ec0fd282e934ed26d806331a8b70ab431a81e2fbabf56d \
-    --hash=sha256:45f9494613160d0405682f9eee781c7e6d1bf45f819654eb249f8f46a2c22545 \
-    --hash=sha256:4820c02195d6dfb7b8508ff276752f6b2ff8b64ae5d13ebe02e7667e035000b9 \
-    --hash=sha256:49095a38eb333aaf44c06052fd2ec3b8f23e19747ca7ec6f6c954ffea6dbf7be \
-    --hash=sha256:4aefd911793b5d2d7a921233a54c90329bf3d4a6817dc465f12ffdfe4fc7b8fe \
-    --hash=sha256:4bc6cb140a7a0ad1f7bc37e018d0ed690b7b6520ade518285dc3171f7a117905 \
-    --hash=sha256:4c30a2f83677876465f44c018830f608fa3c6a8a466eb223535035fbc16f3438 \
-    --hash=sha256:50127c186f191b8917ea2fb8b206fbebe87fd414a6084d15568c27d0a21d60db \
-    --hash=sha256:50ccb5d355961c0f12f6cf24b7187dbabd5433f29e15147a67995474f27d1776 \
-    --hash=sha256:519895c99c815a1a24a926d5b60627ce5ea48e9f639a5cd328bda0515ea0f10c \
-    --hash=sha256:54401c77a63cc7d6dc4b4e173bb484f28a5607f3df71484709fe037c92d4f0ed \
-    --hash=sha256:546cf886f6242dff9ec206331209db9c8e1643ae642dea5fdbecae2453cb50fd \
-    --hash=sha256:55ce6b6d803890bd3cc89975fca9de1dff39729b43b73cb15ddd933b8bc20484 \
-    --hash=sha256:56793b7a1a091a7c286b5f4aa1fe4ae5d1446fe742d00cdf2ffb1077865db10d \
-    --hash=sha256:57f0a0bbc9868e10ebe874e9f129d2917750adf008fe7b9c1598c0fbbfdde6a6 \
-    --hash=sha256:5b8c041b6265e08eac8a724b74b655404070b636a8dd6d7a13c3adc07882ef30 \
-    --hash=sha256:5e097646944b66207023bc3c634827de858aebc226d5d4d6d16f0b77566ea182 \
-    --hash=sha256:60499fe961b21264e17a471ec296dcbf4365fbea611bf9e303ab69db7159ce61 \
-    --hash=sha256:610b5c77428a50269f38a534057444c249976433f40f53e3b47e68349cca1425 \
-    --hash=sha256:625e3ef310e7fa3a761d48ca7ea1f9d8718a32b1542e727d584d82f4453d5eeb \
-    --hash=sha256:657a972f46bbefdbba2d4f14413c0d079f9ae243bd68193cb5061b9732fa54c1 \
-    --hash=sha256:69ab77a1373f1e7563e0fb5a29a8440367dec051da6c7405333699d07444f511 \
-    --hash=sha256:6a520b4f9974b0a0a6ed73c2154de57cdfd0c8800f4f15ab2b73238ffed0b36e \
-    --hash=sha256:6d68ce8e7b2075390e8ac1e1d3a99e8b6372c694bbe612632606d1d546794207 \
-    --hash=sha256:6dcc3d17eac1df7859ae01202e9bb11ffa8c98949dcbeb1069c8b9a75917e01b \
-    --hash=sha256:6dfdc2bfe69e9adf0df4915949c22a25b39d175d599bf98e7ddf620a13678585 \
-    --hash=sha256:739e36ef7412b2bd940f75b278749106e6d025e40027c0b94a17ef7968d55d56 \
-    --hash=sha256:7429e7faa1a60cad26ae4227f4dd0459efde239e494c7312624ce228e04f6391 \
-    --hash=sha256:74da9f97daec6928567b48c90ea2c82a106b2d500f397eeb8941e47d30b1ca85 \
-    --hash=sha256:74e4f025ef3db1c6da4460dd27c118d8cd136d0391da4e387a15e48e5c975147 \
-    --hash=sha256:75a9632f1d4f698b2e6e2e1ada40e71f369b15d69baddb8968dcc8e683839b18 \
-    --hash=sha256:76acba4c66c47d27c8365e7c10b3d8016a7da83d3191d053a58382311a8bf4e1 \
-    --hash=sha256:79d1fb9252e7e2cfe4de6e9a6610c7cbb99b9708e2c3e29057f487de5a9eaefa \
-    --hash=sha256:7ce7ad8abebe737ad6143d9d3bf94b88b93365ea30a5b81f6877ec9c0dee0a48 \
-    --hash=sha256:7ed07b3062b055d7a7f9d6557a251cc655eed0b3152b76de619516621c56f5d3 \
-    --hash=sha256:7ff762670cada8e05b32bf1e4dc50b140790909caa8303cfddc4d702b71ea184 \
-    --hash=sha256:8268cbcd48c5375f46e000adb1390572c98879eb4f77910c6053d25cc3ac2c67 \
-    --hash=sha256:875a3f90d7eb5c5d77e529080d95140eacb3c6d13ad5b616ee8095447b1d22e7 \
-    --hash=sha256:89feb82ca055af0fe797a2323ec9043b26bc371365847dbe83c7fd2e2f181c34 \
-    --hash=sha256:8a7e24cb69ee5f32e003f50e016d5fde438010c1022c96738b04fc2423e61706 \
-    --hash=sha256:8ab6a358d1286498d80fe67bd3d69fcbc7d1359b45b41e74c4a26964ca99c3f8 \
-    --hash=sha256:8b8df03a9e995b6211dafa63b32f9d405881518ff1ddd775db4e7b98fb545e1c \
-    --hash=sha256:8cf85a6e40ff1f37fe0f25719aadf443686b1ac7652593dc53c7ef9b8492b115 \
-    --hash=sha256:8e8d351ff44c1638cb6e980623d517abd9f580d2e53bfcd18d8941c052a5a009 \
-    --hash=sha256:9164361769b6ca7769079f4d426a41df6164879f7f3568be9086e15baca61466 \
-    --hash=sha256:96e85aa09274955bb6bd483eaf5b12abadade01010478154b0ec70284c1b1526 \
-    --hash=sha256:981a06a3076997adf7c743dcd0d7a0415582661e2517c7d961493572e909aa1d \
-    --hash=sha256:9cd5323344d8ebb9fb5e96da5de5ad4ebab993bbf51674259dbe9d7a18049525 \
-    --hash=sha256:9d6c6ea6a11ca0ff9cd0390b885984ed31157c168565702959c25e2191674a14 \
-    --hash=sha256:a02d3c48f9bb1e10c7788d92c0c7db6f2002d024ab6e74d6f45ae33e3d0288a3 \
-    --hash=sha256:a233bb68625a85126ac9f1fc66d24337d6e8a0f9207b688eec2e7c880f012ec0 \
-    --hash=sha256:a2f6a1bc2460e643785a2cde17293bd7a8f990884b822f7bca47bee0a82fc66b \
-    --hash=sha256:a6d17e0370d2516d5bb9062c7b4cb731cff921fc875644c3d751ad857ba9c5b1 \
-    --hash=sha256:a6d2092797b388342c1bc932077ad232f914351932353e2e8706851c870bca1f \
-    --hash=sha256:ab67ed772c584b7ef2379797bf14b82df9aa5f7438c5b9a09624dd834c1c1aaf \
-    --hash=sha256:ac6540c9fff6e3813d29d0403ee7a81897f1d8ecc09a8ff84d2eea70ede1cdbf \
-    --hash=sha256:ae4073a60ab98529ab8a72ebf429f2a8cc612619a8c04e08bed27450d52103c0 \
-    --hash=sha256:ae791f6bd43305aade8c0e22f816b34f3b72b6c820477aab4d18473a37e8090b \
-    --hash=sha256:aef5474d913d3b05e613906ba4090433c515e13ea49c837aca18bde190853dff \
-    --hash=sha256:b0b3f2df149efb242cee2ffdeb6674b7f30d23c9a7af26595099afaf46ef4e88 \
-    --hash=sha256:b128092c927eaf485928cec0c28f6b8bead277e28acf56800e972aa2c2abd7a2 \
-    --hash=sha256:b16db2770517b8799c79aa80f4053cd6f8b716f21f8aca962725a9565ce3ee40 \
-    --hash=sha256:b336b0416828022bfd5a2e3083e7f5ba54b96242159f83c7e3eebaec752f1716 \
-    --hash=sha256:b47633251727c8fe279f34025844b3b3a3e40cd1b198356d003aa146258d13a2 \
-    --hash=sha256:b537bd04d7ccd7c6350cdaaaad911f6312cbd61e6e6045542f781c7f8b2e99d2 \
-    --hash=sha256:b5e4ef22ff25bfd4ede5f8fb30f7b24446345f3e79d9b7455aef2836437bc38a \
-    --hash=sha256:b74b9ea10063efb77a965a8d5f4182806fbf59ed068b3c3fd6f30d2ac7bee734 \
-    --hash=sha256:bb2dc4898180bea79863d5487e5f9c7c34297414bad54bcd0f0852aee9cfdb87 \
-    --hash=sha256:bbc4b80af581e18568ff07f6395c02114d05f4865c2812a1f02f2eaecf0bfd48 \
-    --hash=sha256:bcc98f911f10278d1daf14b87d65325851a1d29153caaf146877ec37031d5f36 \
-    --hash=sha256:be49ad33819d7dcc28a309b86d4ed98e1a65f3075c6acd3cd4fe32103235222b \
-    --hash=sha256:bec4bd9133420c5c52d562469c754f27c5c9e36ee06abc169612c959bd7dbb07 \
-    --hash=sha256:c2faf60c583af0d135e853c86ac2735ce178f0e338a3c7f9ae8f622fd2eb788c \
-    --hash=sha256:c689d0d5381f56de7bd6966a4541bff6e08bf8d3871bbd89a0c6ab18aa699573 \
-    --hash=sha256:c7079d5eb1c1315a858bbf180000757db8ad904a89476653232db835c3114001 \
-    --hash=sha256:cb3942960f0beb9f46e2a71a3aca220d1ca32feb5a398656be934320804c0df9 \
-    --hash=sha256:cd9e78285da6c9ba2d5c769628f43ef66d96ac3085e59b10ad4f3707980710d3 \
-    --hash=sha256:cf2a978c795b54c539f47964ec05e35c05bd045db5ca1e8366988c7f2fe6b3ce \
-    --hash=sha256:d14a0d029a4e176795cef99c056d58067c06195e0c7e2dbb293bf95c08f772a3 \
-    --hash=sha256:d237ba6664b8e60fd90b8549a149a74fcc675272e0e95539a00522e4ca688b04 \
-    --hash=sha256:d26a618ae1766279f2660aca0081b2220aca6bd1aa06b2cf73f07383faf48927 \
-    --hash=sha256:d28cb356f119a437cc58a13f8135ab8a4c8ece18159eb9194b0d269ec4e28083 \
-    --hash=sha256:d4ed0c7cbecde7194cd3228c044e86bf73e30a23505af852857c09c24e77ec5d \
-    --hash=sha256:d83e2d94b69bf31ead2fa45f0acdef0757fa0458a129734f59f67f3d2eb7ef32 \
-    --hash=sha256:d8bbcd21769594dbba9c37d3c819e2d5847656ca99c747ddb31ac1701d0c0ed9 \
-    --hash=sha256:d9b342c76003c6b9336a80efcc766748a333573abf9350f4094ee46b006ec18f \
-    --hash=sha256:dc911208b18842a3a57266d8e51fc3cfaccee90a5351b92079beed912a7914c2 \
-    --hash=sha256:dfa7c241073d8f2b8e8dbc7803c434f57dbb83ae2a3d7892dd068d99e96efe2c \
-    --hash=sha256:e282aedd63c639c07c3857097fc0e236f984ceb4089a8b284da1c526491e3f3d \
-    --hash=sha256:e290d79a4107d7d794634ce3e985b9ae4f920380a813717adf61804904dc4393 \
-    --hash=sha256:e3d9d13603410b72787579769469af730c38f2f25505573a5888a94b62b920f8 \
-    --hash=sha256:e481bba1e11ba585fb06db666bfc23dbe181dbafc7b25776156120bf12e0d5a6 \
-    --hash=sha256:e49b052b768bb74f58c7dda4e0bdf7b79d43a9204ca584ffe1fb48a6f3c84c66 \
-    --hash=sha256:eb00b549b13bd6d884c863554566095bf6fa9c3cecb2e7b399c4bc7904cb33b5 \
-    --hash=sha256:ec87c44f619380878bd49ca109669c9f221d9ae6883a5bcb3616785fa8f94c97 \
-    --hash=sha256:edcfa83e03370032a489430215c1e7783128808fd3e2e0a3225deee278585196 \
-    --hash=sha256:f11ae142f3a322d44513de1018b50f474f8f736bc3cd91d969f464b5bfef8836 \
-    --hash=sha256:f2a09f6184f17a80897172863a655467da2b11151ec98ba8d7af89f17bf63dae \
-    --hash=sha256:f5b65529bb2f21ac7861a0e94fdbf5dc0daab41497d18223b46ee8515e5ad297 \
-    --hash=sha256:f60fdd125d85bf9c279ffb8e94c78c51b3b6a37711464e1f5f31078b45002421 \
-    --hash=sha256:f61efaf4bed1cc0860e567d2ecb2363974d414f7f1f124b1df368bbf183453a6 \
-    --hash=sha256:f90e552ecbad426eab352e7b2933091f2be77115bb16f09f78404861c8322981 \
-    --hash=sha256:f956196ef61369f1685d14dad80611488d8dc1ef00be57c0c5a03064005b0f30 \
-    --hash=sha256:fb91819461b1b56d06fa4bcf86617fac795f6a99d12239fb0c68dbeba41a0a30 \
-    --hash=sha256:fbc9d316552f9ef7bba39f4edfad4a734d3d6f93341232a9dddadec4f15d425f \
-    --hash=sha256:ff69a9a0b4b17d78170c73abe2ab12084bdf1691550c5629ad1fe7849433f324 \
-    --hash=sha256:ffb2be176fed4457e445fe540617f0252a72a8bc56208fd65a690fdb1f57660b
+lxml==5.3.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:01220dca0d066d1349bd6a1726856a78f7929f3878f7e2ee83c296c69495309e \
+    --hash=sha256:02ced472497b8362c8e902ade23e3300479f4f43e45f4105c85ef43b8db85229 \
+    --hash=sha256:052d99051e77a4f3e8482c65014cf6372e61b0a6f4fe9edb98503bb5364cfee3 \
+    --hash=sha256:07da23d7ee08577760f0a71d67a861019103e4812c87e2fab26b039054594cc5 \
+    --hash=sha256:094cb601ba9f55296774c2d57ad68730daa0b13dc260e1f941b4d13678239e70 \
+    --hash=sha256:0a7056921edbdd7560746f4221dca89bb7a3fe457d3d74267995253f46343f15 \
+    --hash=sha256:0c120f43553ec759f8de1fee2f4794452b0946773299d44c36bfe18e83caf002 \
+    --hash=sha256:0d7b36afa46c97875303a94e8f3ad932bf78bace9e18e603f2085b652422edcd \
+    --hash=sha256:0fdf3a3059611f7585a78ee10399a15566356116a4288380921a4b598d807a22 \
+    --hash=sha256:109fa6fede314cc50eed29e6e56c540075e63d922455346f11e4d7a036d2b8cf \
+    --hash=sha256:146173654d79eb1fc97498b4280c1d3e1e5d58c398fa530905c9ea50ea849b22 \
+    --hash=sha256:1473427aff3d66a3fa2199004c3e601e6c4500ab86696edffdbc84954c72d832 \
+    --hash=sha256:1483fd3358963cc5c1c9b122c80606a3a79ee0875bcac0204149fa09d6ff2727 \
+    --hash=sha256:168f2dfcfdedf611eb285efac1516c8454c8c99caf271dccda8943576b67552e \
+    --hash=sha256:17e8d968d04a37c50ad9c456a286b525d78c4a1c15dd53aa46c1d8e06bf6fa30 \
+    --hash=sha256:18feb4b93302091b1541221196a2155aa296c363fd233814fa11e181adebc52f \
+    --hash=sha256:1afe0a8c353746e610bd9031a630a95bcfb1a720684c3f2b36c4710a0a96528f \
+    --hash=sha256:1d04f064bebdfef9240478f7a779e8c5dc32b8b7b0b2fc6a62e39b928d428e51 \
+    --hash=sha256:1fdc9fae8dd4c763e8a31e7630afef517eab9f5d5d31a278df087f307bf601f4 \
+    --hash=sha256:1ffc23010330c2ab67fac02781df60998ca8fe759e8efde6f8b756a20599c5de \
+    --hash=sha256:20094fc3f21ea0a8669dc4c61ed7fa8263bd37d97d93b90f28fc613371e7a875 \
+    --hash=sha256:213261f168c5e1d9b7535a67e68b1f59f92398dd17a56d934550837143f79c42 \
+    --hash=sha256:218c1b2e17a710e363855594230f44060e2025b05c80d1f0661258142b2add2e \
+    --hash=sha256:23e0553b8055600b3bf4a00b255ec5c92e1e4aebf8c2c09334f8368e8bd174d6 \
+    --hash=sha256:25f1b69d41656b05885aa185f5fdf822cb01a586d1b32739633679699f220391 \
+    --hash=sha256:2b3778cb38212f52fac9fe913017deea2fdf4eb1a4f8e4cfc6b009a13a6d3fcc \
+    --hash=sha256:2bc9fd5ca4729af796f9f59cd8ff160fe06a474da40aca03fcc79655ddee1a8b \
+    --hash=sha256:2c226a06ecb8cdef28845ae976da407917542c5e6e75dcac7cc33eb04aaeb237 \
+    --hash=sha256:2c3406b63232fc7e9b8783ab0b765d7c59e7c59ff96759d8ef9632fca27c7ee4 \
+    --hash=sha256:2c86bf781b12ba417f64f3422cfc302523ac9cd1d8ae8c0f92a1c66e56ef2e86 \
+    --hash=sha256:2d9b8d9177afaef80c53c0a9e30fa252ff3036fb1c6494d427c066a4ce6a282f \
+    --hash=sha256:2dec2d1130a9cda5b904696cec33b2cfb451304ba9081eeda7f90f724097300a \
+    --hash=sha256:2dfab5fa6a28a0b60a20638dc48e6343c02ea9933e3279ccb132f555a62323d8 \
+    --hash=sha256:2ecdd78ab768f844c7a1d4a03595038c166b609f6395e25af9b0f3f26ae1230f \
+    --hash=sha256:315f9542011b2c4e1d280e4a20ddcca1761993dda3afc7a73b01235f8641e903 \
+    --hash=sha256:36aef61a1678cb778097b4a6eeae96a69875d51d1e8f4d4b491ab3cfb54b5a03 \
+    --hash=sha256:384aacddf2e5813a36495233b64cb96b1949da72bef933918ba5c84e06af8f0e \
+    --hash=sha256:3879cc6ce938ff4eb4900d901ed63555c778731a96365e53fadb36437a131a99 \
+    --hash=sha256:3c174dc350d3ec52deb77f2faf05c439331d6ed5e702fc247ccb4e6b62d884b7 \
+    --hash=sha256:3eb44520c4724c2e1a57c0af33a379eee41792595023f367ba3952a2d96c2aab \
+    --hash=sha256:406246b96d552e0503e17a1006fd27edac678b3fcc9f1be71a2f94b4ff61528d \
+    --hash=sha256:41ce1f1e2c7755abfc7e759dc34d7d05fd221723ff822947132dc934d122fe22 \
+    --hash=sha256:423b121f7e6fa514ba0c7918e56955a1d4470ed35faa03e3d9f0e3baa4c7e492 \
+    --hash=sha256:44264ecae91b30e5633013fb66f6ddd05c006d3e0e884f75ce0b4755b3e3847b \
+    --hash=sha256:482c2f67761868f0108b1743098640fbb2a28a8e15bf3f47ada9fa59d9fe08c3 \
+    --hash=sha256:4b0c7a688944891086ba192e21c5229dea54382f4836a209ff8d0a660fac06be \
+    --hash=sha256:4c1fefd7e3d00921c44dc9ca80a775af49698bbfd92ea84498e56acffd4c5469 \
+    --hash=sha256:4e109ca30d1edec1ac60cdbe341905dc3b8f55b16855e03a54aaf59e51ec8c6f \
+    --hash=sha256:501d0d7e26b4d261fca8132854d845e4988097611ba2531408ec91cf3fd9d20a \
+    --hash=sha256:516f491c834eb320d6c843156440fe7fc0d50b33e44387fcec5b02f0bc118a4c \
+    --hash=sha256:51806cfe0279e06ed8500ce19479d757db42a30fd509940b1701be9c86a5ff9a \
+    --hash=sha256:562e7494778a69086f0312ec9689f6b6ac1c6b65670ed7d0267e49f57ffa08c4 \
+    --hash=sha256:56b9861a71575f5795bde89256e7467ece3d339c9b43141dbdd54544566b3b94 \
+    --hash=sha256:5b8f5db71b28b8c404956ddf79575ea77aa8b1538e8b2ef9ec877945b3f46442 \
+    --hash=sha256:5c2fb570d7823c2bbaf8b419ba6e5662137f8166e364a8b2b91051a1fb40ab8b \
+    --hash=sha256:5c54afdcbb0182d06836cc3d1be921e540be3ebdf8b8a51ee3ef987537455f84 \
+    --hash=sha256:5d6a6972b93c426ace71e0be9a6f4b2cfae9b1baed2eed2006076a746692288c \
+    --hash=sha256:609251a0ca4770e5a8768ff902aa02bf636339c5a93f9349b48eb1f606f7f3e9 \
+    --hash=sha256:62d172f358f33a26d6b41b28c170c63886742f5b6772a42b59b4f0fa10526cb1 \
+    --hash=sha256:62f7fdb0d1ed2065451f086519865b4c90aa19aed51081979ecd05a21eb4d1be \
+    --hash=sha256:658f2aa69d31e09699705949b5fc4719cbecbd4a97f9656a232e7d6c7be1a367 \
+    --hash=sha256:65ab5685d56914b9a2a34d67dd5488b83213d680b0c5d10b47f81da5a16b0b0e \
+    --hash=sha256:68934b242c51eb02907c5b81d138cb977b2129a0a75a8f8b60b01cb8586c7b21 \
+    --hash=sha256:68b87753c784d6acb8a25b05cb526c3406913c9d988d51f80adecc2b0775d6aa \
+    --hash=sha256:69959bd3167b993e6e710b99051265654133a98f20cec1d9b493b931942e9c16 \
+    --hash=sha256:6a7095eeec6f89111d03dabfe5883a1fd54da319c94e0fb104ee8f23616b572d \
+    --hash=sha256:6b038cc86b285e4f9fea2ba5ee76e89f21ed1ea898e287dc277a25884f3a7dfe \
+    --hash=sha256:6ba0d3dcac281aad8a0e5b14c7ed6f9fa89c8612b47939fc94f80b16e2e9bc83 \
+    --hash=sha256:6e91cf736959057f7aac7adfc83481e03615a8e8dd5758aa1d95ea69e8931dba \
+    --hash=sha256:6ee8c39582d2652dcd516d1b879451500f8db3fe3607ce45d7c5957ab2596040 \
+    --hash=sha256:6f651ebd0b21ec65dfca93aa629610a0dbc13dbc13554f19b0113da2e61a4763 \
+    --hash=sha256:71a8dd38fbd2f2319136d4ae855a7078c69c9a38ae06e0c17c73fd70fc6caad8 \
+    --hash=sha256:74068c601baff6ff021c70f0935b0c7bc528baa8ea210c202e03757c68c5a4ff \
+    --hash=sha256:7437237c6a66b7ca341e868cda48be24b8701862757426852c9b3186de1da8a2 \
+    --hash=sha256:747a3d3e98e24597981ca0be0fd922aebd471fa99d0043a3842d00cdcad7ad6a \
+    --hash=sha256:74bcb423462233bc5d6066e4e98b0264e7c1bed7541fff2f4e34fe6b21563c8b \
+    --hash=sha256:78d9b952e07aed35fe2e1a7ad26e929595412db48535921c5013edc8aa4a35ce \
+    --hash=sha256:7b1cd427cb0d5f7393c31b7496419da594fe600e6fdc4b105a54f82405e6626c \
+    --hash=sha256:7d3d1ca42870cdb6d0d29939630dbe48fa511c203724820fc0fd507b2fb46577 \
+    --hash=sha256:7e2f58095acc211eb9d8b5771bf04df9ff37d6b87618d1cbf85f92399c98dae8 \
+    --hash=sha256:7f41026c1d64043a36fda21d64c5026762d53a77043e73e94b71f0521939cc71 \
+    --hash=sha256:81b4e48da4c69313192d8c8d4311e5d818b8be1afe68ee20f6385d0e96fc9512 \
+    --hash=sha256:86a6b24b19eaebc448dc56b87c4865527855145d851f9fc3891673ff97950540 \
+    --hash=sha256:874a216bf6afaf97c263b56371434e47e2c652d215788396f60477540298218f \
+    --hash=sha256:89e043f1d9d341c52bf2af6d02e6adde62e0a46e6755d5eb60dc6e4f0b8aeca2 \
+    --hash=sha256:8c72e9563347c7395910de6a3100a4840a75a6f60e05af5e58566868d5eb2d6a \
+    --hash=sha256:8dc2c0395bea8254d8daebc76dcf8eb3a95ec2a46fa6fae5eaccee366bfe02ce \
+    --hash=sha256:8f0de2d390af441fe8b2c12626d103540b5d850d585b18fcada58d972b74a74e \
+    --hash=sha256:92e67a0be1639c251d21e35fe74df6bcc40cba445c2cda7c4a967656733249e2 \
+    --hash=sha256:94d6c3782907b5e40e21cadf94b13b0842ac421192f26b84c45f13f3c9d5dc27 \
+    --hash=sha256:97acf1e1fd66ab53dacd2c35b319d7e548380c2e9e8c54525c6e76d21b1ae3b1 \
+    --hash=sha256:9ada35dd21dc6c039259596b358caab6b13f4db4d4a7f8665764d616daf9cc1d \
+    --hash=sha256:9c52100e2c2dbb0649b90467935c4b0de5528833c76a35ea1a2691ec9f1ee7a1 \
+    --hash=sha256:9e41506fec7a7f9405b14aa2d5c8abbb4dbbd09d88f9496958b6d00cb4d45330 \
+    --hash=sha256:9e4b47ac0f5e749cfc618efdf4726269441014ae1d5583e047b452a32e221920 \
+    --hash=sha256:9fb81d2824dff4f2e297a276297e9031f46d2682cafc484f49de182aa5e5df99 \
+    --hash=sha256:a0eabd0a81625049c5df745209dc7fcef6e2aea7793e5f003ba363610aa0a3ff \
+    --hash=sha256:a3d819eb6f9b8677f57f9664265d0a10dd6551d227afb4af2b9cd7bdc2ccbf18 \
+    --hash=sha256:a87de7dd873bf9a792bf1e58b1c3887b9264036629a5bf2d2e6579fe8e73edff \
+    --hash=sha256:aa617107a410245b8660028a7483b68e7914304a6d4882b5ff3d2d3eb5948d8c \
+    --hash=sha256:aac0bbd3e8dd2d9c45ceb82249e8bdd3ac99131a32b4d35c8af3cc9db1657179 \
+    --hash=sha256:ab6dd83b970dc97c2d10bc71aa925b84788c7c05de30241b9e96f9b6d9ea3080 \
+    --hash=sha256:ace2c2326a319a0bb8a8b0e5b570c764962e95818de9f259ce814ee666603f19 \
+    --hash=sha256:ae5fe5c4b525aa82b8076c1a59d642c17b6e8739ecf852522c6321852178119d \
+    --hash=sha256:b11a5d918a6216e521c715b02749240fb07ae5a1fefd4b7bf12f833bc8b4fe70 \
+    --hash=sha256:b1c8c20847b9f34e98080da785bb2336ea982e7f913eed5809e5a3c872900f32 \
+    --hash=sha256:b369d3db3c22ed14c75ccd5af429086f166a19627e84a8fdade3f8f31426e52a \
+    --hash=sha256:b710bc2b8292966b23a6a0121f7a6c51d45d2347edcc75f016ac123b8054d3f2 \
+    --hash=sha256:bd96517ef76c8654446fc3db9242d019a1bb5fe8b751ba414765d59f99210b79 \
+    --hash=sha256:c00f323cc00576df6165cc9d21a4c21285fa6b9989c5c39830c3903dc4303ef3 \
+    --hash=sha256:c162b216070f280fa7da844531169be0baf9ccb17263cf5a8bf876fcd3117fa5 \
+    --hash=sha256:c1a69e58a6bb2de65902051d57fde951febad631a20a64572677a1052690482f \
+    --hash=sha256:c1f794c02903c2824fccce5b20c339a1a14b114e83b306ff11b597c5f71a1c8d \
+    --hash=sha256:c24037349665434f375645fa9d1f5304800cec574d0310f618490c871fd902b3 \
+    --hash=sha256:c300306673aa0f3ed5ed9372b21867690a17dba38c68c44b287437c362ce486b \
+    --hash=sha256:c56a1d43b2f9ee4786e4658c7903f05da35b923fb53c11025712562d5cc02753 \
+    --hash=sha256:c6379f35350b655fd817cd0d6cbeef7f265f3ae5fedb1caae2eb442bbeae9ab9 \
+    --hash=sha256:c802e1c2ed9f0c06a65bc4ed0189d000ada8049312cfeab6ca635e39c9608957 \
+    --hash=sha256:cb83f8a875b3d9b458cada4f880fa498646874ba4011dc974e071a0a84a1b033 \
+    --hash=sha256:cf120cce539453ae086eacc0130a324e7026113510efa83ab42ef3fcfccac7fb \
+    --hash=sha256:dd36439be765e2dde7660212b5275641edbc813e7b24668831a5c8ac91180656 \
+    --hash=sha256:dd5350b55f9fecddc51385463a4f67a5da829bc741e38cf689f38ec9023f54ab \
+    --hash=sha256:df5c7333167b9674aa8ae1d4008fa4bc17a313cc490b2cca27838bbdcc6bb15b \
+    --hash=sha256:e63601ad5cd8f860aa99d109889b5ac34de571c7ee902d6812d5d9ddcc77fa7d \
+    --hash=sha256:e92ce66cd919d18d14b3856906a61d3f6b6a8500e0794142338da644260595cd \
+    --hash=sha256:e99f5507401436fdcc85036a2e7dc2e28d962550afe1cbfc07c40e454256a859 \
+    --hash=sha256:ea2e2f6f801696ad7de8aec061044d6c8c0dd4037608c7cab38a9a4d316bfb11 \
+    --hash=sha256:eafa2c8658f4e560b098fe9fc54539f86528651f61849b22111a9b107d18910c \
+    --hash=sha256:ecd4ad8453ac17bc7ba3868371bffb46f628161ad0eefbd0a855d2c8c32dd81a \
+    --hash=sha256:ee70d08fd60c9565ba8190f41a46a54096afa0eeb8f76bd66f2c25d3b1b83005 \
+    --hash=sha256:eec1bb8cdbba2925bedc887bc0609a80e599c75b12d87ae42ac23fd199445654 \
+    --hash=sha256:ef0c1fe22171dd7c7c27147f2e9c3e86f8bdf473fed75f16b0c2e84a5030ce80 \
+    --hash=sha256:f2901429da1e645ce548bf9171784c0f74f0718c3f6150ce166be39e4dd66c3e \
+    --hash=sha256:f422a209d2455c56849442ae42f25dbaaba1c6c3f501d58761c619c7836642ec \
+    --hash=sha256:f65e5120863c2b266dbcc927b306c5b78e502c71edf3295dfcb9501ec96e5fc7 \
+    --hash=sha256:f7d4a670107d75dfe5ad080bed6c341d18c4442f9378c9f58e5851e86eb79965 \
+    --hash=sha256:f914c03e6a31deb632e2daa881fe198461f4d06e57ac3d0e05bbcab8eae01945 \
+    --hash=sha256:fb66442c2546446944437df74379e9cf9e9db353e61301d1a0e26482f43f0dd8
 mako==1.3.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a \
     --hash=sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc
@@ -936,97 +945,99 @@ maxminddb==2.6.2 ; python_version >= "3.10" and python_version < "4.0" \
 mdurl==0.1.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-multidict==6.0.5 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556 \
-    --hash=sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c \
-    --hash=sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29 \
-    --hash=sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b \
-    --hash=sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8 \
-    --hash=sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7 \
-    --hash=sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd \
-    --hash=sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40 \
-    --hash=sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6 \
-    --hash=sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3 \
-    --hash=sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c \
-    --hash=sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9 \
-    --hash=sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5 \
-    --hash=sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae \
-    --hash=sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442 \
-    --hash=sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9 \
-    --hash=sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc \
-    --hash=sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c \
-    --hash=sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea \
-    --hash=sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5 \
-    --hash=sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50 \
-    --hash=sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182 \
-    --hash=sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453 \
-    --hash=sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e \
-    --hash=sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600 \
-    --hash=sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733 \
-    --hash=sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda \
-    --hash=sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241 \
-    --hash=sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461 \
-    --hash=sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e \
-    --hash=sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e \
-    --hash=sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b \
-    --hash=sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e \
-    --hash=sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7 \
-    --hash=sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386 \
-    --hash=sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd \
-    --hash=sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9 \
-    --hash=sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf \
-    --hash=sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee \
-    --hash=sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5 \
-    --hash=sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a \
-    --hash=sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271 \
-    --hash=sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54 \
-    --hash=sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4 \
-    --hash=sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496 \
-    --hash=sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb \
-    --hash=sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319 \
-    --hash=sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3 \
-    --hash=sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f \
-    --hash=sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527 \
-    --hash=sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed \
-    --hash=sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604 \
-    --hash=sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef \
-    --hash=sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8 \
-    --hash=sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5 \
-    --hash=sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5 \
-    --hash=sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626 \
-    --hash=sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c \
-    --hash=sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d \
-    --hash=sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c \
-    --hash=sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc \
-    --hash=sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc \
-    --hash=sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b \
-    --hash=sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38 \
-    --hash=sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450 \
-    --hash=sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1 \
-    --hash=sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f \
-    --hash=sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3 \
-    --hash=sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755 \
-    --hash=sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226 \
-    --hash=sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a \
-    --hash=sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046 \
-    --hash=sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf \
-    --hash=sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479 \
-    --hash=sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e \
-    --hash=sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1 \
-    --hash=sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a \
-    --hash=sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83 \
-    --hash=sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929 \
-    --hash=sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93 \
-    --hash=sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a \
-    --hash=sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c \
-    --hash=sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44 \
-    --hash=sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89 \
-    --hash=sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba \
-    --hash=sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e \
-    --hash=sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da \
-    --hash=sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24 \
-    --hash=sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423 \
-    --hash=sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef
+multidict==6.1.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:052e10d2d37810b99cc170b785945421141bf7bb7d2f8799d431e7db229c385f \
+    --hash=sha256:06809f4f0f7ab7ea2cabf9caca7d79c22c0758b58a71f9d32943ae13c7ace056 \
+    --hash=sha256:071120490b47aa997cca00666923a83f02c7fbb44f71cf7f136df753f7fa8761 \
+    --hash=sha256:0c3f390dc53279cbc8ba976e5f8035eab997829066756d811616b652b00a23a3 \
+    --hash=sha256:0e2b90b43e696f25c62656389d32236e049568b39320e2735d51f08fd362761b \
+    --hash=sha256:0e5f362e895bc5b9e67fe6e4ded2492d8124bdf817827f33c5b46c2fe3ffaca6 \
+    --hash=sha256:10524ebd769727ac77ef2278390fb0068d83f3acb7773792a5080f2b0abf7748 \
+    --hash=sha256:10a9b09aba0c5b48c53761b7c720aaaf7cf236d5fe394cd399c7ba662d5f9966 \
+    --hash=sha256:16e5f4bf4e603eb1fdd5d8180f1a25f30056f22e55ce51fb3d6ad4ab29f7d96f \
+    --hash=sha256:188215fc0aafb8e03341995e7c4797860181562380f81ed0a87ff455b70bf1f1 \
+    --hash=sha256:189f652a87e876098bbc67b4da1049afb5f5dfbaa310dd67c594b01c10388db6 \
+    --hash=sha256:1ca0083e80e791cffc6efce7660ad24af66c8d4079d2a750b29001b53ff59ada \
+    --hash=sha256:1e16bf3e5fc9f44632affb159d30a437bfe286ce9e02754759be5536b169b305 \
+    --hash=sha256:2090f6a85cafc5b2db085124d752757c9d251548cedabe9bd31afe6363e0aff2 \
+    --hash=sha256:20b9b5fbe0b88d0bdef2012ef7dee867f874b72528cf1d08f1d59b0e3850129d \
+    --hash=sha256:22ae2ebf9b0c69d206c003e2f6a914ea33f0a932d4aa16f236afc049d9958f4a \
+    --hash=sha256:22f3105d4fb15c8f57ff3959a58fcab6ce36814486500cd7485651230ad4d4ef \
+    --hash=sha256:23bfd518810af7de1116313ebd9092cb9aa629beb12f6ed631ad53356ed6b86c \
+    --hash=sha256:27e5fc84ccef8dfaabb09d82b7d179c7cf1a3fbc8a966f8274fcb4ab2eb4cadb \
+    --hash=sha256:3380252550e372e8511d49481bd836264c009adb826b23fefcc5dd3c69692f60 \
+    --hash=sha256:3702ea6872c5a2a4eeefa6ffd36b042e9773f05b1f37ae3ef7264b1163c2dcf6 \
+    --hash=sha256:37bb93b2178e02b7b618893990941900fd25b6b9ac0fa49931a40aecdf083fe4 \
+    --hash=sha256:3914f5aaa0f36d5d60e8ece6a308ee1c9784cd75ec8151062614657a114c4478 \
+    --hash=sha256:3a37ffb35399029b45c6cc33640a92bef403c9fd388acce75cdc88f58bd19a81 \
+    --hash=sha256:3c8b88a2ccf5493b6c8da9076fb151ba106960a2df90c2633f342f120751a9e7 \
+    --hash=sha256:3e97b5e938051226dc025ec80980c285b053ffb1e25a3db2a3aa3bc046bf7f56 \
+    --hash=sha256:3ec660d19bbc671e3a6443325f07263be452c453ac9e512f5eb935e7d4ac28b3 \
+    --hash=sha256:3efe2c2cb5763f2f1b275ad2bf7a287d3f7ebbef35648a9726e3b69284a4f3d6 \
+    --hash=sha256:483a6aea59cb89904e1ceabd2b47368b5600fb7de78a6e4a2c2987b2d256cf30 \
+    --hash=sha256:4867cafcbc6585e4b678876c489b9273b13e9fff9f6d6d66add5e15d11d926cb \
+    --hash=sha256:48e171e52d1c4d33888e529b999e5900356b9ae588c2f09a52dcefb158b27506 \
+    --hash=sha256:4a9cb68166a34117d6646c0023c7b759bf197bee5ad4272f420a0141d7eb03a0 \
+    --hash=sha256:4b820514bfc0b98a30e3d85462084779900347e4d49267f747ff54060cc33925 \
+    --hash=sha256:4e18b656c5e844539d506a0a06432274d7bd52a7487e6828c63a63d69185626c \
+    --hash=sha256:4e9f48f58c2c523d5a06faea47866cd35b32655c46b443f163d08c6d0ddb17d6 \
+    --hash=sha256:50b3a2710631848991d0bf7de077502e8994c804bb805aeb2925a981de58ec2e \
+    --hash=sha256:55b6d90641869892caa9ca42ff913f7ff1c5ece06474fbd32fb2cf6834726c95 \
+    --hash=sha256:57feec87371dbb3520da6192213c7d6fc892d5589a93db548331954de8248fd2 \
+    --hash=sha256:58130ecf8f7b8112cdb841486404f1282b9c86ccb30d3519faf301b2e5659133 \
+    --hash=sha256:5845c1fd4866bb5dd3125d89b90e57ed3138241540897de748cdf19de8a2fca2 \
+    --hash=sha256:59bfeae4b25ec05b34f1956eaa1cb38032282cd4dfabc5056d0a1ec4d696d3aa \
+    --hash=sha256:5b48204e8d955c47c55b72779802b219a39acc3ee3d0116d5080c388970b76e3 \
+    --hash=sha256:5c09fcfdccdd0b57867577b719c69e347a436b86cd83747f179dbf0cc0d4c1f3 \
+    --hash=sha256:6180c0ae073bddeb5a97a38c03f30c233e0a4d39cd86166251617d1bbd0af436 \
+    --hash=sha256:682b987361e5fd7a139ed565e30d81fd81e9629acc7d925a205366877d8c8657 \
+    --hash=sha256:6b5d83030255983181005e6cfbac1617ce9746b219bc2aad52201ad121226581 \
+    --hash=sha256:6bb5992037f7a9eff7991ebe4273ea7f51f1c1c511e6a2ce511d0e7bdb754492 \
+    --hash=sha256:73eae06aa53af2ea5270cc066dcaf02cc60d2994bbb2c4ef5764949257d10f43 \
+    --hash=sha256:76f364861c3bfc98cbbcbd402d83454ed9e01a5224bb3a28bf70002a230f73e2 \
+    --hash=sha256:820c661588bd01a0aa62a1283f20d2be4281b086f80dad9e955e690c75fb54a2 \
+    --hash=sha256:82176036e65644a6cc5bd619f65f6f19781e8ec2e5330f51aa9ada7504cc1926 \
+    --hash=sha256:87701f25a2352e5bf7454caa64757642734da9f6b11384c1f9d1a8e699758057 \
+    --hash=sha256:9079dfc6a70abe341f521f78405b8949f96db48da98aeb43f9907f342f627cdc \
+    --hash=sha256:90f8717cb649eea3504091e640a1b8568faad18bd4b9fcd692853a04475a4b80 \
+    --hash=sha256:957cf8e4b6e123a9eea554fa7ebc85674674b713551de587eb318a2df3e00255 \
+    --hash=sha256:99f826cbf970077383d7de805c0681799491cb939c25450b9b5b3ced03ca99f1 \
+    --hash=sha256:9f636b730f7e8cb19feb87094949ba54ee5357440b9658b2a32a5ce4bce53972 \
+    --hash=sha256:a114d03b938376557927ab23f1e950827c3b893ccb94b62fd95d430fd0e5cf53 \
+    --hash=sha256:a185f876e69897a6f3325c3f19f26a297fa058c5e456bfcff8015e9a27e83ae1 \
+    --hash=sha256:a7a9541cd308eed5e30318430a9c74d2132e9a8cb46b901326272d780bf2d423 \
+    --hash=sha256:aa466da5b15ccea564bdab9c89175c762bc12825f4659c11227f515cee76fa4a \
+    --hash=sha256:aaed8b0562be4a0876ee3b6946f6869b7bcdb571a5d1496683505944e268b160 \
+    --hash=sha256:ab7c4ceb38d91570a650dba194e1ca87c2b543488fe9309b4212694174fd539c \
+    --hash=sha256:ac10f4c2b9e770c4e393876e35a7046879d195cd123b4f116d299d442b335bcd \
+    --hash=sha256:b04772ed465fa3cc947db808fa306d79b43e896beb677a56fb2347ca1a49c1fa \
+    --hash=sha256:b1c416351ee6271b2f49b56ad7f308072f6f44b37118d69c2cad94f3fa8a40d5 \
+    --hash=sha256:b225d95519a5bf73860323e633a664b0d85ad3d5bede6d30d95b35d4dfe8805b \
+    --hash=sha256:b2f59caeaf7632cc633b5cf6fc449372b83bbdf0da4ae04d5be36118e46cc0aa \
+    --hash=sha256:b58c621844d55e71c1b7f7c498ce5aa6985d743a1a59034c57a905b3f153c1ef \
+    --hash=sha256:bf6bea52ec97e95560af5ae576bdac3aa3aae0b6758c6efa115236d9e07dae44 \
+    --hash=sha256:c08be4f460903e5a9d0f76818db3250f12e9c344e79314d1d570fc69d7f4eae4 \
+    --hash=sha256:c7053d3b0353a8b9de430a4f4b4268ac9a4fb3481af37dfe49825bf45ca24156 \
+    --hash=sha256:c943a53e9186688b45b323602298ab727d8865d8c9ee0b17f8d62d14b56f0753 \
+    --hash=sha256:ce2186a7df133a9c895dea3331ddc5ddad42cdd0d1ea2f0a51e5d161e4762f28 \
+    --hash=sha256:d093be959277cb7dee84b801eb1af388b6ad3ca6a6b6bf1ed7585895789d027d \
+    --hash=sha256:d094ddec350a2fb899fec68d8353c78233debde9b7d8b4beeafa70825f1c281a \
+    --hash=sha256:d1a9dd711d0877a1ece3d2e4fea11a8e75741ca21954c919406b44e7cf971304 \
+    --hash=sha256:d569388c381b24671589335a3be6e1d45546c2988c2ebe30fdcada8457a31008 \
+    --hash=sha256:d618649d4e70ac6efcbba75be98b26ef5078faad23592f9b51ca492953012429 \
+    --hash=sha256:d83a047959d38a7ff552ff94be767b7fd79b831ad1cd9920662db05fec24fe72 \
+    --hash=sha256:d8fff389528cad1618fb4b26b95550327495462cd745d879a8c7c2115248e399 \
+    --hash=sha256:da1758c76f50c39a2efd5e9859ce7d776317eb1dd34317c8152ac9251fc574a3 \
+    --hash=sha256:db7457bac39421addd0c8449933ac32d8042aae84a14911a757ae6ca3eef1392 \
+    --hash=sha256:e27bbb6d14416713a8bd7aaa1313c0fc8d44ee48d74497a0ff4c3a1b6ccb5167 \
+    --hash=sha256:e617fb6b0b6953fffd762669610c1c4ffd05632c138d61ac7e14ad187870669c \
+    --hash=sha256:e9aa71e15d9d9beaad2c6b9319edcdc0a49a43ef5c0a4c8265ca9ee7d6c67774 \
+    --hash=sha256:ec2abea24d98246b94913b76a125e855eb5c434f7c46546046372fe60f666351 \
+    --hash=sha256:f179dee3b863ab1c59580ff60f9d99f632f34ccb38bf67a33ec6b3ecadd0fd76 \
+    --hash=sha256:f4c035da3f544b1882bac24115f3e2e8760f10a0107614fc9839fd232200b875 \
+    --hash=sha256:f67f217af4b1ff66c68a87318012de788dd95fcfeb24cc889011f4e1c7454dfd \
+    --hash=sha256:f90c822a402cb865e396a504f9fc8173ef34212a342d92e362ca498cad308e28 \
+    --hash=sha256:ff3827aef427c89a25cc96ded1759271a93603aba9fb977a6d264648ebf989db
 netaddr==0.9.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:5148b1055679d2a1ec070c521b7db82137887fabd6d7e37f5199b44f775c3bb1 \
     --hash=sha256:7b46fa9b1a2d71fd5de9e4a3784ef339700a53a08c8040f08baf5f1194da0128
@@ -1189,102 +1200,102 @@ pybinaryedge==0.5 ; python_version >= "3.10" and python_version < "4.0" \
 pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
     --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.4.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315 \
-    --hash=sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pydicom==2.4.4 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:90b4801d851ce65be3df520e16bbfa3d6c767cf2a3a3b1c18f6780e6b670b87a \
     --hash=sha256:f9f8e19b78525be57aa6384484298833e4d06ac1d6226c79459131ddb0bd7c42
@@ -1314,6 +1325,9 @@ python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
 python-libnmap==0.7.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d03629256c2ee9ab37390c28d4c4c2ae9637cd0861dd8ab9e0f32779545936c0
 python-wappalyzer @ git+https://github.com/chorsley/python-Wappalyzer.git@ac651718af77804e52b826944933be831d491387 ; python_version >= "3.10" and python_version < "4.0"
+pytz==2024.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2aa355083c50a0f93fa581709deac0c9ad65cca8a9e9beac660adcbd493c798a \
+    --hash=sha256:31c7c1817eb7fae7ca4b8c7ee50c72f93aa2dd863de768e1ef4245d426aa0725
 pywin32==306 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32" \
     --hash=sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d \
     --hash=sha256:1c73ea9a0d2283d889001998059f5eaaba3b6238f767c9cf2833b13e6a685f65 \
@@ -1519,9 +1533,9 @@ tldextract==3.5.0 ; python_version >= "3.10" and python_version < "4.0" \
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -1604,97 +1618,99 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
 xlsxwriter==3.2.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:9977d0c661a72866a61f9f7a809e25ebbb0fb7036baa3b9fe74afcfca6b3cb8c \
     --hash=sha256:ecfd5405b3e0e228219bcaf24c2ca0915e012ca9464a14048021d21a995d490e
-yarl==1.9.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:008d3e808d03ef28542372d01057fd09168419cdc8f848efe2804f894ae03e51 \
-    --hash=sha256:03caa9507d3d3c83bca08650678e25364e1843b484f19986a527630ca376ecce \
-    --hash=sha256:07574b007ee20e5c375a8fe4a0789fad26db905f9813be0f9fef5a68080de559 \
-    --hash=sha256:09efe4615ada057ba2d30df871d2f668af661e971dfeedf0c159927d48bbeff0 \
-    --hash=sha256:0d2454f0aef65ea81037759be5ca9947539667eecebca092733b2eb43c965a81 \
-    --hash=sha256:0e9d124c191d5b881060a9e5060627694c3bdd1fe24c5eecc8d5d7d0eb6faabc \
-    --hash=sha256:18580f672e44ce1238b82f7fb87d727c4a131f3a9d33a5e0e82b793362bf18b4 \
-    --hash=sha256:1f23e4fe1e8794f74b6027d7cf19dc25f8b63af1483d91d595d4a07eca1fb26c \
-    --hash=sha256:206a55215e6d05dbc6c98ce598a59e6fbd0c493e2de4ea6cc2f4934d5a18d130 \
-    --hash=sha256:23d32a2594cb5d565d358a92e151315d1b2268bc10f4610d098f96b147370136 \
-    --hash=sha256:26a1dc6285e03f3cc9e839a2da83bcbf31dcb0d004c72d0730e755b33466c30e \
-    --hash=sha256:29e0f83f37610f173eb7e7b5562dd71467993495e568e708d99e9d1944f561ec \
-    --hash=sha256:2b134fd795e2322b7684155b7855cc99409d10b2e408056db2b93b51a52accc7 \
-    --hash=sha256:2d47552b6e52c3319fede1b60b3de120fe83bde9b7bddad11a69fb0af7db32f1 \
-    --hash=sha256:357495293086c5b6d34ca9616a43d329317feab7917518bc97a08f9e55648455 \
-    --hash=sha256:35a2b9396879ce32754bd457d31a51ff0a9d426fd9e0e3c33394bf4b9036b099 \
-    --hash=sha256:3777ce5536d17989c91696db1d459574e9a9bd37660ea7ee4d3344579bb6f129 \
-    --hash=sha256:3986b6f41ad22988e53d5778f91855dc0399b043fc8946d4f2e68af22ee9ff10 \
-    --hash=sha256:44d8ffbb9c06e5a7f529f38f53eda23e50d1ed33c6c869e01481d3fafa6b8142 \
-    --hash=sha256:49a180c2e0743d5d6e0b4d1a9e5f633c62eca3f8a86ba5dd3c471060e352ca98 \
-    --hash=sha256:4aa9741085f635934f3a2583e16fcf62ba835719a8b2b28fb2917bb0537c1dfa \
-    --hash=sha256:4b21516d181cd77ebd06ce160ef8cc2a5e9ad35fb1c5930882baff5ac865eee7 \
-    --hash=sha256:4b3c1ffe10069f655ea2d731808e76e0f452fc6c749bea04781daf18e6039525 \
-    --hash=sha256:4c7d56b293cc071e82532f70adcbd8b61909eec973ae9d2d1f9b233f3d943f2c \
-    --hash=sha256:4e9035df8d0880b2f1c7f5031f33f69e071dfe72ee9310cfc76f7b605958ceb9 \
-    --hash=sha256:54525ae423d7b7a8ee81ba189f131054defdb122cde31ff17477951464c1691c \
-    --hash=sha256:549d19c84c55d11687ddbd47eeb348a89df9cb30e1993f1b128f4685cd0ebbf8 \
-    --hash=sha256:54beabb809ffcacbd9d28ac57b0db46e42a6e341a030293fb3185c409e626b8b \
-    --hash=sha256:566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf \
-    --hash=sha256:5a2e2433eb9344a163aced6a5f6c9222c0786e5a9e9cac2c89f0b28433f56e23 \
-    --hash=sha256:5aef935237d60a51a62b86249839b51345f47564208c6ee615ed2a40878dccdd \
-    --hash=sha256:604f31d97fa493083ea21bd9b92c419012531c4e17ea6da0f65cacdcf5d0bd27 \
-    --hash=sha256:63b20738b5aac74e239622d2fe30df4fca4942a86e31bf47a81a0e94c14df94f \
-    --hash=sha256:686a0c2f85f83463272ddffd4deb5e591c98aac1897d65e92319f729c320eece \
-    --hash=sha256:6a962e04b8f91f8c4e5917e518d17958e3bdee71fd1d8b88cdce74dd0ebbf434 \
-    --hash=sha256:6ad6d10ed9b67a382b45f29ea028f92d25bc0bc1daf6c5b801b90b5aa70fb9ec \
-    --hash=sha256:6f5cb257bc2ec58f437da2b37a8cd48f666db96d47b8a3115c29f316313654ff \
-    --hash=sha256:6fe79f998a4052d79e1c30eeb7d6c1c1056ad33300f682465e1b4e9b5a188b78 \
-    --hash=sha256:7855426dfbddac81896b6e533ebefc0af2f132d4a47340cee6d22cac7190022d \
-    --hash=sha256:7d5aaac37d19b2904bb9dfe12cdb08c8443e7ba7d2852894ad448d4b8f442863 \
-    --hash=sha256:801e9264d19643548651b9db361ce3287176671fb0117f96b5ac0ee1c3530d53 \
-    --hash=sha256:81eb57278deb6098a5b62e88ad8281b2ba09f2f1147c4767522353eaa6260b31 \
-    --hash=sha256:824d6c50492add5da9374875ce72db7a0733b29c2394890aef23d533106e2b15 \
-    --hash=sha256:8397a3817d7dcdd14bb266283cd1d6fc7264a48c186b986f32e86d86d35fbac5 \
-    --hash=sha256:848cd2a1df56ddbffeb375535fb62c9d1645dde33ca4d51341378b3f5954429b \
-    --hash=sha256:84fc30f71689d7fc9168b92788abc977dc8cefa806909565fc2951d02f6b7d57 \
-    --hash=sha256:8619d6915b3b0b34420cf9b2bb6d81ef59d984cb0fde7544e9ece32b4b3043c3 \
-    --hash=sha256:8a854227cf581330ffa2c4824d96e52ee621dd571078a252c25e3a3b3d94a1b1 \
-    --hash=sha256:8be9e837ea9113676e5754b43b940b50cce76d9ed7d2461df1af39a8ee674d9f \
-    --hash=sha256:928cecb0ef9d5a7946eb6ff58417ad2fe9375762382f1bf5c55e61645f2c43ad \
-    --hash=sha256:957b4774373cf6f709359e5c8c4a0af9f6d7875db657adb0feaf8d6cb3c3964c \
-    --hash=sha256:992f18e0ea248ee03b5a6e8b3b4738850ae7dbb172cc41c966462801cbf62cf7 \
-    --hash=sha256:9fc5fc1eeb029757349ad26bbc5880557389a03fa6ada41703db5e068881e5f2 \
-    --hash=sha256:a00862fb23195b6b8322f7d781b0dc1d82cb3bcac346d1e38689370cc1cc398b \
-    --hash=sha256:a3a6ed1d525bfb91b3fc9b690c5a21bb52de28c018530ad85093cc488bee2dd2 \
-    --hash=sha256:a6327976c7c2f4ee6816eff196e25385ccc02cb81427952414a64811037bbc8b \
-    --hash=sha256:a7409f968456111140c1c95301cadf071bd30a81cbd7ab829169fb9e3d72eae9 \
-    --hash=sha256:a825ec844298c791fd28ed14ed1bffc56a98d15b8c58a20e0e08c1f5f2bea1be \
-    --hash=sha256:a8c1df72eb746f4136fe9a2e72b0c9dc1da1cbd23b5372f94b5820ff8ae30e0e \
-    --hash=sha256:a9bd00dc3bc395a662900f33f74feb3e757429e545d831eef5bb280252631984 \
-    --hash=sha256:aa102d6d280a5455ad6a0f9e6d769989638718e938a6a0a2ff3f4a7ff8c62cc4 \
-    --hash=sha256:aaaea1e536f98754a6e5c56091baa1b6ce2f2700cc4a00b0d49eca8dea471074 \
-    --hash=sha256:ad4d7a90a92e528aadf4965d685c17dacff3df282db1121136c382dc0b6014d2 \
-    --hash=sha256:b8477c1ee4bd47c57d49621a062121c3023609f7a13b8a46953eb6c9716ca392 \
-    --hash=sha256:ba6f52cbc7809cd8d74604cce9c14868306ae4aa0282016b641c661f981a6e91 \
-    --hash=sha256:bac8d525a8dbc2a1507ec731d2867025d11ceadcb4dd421423a5d42c56818541 \
-    --hash=sha256:bef596fdaa8f26e3d66af846bbe77057237cb6e8efff8cd7cc8dff9a62278bbf \
-    --hash=sha256:c0ec0ed476f77db9fb29bca17f0a8fcc7bc97ad4c6c1d8959c507decb22e8572 \
-    --hash=sha256:c38c9ddb6103ceae4e4498f9c08fac9b590c5c71b0370f98714768e22ac6fa66 \
-    --hash=sha256:c7224cab95645c7ab53791022ae77a4509472613e839dab722a72abe5a684575 \
-    --hash=sha256:c74018551e31269d56fab81a728f683667e7c28c04e807ba08f8c9e3bba32f14 \
-    --hash=sha256:ca06675212f94e7a610e85ca36948bb8fc023e458dd6c63ef71abfd482481aa5 \
-    --hash=sha256:d1d2532b340b692880261c15aee4dc94dd22ca5d61b9db9a8a361953d36410b1 \
-    --hash=sha256:d25039a474c4c72a5ad4b52495056f843a7ff07b632c1b92ea9043a3d9950f6e \
-    --hash=sha256:d5ff2c858f5f6a42c2a8e751100f237c5e869cbde669a724f2062d4c4ef93551 \
-    --hash=sha256:d7d7f7de27b8944f1fee2c26a88b4dabc2409d2fea7a9ed3df79b67277644e17 \
-    --hash=sha256:d7eeb6d22331e2fd42fce928a81c697c9ee2d51400bd1a28803965883e13cead \
-    --hash=sha256:d8a1c6c0be645c745a081c192e747c5de06e944a0d21245f4cf7c05e457c36e0 \
-    --hash=sha256:d8b889777de69897406c9fb0b76cdf2fd0f31267861ae7501d93003d55f54fbe \
-    --hash=sha256:d9e09c9d74f4566e905a0b8fa668c58109f7624db96a2171f21747abc7524234 \
-    --hash=sha256:db8e58b9d79200c76956cefd14d5c90af54416ff5353c5bfd7cbe58818e26ef0 \
-    --hash=sha256:ddb2a5c08a4eaaba605340fdee8fc08e406c56617566d9643ad8bf6852778fc7 \
-    --hash=sha256:e0381b4ce23ff92f8170080c97678040fc5b08da85e9e292292aba67fdac6c34 \
-    --hash=sha256:e23a6d84d9d1738dbc6e38167776107e63307dfc8ad108e580548d1f2c587f42 \
-    --hash=sha256:e516dc8baf7b380e6c1c26792610230f37147bb754d6426462ab115a02944385 \
-    --hash=sha256:ea65804b5dc88dacd4a40279af0cdadcfe74b3e5b4c897aa0d81cf86927fee78 \
-    --hash=sha256:ec61d826d80fc293ed46c9dd26995921e3a82146feacd952ef0757236fc137be \
-    --hash=sha256:ee04010f26d5102399bd17f8df8bc38dc7ccd7701dc77f4a68c5b8d733406958 \
-    --hash=sha256:f3bc6af6e2b8f92eced34ef6a96ffb248e863af20ef4fde9448cc8c9b858b749 \
-    --hash=sha256:f7d6b36dd2e029b6bcb8a13cf19664c7b8e19ab3a58e0fefbb5b8461447ed5ec
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+yarl==1.11.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:01a8697ec24f17c349c4f655763c4db70eebc56a5f82995e5e26e837c6eb0e49 \
+    --hash=sha256:02da8759b47d964f9173c8675710720b468aa1c1693be0c9c64abb9d8d9a4867 \
+    --hash=sha256:04293941646647b3bfb1719d1d11ff1028e9c30199509a844da3c0f5919dc520 \
+    --hash=sha256:067b961853c8e62725ff2893226fef3d0da060656a9827f3f520fb1d19b2b68a \
+    --hash=sha256:077da604852be488c9a05a524068cdae1e972b7dc02438161c32420fb4ec5e14 \
+    --hash=sha256:09696438cb43ea6f9492ef237761b043f9179f455f405279e609f2bc9100212a \
+    --hash=sha256:0b8486f322d8f6a38539136a22c55f94d269addb24db5cb6f61adc61eabc9d93 \
+    --hash=sha256:0ea9682124fc062e3d931c6911934a678cb28453f957ddccf51f568c2f2b5e05 \
+    --hash=sha256:0f351fa31234699d6084ff98283cb1e852270fe9e250a3b3bf7804eb493bd937 \
+    --hash=sha256:14438dfc5015661f75f85bc5adad0743678eefee266ff0c9a8e32969d5d69f74 \
+    --hash=sha256:15061ce6584ece023457fb8b7a7a69ec40bf7114d781a8c4f5dcd68e28b5c53b \
+    --hash=sha256:15439f3c5c72686b6c3ff235279630d08936ace67d0fe5c8d5bbc3ef06f5a420 \
+    --hash=sha256:17b5a386d0d36fb828e2fb3ef08c8829c1ebf977eef88e5367d1c8c94b454639 \
+    --hash=sha256:18ac56c9dd70941ecad42b5a906820824ca72ff84ad6fa18db33c2537ae2e089 \
+    --hash=sha256:1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53 \
+    --hash=sha256:1e969fa4c1e0b1a391f3fcbcb9ec31e84440253325b534519be0d28f4b6b533e \
+    --hash=sha256:1fa2e7a406fbd45b61b4433e3aa254a2c3e14c4b3186f6e952d08a730807fa0c \
+    --hash=sha256:2164cd9725092761fed26f299e3f276bb4b537ca58e6ff6b252eae9631b5c96e \
+    --hash=sha256:21a7c12321436b066c11ec19c7e3cb9aec18884fe0d5b25d03d756a9e654edfe \
+    --hash=sha256:238a21849dd7554cb4d25a14ffbfa0ef380bb7ba201f45b144a14454a72ffa5a \
+    --hash=sha256:250e888fa62d73e721f3041e3a9abf427788a1934b426b45e1b92f62c1f68366 \
+    --hash=sha256:25861303e0be76b60fddc1250ec5986c42f0a5c0c50ff57cc30b1be199c00e63 \
+    --hash=sha256:267b24f891e74eccbdff42241c5fb4f974de2d6271dcc7d7e0c9ae1079a560d9 \
+    --hash=sha256:27fcb271a41b746bd0e2a92182df507e1c204759f460ff784ca614e12dd85145 \
+    --hash=sha256:2909fa3a7d249ef64eeb2faa04b7957e34fefb6ec9966506312349ed8a7e77bf \
+    --hash=sha256:3257978c870728a52dcce8c2902bf01f6c53b65094b457bf87b2644ee6238ddc \
+    --hash=sha256:327c724b01b8641a1bf1ab3b232fb638706e50f76c0b5bf16051ab65c868fac5 \
+    --hash=sha256:3de5292f9f0ee285e6bd168b2a77b2a00d74cbcfa420ed078456d3023d2f6dff \
+    --hash=sha256:3fce4da3703ee6048ad4138fe74619c50874afe98b1ad87b2698ef95bf92c96d \
+    --hash=sha256:3ff6b1617aa39279fe18a76c8d165469c48b159931d9b48239065767ee455b2b \
+    --hash=sha256:400cd42185f92de559d29eeb529e71d80dfbd2f45c36844914a4a34297ca6f00 \
+    --hash=sha256:4179522dc0305c3fc9782549175c8e8849252fefeb077c92a73889ccbcd508ad \
+    --hash=sha256:4307d9a3417eea87715c9736d050c83e8c1904e9b7aada6ce61b46361b733d92 \
+    --hash=sha256:476e20c433b356e16e9a141449f25161e6b69984fb4cdbd7cd4bd54c17844998 \
+    --hash=sha256:489fa8bde4f1244ad6c5f6d11bb33e09cf0d1d0367edb197619c3e3fc06f3d91 \
+    --hash=sha256:48a28bed68ab8fb7e380775f0029a079f08a17799cb3387a65d14ace16c12e2b \
+    --hash=sha256:48dfd117ab93f0129084577a07287376cc69c08138694396f305636e229caa1a \
+    --hash=sha256:4973eac1e2ff63cf187073cd4e1f1148dcd119314ab79b88e1b3fad74a18c9d5 \
+    --hash=sha256:498442e3af2a860a663baa14fbf23fb04b0dd758039c0e7c8f91cb9279799bff \
+    --hash=sha256:501c503eed2bb306638ccb60c174f856cc3246c861829ff40eaa80e2f0330367 \
+    --hash=sha256:504cf0d4c5e4579a51261d6091267f9fd997ef58558c4ffa7a3e1460bd2336fa \
+    --hash=sha256:61a5f2c14d0a1adfdd82258f756b23a550c13ba4c86c84106be4c111a3a4e413 \
+    --hash=sha256:637c7ddb585a62d4469f843dac221f23eec3cbad31693b23abbc2c366ad41ff4 \
+    --hash=sha256:66b63c504d2ca43bf7221a1f72fbe981ff56ecb39004c70a94485d13e37ebf45 \
+    --hash=sha256:67459cf8cf31da0e2cbdb4b040507e535d25cfbb1604ca76396a3a66b8ba37a6 \
+    --hash=sha256:688654f8507464745ab563b041d1fb7dab5d9912ca6b06e61d1c4708366832f5 \
+    --hash=sha256:6907daa4b9d7a688063ed098c472f96e8181733c525e03e866fb5db480a424df \
+    --hash=sha256:69721b8effdb588cb055cc22f7c5105ca6fdaa5aeb3ea09021d517882c4a904c \
+    --hash=sha256:6d23754b9939cbab02c63434776df1170e43b09c6a517585c7ce2b3d449b7318 \
+    --hash=sha256:7175a87ab8f7fbde37160a15e58e138ba3b2b0e05492d7351314a250d61b1591 \
+    --hash=sha256:72bf26f66456baa0584eff63e44545c9f0eaed9b73cb6601b647c91f14c11f38 \
+    --hash=sha256:74db2ef03b442276d25951749a803ddb6e270d02dda1d1c556f6ae595a0d76a8 \
+    --hash=sha256:750f656832d7d3cb0c76be137ee79405cc17e792f31e0a01eee390e383b2936e \
+    --hash=sha256:75e0ae31fb5ccab6eda09ba1494e87eb226dcbd2372dae96b87800e1dcc98804 \
+    --hash=sha256:768ecc550096b028754ea28bf90fde071c379c62c43afa574edc6f33ee5daaec \
+    --hash=sha256:7d51324a04fc4b0e097ff8a153e9276c2593106a811704025bbc1d6916f45ca6 \
+    --hash=sha256:7e975a2211952a8a083d1b9d9ba26472981ae338e720b419eb50535de3c02870 \
+    --hash=sha256:8215f6f21394d1f46e222abeb06316e77ef328d628f593502d8fc2a9117bde83 \
+    --hash=sha256:8258c86f47e080a258993eed877d579c71da7bda26af86ce6c2d2d072c11320d \
+    --hash=sha256:8418c053aeb236b20b0ab8fa6bacfc2feaaf7d4683dd96528610989c99723d5f \
+    --hash=sha256:87f020d010ba80a247c4abc335fc13421037800ca20b42af5ae40e5fd75e7909 \
+    --hash=sha256:884eab2ce97cbaf89f264372eae58388862c33c4f551c15680dd80f53c89a269 \
+    --hash=sha256:8a336eaa7ee7e87cdece3cedb395c9657d227bfceb6781295cf56abcd3386a26 \
+    --hash=sha256:8aef1b64da41d18026632d99a06b3fefe1d08e85dd81d849fa7c96301ed22f1b \
+    --hash=sha256:8aef97ba1dd2138112890ef848e17d8526fe80b21f743b4ee65947ea184f07a2 \
+    --hash=sha256:8ed653638ef669e0efc6fe2acb792275cb419bf9cb5c5049399f3556995f23c7 \
+    --hash=sha256:9361628f28f48dcf8b2f528420d4d68102f593f9c2e592bfc842f5fb337e44fd \
+    --hash=sha256:946eedc12895873891aaceb39bceb484b4977f70373e0122da483f6c38faaa68 \
+    --hash=sha256:94d0caaa912bfcdc702a4204cd5e2bb01eb917fc4f5ea2315aa23962549561b0 \
+    --hash=sha256:964a428132227edff96d6f3cf261573cb0f1a60c9a764ce28cda9525f18f7786 \
+    --hash=sha256:999bfee0a5b7385a0af5ffb606393509cfde70ecca4f01c36985be6d33e336da \
+    --hash=sha256:a08ea567c16f140af8ddc7cb58e27e9138a1386e3e6e53982abaa6f2377b38cc \
+    --hash=sha256:a28b70c9e2213de425d9cba5ab2e7f7a1c8ca23a99c4b5159bf77b9c31251447 \
+    --hash=sha256:a34e1e30f1774fa35d37202bbeae62423e9a79d78d0874e5556a593479fdf239 \
+    --hash=sha256:a4264515f9117be204935cd230fb2a052dd3792789cc94c101c535d349b3dab0 \
+    --hash=sha256:a7915ea49b0c113641dc4d9338efa9bd66b6a9a485ffe75b9907e8573ca94b84 \
+    --hash=sha256:aac44097d838dda26526cffb63bdd8737a2dbdf5f2c68efb72ad83aec6673c7e \
+    --hash=sha256:b91044952da03b6f95fdba398d7993dd983b64d3c31c358a4c89e3c19b6f7aef \
+    --hash=sha256:ba444bdd4caa2a94456ef67a2f383710928820dd0117aae6650a4d17029fa25e \
+    --hash=sha256:c2dc4250fe94d8cd864d66018f8344d4af50e3758e9d725e94fecfa27588ff82 \
+    --hash=sha256:c35f493b867912f6fda721a59cc7c4766d382040bdf1ddaeeaa7fa4d072f4675 \
+    --hash=sha256:c92261eb2ad367629dc437536463dc934030c9e7caca861cc51990fe6c565f26 \
+    --hash=sha256:ce928c9c6409c79e10f39604a7e214b3cb69552952fbda8d836c052832e6a979 \
+    --hash=sha256:d95b52fbef190ca87d8c42f49e314eace4fc52070f3dfa5f87a6594b0c1c6e46 \
+    --hash=sha256:dae7bd0daeb33aa3e79e72877d3d51052e8b19c9025ecf0374f542ea8ec120e4 \
+    --hash=sha256:e286580b6511aac7c3268a78cdb861ec739d3e5a2a53b4809faef6b49778eaff \
+    --hash=sha256:e4b53f73077e839b3f89c992223f15b1d2ab314bdbdf502afdc7bb18e95eae27 \
+    --hash=sha256:e8f63904df26d1a66aabc141bfd258bf738b9bc7bc6bdef22713b4f5ef789a4c \
+    --hash=sha256:f3a6d90cab0bdf07df8f176eae3a07127daafcf7457b997b2bf46776da2c7eb7 \
+    --hash=sha256:f41fa79114a1d2eddb5eea7b912d6160508f57440bd302ce96eaa384914cd265 \
+    --hash=sha256:f46f81501160c28d0c0b7333b4f7be8983dbbc161983b6fb814024d1b4952f79 \
+    --hash=sha256:f61db3b7e870914dbd9434b560075e0366771eecbe6d2b5561f5bc7485f39efd
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/boefjes/tests/conftest.py b/boefjes/tests/conftest.py
index d94dc074344..512c3cb7454 100644
--- a/boefjes/tests/conftest.py
+++ b/boefjes/tests/conftest.py
@@ -7,6 +7,7 @@
 from pathlib import Path
 from uuid import UUID
 
+import alembic.config
 import pytest
 from fastapi.testclient import TestClient
 from pydantic import TypeAdapter
@@ -16,12 +17,21 @@
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.clients.scheduler_client import Queue, SchedulerClientInterface, Task, TaskStatus
 from boefjes.config import Settings, settings
+from boefjes.dependencies.plugins import PluginService, get_plugin_service
 from boefjes.job_handler import bytes_api_client
 from boefjes.job_models import BoefjeMeta, NormalizerMeta
+from boefjes.katalogus.organisations import check_organisation_exists
+from boefjes.katalogus.root import app
+from boefjes.local import LocalBoefjeJobRunner, LocalNormalizerJobRunner
+from boefjes.local_repository import LocalPluginRepository, get_local_repository
 from boefjes.models import Organisation
 from boefjes.runtime_interfaces import Handler, WorkerManager
+from boefjes.sql.config_storage import SQLConfigStorage, create_encrypter
 from boefjes.sql.db import SQL_BASE, get_engine
-from boefjes.sql.organisation_storage import SQLOrganisationStorage
+from boefjes.sql.organisation_storage import SQLOrganisationStorage, get_organisations_store
+from boefjes.sql.plugin_storage import SQLPluginStorage
+from boefjes.storage.interfaces import OrganisationNotFound
+from boefjes.storage.memory import ConfigStorageMemory, OrganisationStorageMemory, PluginStorageMemory
 from octopoes.api.models import Declaration, Observation
 from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.models import OOI
@@ -40,11 +50,13 @@ def __init__(
         log_path: Path,
         raise_on_empty_queue: Exception = KeyboardInterrupt,
         iterations_to_wait_for_exception: int = 0,
-        sleep_time: int = 0.1,
+        sleep_time: float = 0.1,
     ):
         self.queue_response = queue_response
         self.boefje_responses = boefje_responses
         self.normalizer_responses = normalizer_responses
+
+        log_path.touch(exist_ok=True)
         self.log_path = log_path
         self.raise_on_empty_queue = raise_on_empty_queue
         self.iterations_to_wait_for_exception = iterations_to_wait_for_exception
@@ -53,7 +65,7 @@ def __init__(
         self._iterations = 0
         self._tasks: dict[str, Task] = multiprocessing.Manager().dict()
         self._popped_items: dict[str, Task] = multiprocessing.Manager().dict()
-        self._pushed_items: dict[str, tuple[str, Task]] = multiprocessing.Manager().dict()
+        self._pushed_items: dict[str, Task] = multiprocessing.Manager().dict()
 
     def get_queues(self) -> list[Queue]:
         time.sleep(self.sleep_time)
@@ -72,6 +84,7 @@ def pop_item(self, queue: str) -> Task | None:
             if WorkerManager.Queue.NORMALIZERS.value in queue:
                 p_item = TypeAdapter(Task).validate_json(self.normalizer_responses.pop(0))
                 self._popped_items[str(p_item.id)] = p_item
+                self._tasks[str(p_item.id)] = self._task_from_id(p_item.id)
                 return p_item
         except IndexError:
             raise self.raise_on_empty_queue
@@ -94,8 +107,8 @@ def get_task(self, task_id: UUID) -> Task:
     def _task_from_id(self, task_id: UUID):
         return self._popped_items[str(task_id)]
 
-    def push_item(self, queue_id: str, p_item: Task) -> None:
-        self._pushed_items[str(p_item.id)] = (queue_id, p_item)
+    def push_item(self, p_item: Task) -> None:
+        self._pushed_items[str(p_item.id)] = p_item
 
 
 class MockHandler(Handler):
@@ -105,10 +118,11 @@ def __init__(self, exception=Exception):
         self.exception = exception
 
     def handle(self, item: BoefjeMeta | NormalizerMeta):
+        time.sleep(self.sleep_time)
+
         if str(item.id) == "9071c9fd-2b9f-440f-a524-ef1ca4824fd4":
             raise self.exception()
 
-        time.sleep(self.sleep_time)
         self.queue.put(item)
 
     def get_all(self) -> list[BoefjeMeta | NormalizerMeta]:
@@ -124,9 +138,11 @@ def item_handler(tmp_path: Path):
 def manager(item_handler: MockHandler, tmp_path: Path) -> SchedulerWorkerManager:
     scheduler_client = MockSchedulerClient(
         queue_response=get_dummy_data("scheduler/queues_response.json"),
-        boefje_responses=(
-            2 * [get_dummy_data("scheduler/pop_response_boefje.json")] + [get_dummy_data("scheduler/should_crash.json")]
-        ),
+        boefje_responses=[
+            get_dummy_data("scheduler/pop_response_boefje.json"),
+            get_dummy_data("scheduler/pop_response_boefje_2.json"),
+            get_dummy_data("scheduler/should_crash.json"),
+        ],
         normalizer_responses=[get_dummy_data("scheduler/pop_response_normalizer.json")],
         log_path=tmp_path / "patch_task_log",
     )
@@ -142,24 +158,115 @@ def api(tmp_path):
 
 
 @pytest.fixture
-def organisation_repository():
+def session():
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
     engine = get_engine()
     session = sessionmaker(bind=engine)()
 
-    yield SQLOrganisationStorage(session, settings)
+    yield session
+
+    session.commit()
+    engine.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
+
+
+@pytest.fixture
+def organisation_storage(session):
+    return SQLOrganisationStorage(session, settings)
+
+
+@pytest.fixture
+def config_storage(session):
+    return SQLConfigStorage(session, create_encrypter())
+
+
+@pytest.fixture
+def plugin_storage(session):
+    return SQLPluginStorage(session, settings)
+
+
+@pytest.fixture
+def local_repository():
+    return get_local_repository()
+
+
+@pytest.fixture
+def mock_local_repository():
+    return LocalPluginRepository(Path(__file__).parent / "modules")
 
-    session.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
-    session.close()
+
+@pytest.fixture
+def normalizer_runner(local_repository: LocalPluginRepository):
+    return LocalNormalizerJobRunner(local_repository)
 
 
 @pytest.fixture
-def organisation(organisation_repository) -> Organisation:
-    organisation = Organisation(id="test", name="Test org")
+def boefje_runner(local_repository: LocalPluginRepository):
+    return LocalBoefjeJobRunner(local_repository)
 
-    with organisation_repository as repo:
-        repo.create(organisation)
 
-    return organisation
+@pytest.fixture
+def mock_normalizer_runner(mock_local_repository: LocalPluginRepository):
+    return LocalNormalizerJobRunner(mock_local_repository)
+
+
+@pytest.fixture
+def mock_boefje_runner(mock_local_repository: LocalPluginRepository):
+    return LocalBoefjeJobRunner(mock_local_repository)
+
+
+@pytest.fixture
+def plugin_service(plugin_storage, config_storage, local_repository):
+    return PluginService(plugin_storage, config_storage, local_repository)
+
+
+@pytest.fixture
+def test_organisation():
+    return Organisation(id="test", name="Test org")
+
+
+@pytest.fixture
+def mock_plugin_service(mock_local_repository, test_organisation) -> PluginService:
+    storage = ConfigStorageMemory()
+    storage.upsert(test_organisation.id, "test_plugin", {"DUMMY_VAR": "123"})
+
+    return PluginService(PluginStorageMemory(), storage, mock_local_repository)
+
+
+@pytest.fixture
+def organisation(organisation_storage, test_organisation) -> Organisation:
+    with organisation_storage as repo:
+        repo.create(test_organisation)
+
+    return test_organisation
+
+
+@pytest.fixture
+def unit_test_client(mock_plugin_service) -> TestClient:
+    client = TestClient(app)
+    _store = OrganisationStorageMemory({"test": Organisation(id="test", name="Test")})
+
+    services = {
+        "test": mock_plugin_service,
+    }
+
+    def get_service(organisation_id: str):
+        if organisation_id in services:
+            return services.get(organisation_id)
+
+        raise OrganisationNotFound(organisation_id)
+
+    app.dependency_overrides[get_organisations_store] = lambda: _store
+    app.dependency_overrides[get_plugin_service] = get_service
+    app.dependency_overrides[check_organisation_exists] = lambda: None
+
+    yield client
+
+    app.dependency_overrides = {}
+
+
+@pytest.fixture
+def test_client() -> TestClient:
+    return TestClient(app)
 
 
 @pytest.fixture
diff --git a/boefjes/tests/examples/adr-validator-output.json b/boefjes/tests/examples/adr-validator-output.json
deleted file mode 100644
index ef83370f3e2..00000000000
--- a/boefjes/tests/examples/adr-validator-output.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "rule": "TEST-01",
-    "passed": false,
-    "message": "Error A"
-  },
-  {
-    "rule": "TEST-02",
-    "passed": true,
-    "message": ""
-  },
-  {
-    "rule": "TEST-03",
-    "passed": false,
-    "message": "Error B"
-  }
-]
diff --git a/boefjes/tests/examples/crt-normalize.json b/boefjes/tests/examples/crt-normalize.json
deleted file mode 100644
index ea41e68844d..00000000000
--- a/boefjes/tests/examples/crt-normalize.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "47de840e-b778-4ca7-8709-4693b05bb455",
-  "organization": "_dev",
-  "arguments": {
-    "fqdn": "fundacionladulce.org.ar."
-  },
-  "started_at": "2021-07-27T11:26:42.679000+00:00",
-  "ended_at": "2021-07-27T11:26:44.679000+00:00",
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/crt.json b/boefjes/tests/examples/crt.json
deleted file mode 100644
index 7e290bc2de5..00000000000
--- a/boefjes/tests/examples/crt.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "875ed573-6edb-4470-b6ac-8693a443bfab",
-  "organization": "_dev",
-  "arguments": {
-    "fqdn": "fundacionladulce.org.ar."
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_crt_sh.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/dns-job.json b/boefjes/tests/examples/dns-job.json
deleted file mode 100644
index 8ba85119326..00000000000
--- a/boefjes/tests/examples/dns-job.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "id": "99c3df04-8960-4059-94ea-2a8db1ca8b1c",
-  "boefje": {
-    "id": "dns-records",
-    "version": null
-  },
-  "organization": "_dev",
-  "input_ooi": "Hostname|internet|www.example.nl",
-  "arguments": {
-    "input": {
-      "name": "www.example.nl"
-    }
-  },
-  "dispatches": [
-    {
-      "id": "kat_dns_normalize",
-      "version": null
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/dns-normalize2.json b/boefjes/tests/examples/dns-normalize2.json
deleted file mode 100644
index 486edfee681..00000000000
--- a/boefjes/tests/examples/dns-normalize2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "id": "53b86653-decd-453c-9b04-f5471f6e3ebc",
-  "organization": "_dev",
-  "input_ooi": "Hostname|internet|www.example.nl",
-  "arguments": {
-    "domain": "www.example.nl",
-    "input": {
-      "id": "www.example.nl"
-    }
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_dns_normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/dummy.json b/boefjes/tests/examples/dummy.json
deleted file mode 100644
index 1ab6259ef7f..00000000000
--- a/boefjes/tests/examples/dummy.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "id": "cd29d8e1-5fd9-4ff2-8252-5ac4fc25122c",
-  "boefje": {
-    "id": "kat_test.test",
-    "version": null
-  },
-  "organization": "_dev",
-  "input_ooi": "Hostname|internet|rijksoverheid.nl",
-  "arguments": {
-    "domain": "domain.com"
-  },
-  "dispatches": [
-    {
-      "id": "kat_test.test_normalize",
-      "version": null
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/ipv6_nameservers.json b/boefjes/tests/examples/ipv6_nameservers.json
deleted file mode 100644
index 575cfdea013..00000000000
--- a/boefjes/tests/examples/ipv6_nameservers.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "id": "2a9aef8a-74bc-449c-8172-5fc9faf9fe7e",
-  "boefje": {
-    "id": "IPv6 nameservers",
-    "version": null
-  },
-  "organization": "_dev",
-  "input_ooi": "Hostname|internet|rijksoverheid.nl",
-  "arguments": {
-    "hostname": "rijksoverheid.nl",
-    "pk": "Hostname|internet|rijksoverheid.nl",
-    "dns_records": "[{\"hostname\": \"ns0.rijksoverheidnl.com.\", \"ip\": \"2a06:fb00:1::1:82\"}, {\"hostname\": \"ns1.rijksoverheidnl.nl.\", \"ip\": \"2a00:d00:3:6::130\"}]"
-  },
-  "dispatches": [
-    {
-      "id": "kat_ipv6_nameservers_normalize",
-      "version": null
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/ipv6_nameservers_normalize.json b/boefjes/tests/examples/ipv6_nameservers_normalize.json
deleted file mode 100644
index d1c72f4a316..00000000000
--- a/boefjes/tests/examples/ipv6_nameservers_normalize.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "id": "43891719-f715-45d4-9f2b-295ab4bf17d3",
-  "boefje_meta": {
-    "id": "48aeb419-17c8-4f63-80c8-496000f5aa59",
-    "boefje": {
-      "id": "IPv6 nameservers",
-      "version": null
-    },
-    "organization": "_dev",
-    "input_ooi": "Hostname|internet|rijksoverheid.nl",
-    "arguments": {
-      "hostname": "rijksoverheid.nl",
-      "pk": "Hostname|internet|rijksoverheid.nl",
-      "dns_records": "[{\"hostname\": \"ns0.rijksoverheidnl.com.\", \"ip\": \"2a06:fb00:1::1:82\"}, {\"hostname\": \"ns1.rijksoverheidnl.nl.\", \"ip\": \"2a00:d00:3:6::130\"}]"
-    },
-    "dispatches": [
-      {
-        "id": "kat_ipv6_nameservers_normalize",
-        "version": null
-      }
-    ]
-  },
-  "normalizer": {
-    "id": "kat_ipv6_nameservers.normalize",
-    "version": null
-  }
-}
diff --git a/boefjes/tests/examples/ipv6_webservers.json b/boefjes/tests/examples/ipv6_webservers.json
deleted file mode 100644
index 520c881e88e..00000000000
--- a/boefjes/tests/examples/ipv6_webservers.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "id": "11a83bfb-d74b-4df5-913f-539285558a71",
-  "boefje": {
-    "id": "IPv6 webservers",
-    "version": null
-  },
-  "organization": "_dev",
-  "input_ooi": "Hostname|internet|rijksoverheid.nl",
-  "arguments": {
-    "pk": "Hostname|internet|rijksoverheid.nl",
-    "dns_records": "[\"2a00:d00:3:2::3\", \"2a00:d00:3:2::4\", \"2a00:d00:3:2::5\", \"2a00:d00:3:2::6\"]"
-  },
-  "dispatches": [
-    {
-      "id": "kat_ipv6_webservers_normalize",
-      "version": null
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/ipv6_webservers_normalize.json b/boefjes/tests/examples/ipv6_webservers_normalize.json
deleted file mode 100644
index a7111484f2e..00000000000
--- a/boefjes/tests/examples/ipv6_webservers_normalize.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "id": "b87ae0ec-24e7-4c1b-9d43-e8ca6db154e9",
-  "boefje_meta": {
-    "id": "ip-v6-webserver-job",
-    "boefje": {
-      "id": "IPv6 webservers",
-      "version": null
-    },
-    "organization": "_dev",
-    "input_ooi": "Hostname|internet|rijksoverheid.nl",
-    "arguments": {
-      "pk": "Hostname|internet|rijksoverheid.nl",
-      "dns_records": "[\"2a00:d00:3:2::3\", \"2a00:d00:3:2::4\", \"2a00:d00:3:2::5\", \"2a00:d00:3:2::6\"]"
-    },
-    "dispatches": [
-      {
-        "id": "kat_ipv6_webservers_normalize",
-        "version": null
-      }
-    ]
-  },
-  "normalizer": {
-    "id": "kat_ipv6_webservers.normalize",
-    "version": null
-  }
-}
diff --git a/boefjes/tests/examples/nmap-250-normalize.json b/boefjes/tests/examples/nmap-250-normalize.json
deleted file mode 100644
index 5318cf5a9bd..00000000000
--- a/boefjes/tests/examples/nmap-250-normalize.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "id": "645fd349-6d62-43dd-8cfe-d3ab03c9e4b7",
-  "organization": "_dev",
-  "arguments": {},
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/nmap-250.json b/boefjes/tests/examples/nmap-250.json
deleted file mode 100644
index d2836fe9448..00000000000
--- a/boefjes/tests/examples/nmap-250.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "05d98a46-0e35-461c-91f9-7e62f1cf32d6",
-  "organization": "_dev",
-  "arguments": {
-    "host": "213.239.154.31"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_nmap.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/nmap-normalize.json b/boefjes/tests/examples/nmap-normalize.json
deleted file mode 100644
index a35dfc5a930..00000000000
--- a/boefjes/tests/examples/nmap-normalize.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "id": "3eedc431-1402-41a5-85dd-e59172e9fd61",
-  "organization": "_dev",
-  "arguments": {},
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/nmap.json b/boefjes/tests/examples/nmap.json
deleted file mode 100644
index 6e44a71eb6f..00000000000
--- a/boefjes/tests/examples/nmap.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "646a3a5e-b3ac-4f23-b679-83662d91c9be",
-  "organization": "_dev",
-  "arguments": {
-    "host": "213.239.154.31"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_nmap.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/raw/leakix-example.com-output.txt b/boefjes/tests/examples/raw/leakix-example.com-output.txt
index 52237e3dbf3..72032235123 100644
--- a/boefjes/tests/examples/raw/leakix-example.com-output.txt
+++ b/boefjes/tests/examples/raw/leakix-example.com-output.txt
@@ -1 +1 @@
-[AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.128.108.228', address=IPv4Address('178.128.108.228'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.128.108.228|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|178.128.108.228'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.128.108.228|tcp|80', address=Reference('IPAddressV4|internet|178.128.108.228'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.128.108.228', address=IPv4Address('178.128.108.228'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|LiteSpeed||', name='LiteSpeed', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|178.128.108.228|Software|LiteSpeed||', ooi=Reference('IPAddressV4|internet|178.128.108.228'), software=Reference('Software|LiteSpeed||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|LiteSpeed|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|LiteSpeed||'), proof=None, description='Software = "LiteSpeed".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|12703', number='12703', name='Pulsant (Scotland) Ltd'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|5.153.73.160', address=IPv4Address('5.153.73.160'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|5.153.73.160|19', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|12703'), parent=None, start_ip=Reference('IPAddressV4|internet|5.153.73.160'), mask=19), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|5.153.73.160|tcp|80', address=Reference('IPAddressV4|internet|5.153.73.160'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|5.153.73.160', address=IPv4Address('5.153.73.160'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|5.153.73.160|Software|Apache||', ooi=Reference('IPAddressV4|internet|5.153.73.160'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|40021', number='40021', name='CONTABO'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|144.126.159.199', address=IPv4Address('144.126.159.199'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|144.126.159.199|19', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|40021'), parent=None, start_ip=Reference('IPAddressV4|internet|144.126.159.199'), mask=19), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|144.126.159.199|tcp|80', address=Reference('IPAddressV4|internet|144.126.159.199'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|144.126.159.199', address=IPv4Address('144.126.159.199'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Kibana||', name='Kibana', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|144.126.159.199|Software|Kibana||', ooi=Reference('IPAddressV4|internet|144.126.159.199'), software=Reference('Software|Kibana||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-HIGH', id='KAT-LEAKIX-HIGH', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Kibana|||KAT-LEAKIX-HIGH', finding_type=Reference('KATFindingType|KAT-LEAKIX-HIGH'), ooi=Reference('Software|Kibana||'), proof=None, description='Software = "Kibana".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|24940', number='24940', name='Hetzner Online GmbH'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.63.132.10', address=IPv4Address('178.63.132.10'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.63.132.10|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|24940'), parent=None, start_ip=Reference('IPAddressV4|internet|178.63.132.10'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.63.132.10|tcp|443', address=Reference('IPAddressV4|internet|178.63.132.10'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Hostname(object_type='Hostname', scan_profile=None, user_id=None, primary_key='Hostname|internet|praktikant.dimata.it', network=Reference('Network|internet'), name='praktikant.dimata.it', dns_zone=None, registered_domain=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx||', name='nginx', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|Hostname|internet|praktikant.dimata.it|Software|nginx||', ooi=Reference('Hostname|internet|praktikant.dimata.it'), software=Reference('Software|nginx||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx||'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.131.213.169', address=IPv4Address('104.131.213.169'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|104.131.213.169|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|104.131.213.169'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|104.131.213.169|tcp|80', address=Reference('IPAddressV4|internet|104.131.213.169'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.14.2|', name='nginx', version='1.14.2', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPPort|internet|104.131.213.169|tcp|80|Software|nginx|1.14.2|', ooi=Reference('IPPort|internet|104.131.213.169|tcp|80'), software=Reference('Software|nginx|1.14.2|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.14.2||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.14.2|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|27843', number='27843', name='WIN EMPRESAS S.A.C.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|45.236.45.11', address=IPv4Address('45.236.45.11'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|45.236.45.11|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|27843'), parent=None, start_ip=Reference('IPAddressV4|internet|45.236.45.11'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|45.236.45.11|tcp|443', address=Reference('IPAddressV4|internet|45.236.45.11'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|45.236.45.11', address=IPv4Address('45.236.45.11'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.18.0|', name='nginx', version='1.18.0', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|45.236.45.11|Software|nginx|1.18.0|', ooi=Reference('IPAddressV4|internet|45.236.45.11'), software=Reference('Software|nginx|1.18.0|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.18.0||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.18.0|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|43391', number='43391', name='Netdirekt A.S.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.187.201.46', address=IPv4Address('93.187.201.46'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|93.187.201.46|21', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|43391'), parent=None, start_ip=Reference('IPAddressV4|internet|93.187.201.46'), mask=21), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|93.187.201.46|tcp|80', address=Reference('IPAddressV4|internet|93.187.201.46'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.187.201.46', address=IPv4Address('93.187.201.46'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx||', name='nginx', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|93.187.201.46|Software|nginx||', ooi=Reference('IPAddressV4|internet|93.187.201.46'), software=Reference('Software|nginx||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx||'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|63949', number='63949', name='Akamai Connected Cloud'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.79.147.40', address=IPv4Address('178.79.147.40'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.79.147.40|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|63949'), parent=None, start_ip=Reference('IPAddressV4|internet|178.79.147.40'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.79.147.40|tcp|443', address=Reference('IPAddressV4|internet|178.79.147.40'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.79.147.40', address=IPv4Address('178.79.147.40'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Elasticsearch|7.17.9|', name='Elasticsearch', version='7.17.9', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|178.79.147.40|Software|Elasticsearch|7.17.9|', ooi=Reference('IPAddressV4|internet|178.79.147.40'), software=Reference('Software|Elasticsearch|7.17.9|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Elasticsearch|7.17.9||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Elasticsearch|7.17.9|'), proof=None, description='Software = "Elasticsearch".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|45102', number='45102', name='Alibaba US Technology Co., Ltd.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|8.219.94.19', address=IPv4Address('8.219.94.19'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|8.219.94.19|15', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|45102'), parent=None, start_ip=Reference('IPAddressV4|internet|8.219.94.19'), mask=15), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|8.219.94.19|tcp|443', address=Reference('IPAddressV4|internet|8.219.94.19'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Hostname(object_type='Hostname', scan_profile=None, user_id=None, primary_key='Hostname|internet|chat.getdeepin.org', network=Reference('Network|internet'), name='chat.getdeepin.org', dns_zone=None, registered_domain=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.23.3|', name='nginx', version='1.23.3', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|Hostname|internet|chat.getdeepin.org|Software|nginx|1.23.3|', ooi=Reference('Hostname|internet|chat.getdeepin.org'), software=Reference('Software|nginx|1.23.3|')), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|25400', number='25400', name='Telia Norge AS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.124.249.166', address=IPv4Address('93.124.249.166'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|93.124.249.166|17', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|25400'), parent=None, start_ip=Reference('IPAddressV4|internet|93.124.249.166'), mask=17), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|93.124.249.166|tcp|443', address=Reference('IPAddressV4|internet|93.124.249.166'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache|2.4.6|', name='Apache', version='2.4.6', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPPort|internet|93.124.249.166|tcp|443|Software|Apache|2.4.6|', ooi=Reference('IPPort|internet|93.124.249.166|tcp|443'), software=Reference('Software|Apache|2.4.6|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-LOW', id='KAT-LEAKIX-LOW', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|2.4.6||KAT-LEAKIX-LOW', finding_type=Reference('KATFindingType|KAT-LEAKIX-LOW'), ooi=Reference('Software|Apache|2.4.6|'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|16276', number='16276', name='OVH SAS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|213.251.158.214', address=IPv4Address('213.251.158.214'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|213.251.158.214|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|16276'), parent=None, start_ip=Reference('IPAddressV4|internet|213.251.158.214'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|213.251.158.214|tcp|80', address=Reference('IPAddressV4|internet|213.251.158.214'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|213.251.158.214', address=IPv4Address('213.251.158.214'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|213.251.158.214|Software|Apache||', ooi=Reference('IPAddressV4|internet|213.251.158.214'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|136052', number='136052', name='PT Cloud Hosting Indonesia'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|103.31.39.64', address=IPv4Address('103.31.39.64'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|103.31.39.64|23', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|136052'), parent=None, start_ip=Reference('IPAddressV4|internet|103.31.39.64'), mask=23), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|103.31.39.64|tcp|443', address=Reference('IPAddressV4|internet|103.31.39.64'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|103.31.39.64', address=IPv4Address('103.31.39.64'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.25.3|', name='nginx', version='1.25.3', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|103.31.39.64|Software|nginx|1.25.3|', ooi=Reference('IPAddressV4|internet|103.31.39.64'), software=Reference('Software|nginx|1.25.3|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.25.3||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.25.3|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|63199', number='63199', name='CDSC-AS1'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|148.153.126.87', address=IPv4Address('148.153.126.87'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|148.153.126.87|20', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|63199'), parent=None, start_ip=Reference('IPAddressV4|internet|148.153.126.87'), mask=20), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|148.153.126.87|tcp|443', address=Reference('IPAddressV4|internet|148.153.126.87'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|148.153.126.87', address=IPv4Address('148.153.126.87'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|VIP|vipshop|', name='VIP', version='vipshop', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|148.153.126.87|Software|VIP|vipshop|', ooi=Reference('IPAddressV4|internet|148.153.126.87'), software=Reference('Software|VIP|vipshop|')), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|7922', number='7922', name='COMCAST-7922'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.171.169.158', address=IPv4Address('104.171.169.158'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|104.171.169.158|21', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|7922'), parent=None, start_ip=Reference('IPAddressV4|internet|104.171.169.158'), mask=21), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|104.171.169.158|tcp|6556', address=Reference('IPAddressV4|internet|104.171.169.158'), protocol=<Protocol.TCP: 'tcp'>, port=6556, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.171.169.158', address=IPv4Address('104.171.169.158'), network=Reference('Network|internet'), netblock=None), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-HIGH', id='KAT-LEAKIX-HIGH', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|IPAddressV4|internet|104.171.169.158|KAT-LEAKIX-HIGH', finding_type=Reference('KATFindingType|KAT-LEAKIX-HIGH'), ooi=Reference('IPAddressV4|internet|104.171.169.158'), proof=None, description='Plugin = "IPAddressV4|internet|104.171.169.158".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|60130', number='60130', name='Nexthop AS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|185.56.187.42', address=IPv4Address('185.56.187.42'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|185.56.187.42|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|60130'), parent=None, start_ip=Reference('IPAddressV4|internet|185.56.187.42'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|185.56.187.42|tcp|443', address=Reference('IPAddressV4|internet|185.56.187.42'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|185.56.187.42', address=IPv4Address('185.56.187.42'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|185.56.187.42|Software|Apache||', ooi=Reference('IPAddressV4|internet|185.56.187.42'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|4766', number='4766', name='Korea Telecom'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|183.111.5.204', address=IPv4Address('183.111.5.204'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|183.111.5.204|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|4766'), parent=None, start_ip=Reference('IPAddressV4|internet|183.111.5.204'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|183.111.5.204|tcp|80', address=Reference('IPAddressV4|internet|183.111.5.204'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|183.111.5.204', address=IPv4Address('183.111.5.204'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|183.111.5.204|Software|Apache||', ooi=Reference('IPAddressV4|internet|183.111.5.204'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|8849', number='8849', name='Melbikomas UAB'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|162.247.152.131', address=IPv4Address('162.247.152.131'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|162.247.152.131|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|8849'), parent=None, start_ip=Reference('IPAddressV4|internet|162.247.152.131'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|162.247.152.131|tcp|443', address=Reference('IPAddressV4|internet|162.247.152.131'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|162.247.152.131', address=IPv4Address('162.247.152.131'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|162.247.152.131|Software|Apache||', ooi=Reference('IPAddressV4|internet|162.247.152.131'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|1136', number='1136', name='KPN B.V.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|77.60.161.116', address=IPv4Address('77.60.161.116'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|77.60.161.116|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|1136'), parent=None, start_ip=Reference('IPAddressV4|internet|77.60.161.116'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|77.60.161.116|tcp|443', address=Reference('IPAddressV4|internet|77.60.161.116'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|77.60.161.116', address=IPv4Address('77.60.161.116'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|77.60.161.116|Software|Apache||', ooi=Reference('IPAddressV4|internet|77.60.161.116'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|396982', number='396982', name='GOOGLE-CLOUD-PLATFORM'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|35.197.147.118', address=IPv4Address('35.197.147.118'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|35.197.147.118|15', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|396982'), parent=None, start_ip=Reference('IPAddressV4|internet|35.197.147.118'), mask=15), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|35.197.147.118|tcp|80', address=Reference('IPAddressV4|internet|35.197.147.118'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|35.197.147.118', address=IPv4Address('35.197.147.118'), network=Reference('Network|internet'), netblock=None), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|IPAddressV4|internet|35.197.147.118|KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('IPAddressV4|internet|35.197.147.118'), proof=None, description='Plugin = "IPAddressV4|internet|35.197.147.118".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|143.244.145.201', address=IPv4Address('143.244.145.201'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|143.244.145.201|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|143.244.145.201'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|143.244.145.201|tcp|443', address=Reference('IPAddressV4|internet|143.244.145.201'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|143.244.145.201', address=IPv4Address('143.244.145.201'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.14.0|', name='nginx', version='1.14.0', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|143.244.145.201|Software|nginx|1.14.0|', ooi=Reference('IPAddressV4|internet|143.244.145.201'), software=Reference('Software|nginx|1.14.0|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=None, risk_severity=None), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.14.0||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.14.0|'), proof=None, description='Software = "nginx".', reproduce=None)]
+[AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.128.108.228', address=IPv4Address('178.128.108.228'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.128.108.228|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|178.128.108.228'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.128.108.228|tcp|80', address=Reference('IPAddressV4|internet|178.128.108.228'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.128.108.228', address=IPv4Address('178.128.108.228'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|LiteSpeed||', name='LiteSpeed', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|178.128.108.228|Software|LiteSpeed||', ooi=Reference('IPAddressV4|internet|178.128.108.228'), software=Reference('Software|LiteSpeed||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|LiteSpeed|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|LiteSpeed||'), proof=None, description='Software = "LiteSpeed".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|12703', number='12703', name='Pulsant (Scotland) Ltd'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|5.153.73.160', address=IPv4Address('5.153.73.160'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|5.153.73.160|19', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|12703'), parent=None, start_ip=Reference('IPAddressV4|internet|5.153.73.160'), mask=19), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|5.153.73.160|tcp|80', address=Reference('IPAddressV4|internet|5.153.73.160'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|5.153.73.160', address=IPv4Address('5.153.73.160'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|5.153.73.160|Software|Apache||', ooi=Reference('IPAddressV4|internet|5.153.73.160'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|40021', number='40021', name='CONTABO'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|144.126.159.199', address=IPv4Address('144.126.159.199'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|144.126.159.199|19', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|40021'), parent=None, start_ip=Reference('IPAddressV4|internet|144.126.159.199'), mask=19), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|144.126.159.199|tcp|80', address=Reference('IPAddressV4|internet|144.126.159.199'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|144.126.159.199', address=IPv4Address('144.126.159.199'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Kibana||', name='Kibana', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|144.126.159.199|Software|Kibana||', ooi=Reference('IPAddressV4|internet|144.126.159.199'), software=Reference('Software|Kibana||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-HIGH', id='KAT-LEAKIX-HIGH', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Kibana|||KAT-LEAKIX-HIGH', finding_type=Reference('KATFindingType|KAT-LEAKIX-HIGH'), ooi=Reference('Software|Kibana||'), proof=None, description='Software = "Kibana".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|24940', number='24940', name='Hetzner Online GmbH'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.63.132.10', address=IPv4Address('178.63.132.10'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.63.132.10|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|24940'), parent=None, start_ip=Reference('IPAddressV4|internet|178.63.132.10'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.63.132.10|tcp|443', address=Reference('IPAddressV4|internet|178.63.132.10'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Hostname(object_type='Hostname', scan_profile=None, user_id=None, primary_key='Hostname|internet|praktikant.dimata.it', network=Reference('Network|internet'), name='praktikant.dimata.it', dns_zone=None, registered_domain=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx||', name='nginx', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|Hostname|internet|praktikant.dimata.it|Software|nginx||', ooi=Reference('Hostname|internet|praktikant.dimata.it'), software=Reference('Software|nginx||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx||'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.131.213.169', address=IPv4Address('104.131.213.169'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|104.131.213.169|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|104.131.213.169'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|104.131.213.169|tcp|80', address=Reference('IPAddressV4|internet|104.131.213.169'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.14.2|', name='nginx', version='1.14.2', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPPort|internet|104.131.213.169|tcp|80|Software|nginx|1.14.2|', ooi=Reference('IPPort|internet|104.131.213.169|tcp|80'), software=Reference('Software|nginx|1.14.2|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.14.2||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.14.2|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|27843', number='27843', name='WIN EMPRESAS S.A.C.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|45.236.45.11', address=IPv4Address('45.236.45.11'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|45.236.45.11|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|27843'), parent=None, start_ip=Reference('IPAddressV4|internet|45.236.45.11'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|45.236.45.11|tcp|443', address=Reference('IPAddressV4|internet|45.236.45.11'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|45.236.45.11', address=IPv4Address('45.236.45.11'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.18.0|', name='nginx', version='1.18.0', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|45.236.45.11|Software|nginx|1.18.0|', ooi=Reference('IPAddressV4|internet|45.236.45.11'), software=Reference('Software|nginx|1.18.0|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.18.0||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.18.0|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|43391', number='43391', name='Netdirekt A.S.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.187.201.46', address=IPv4Address('93.187.201.46'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|93.187.201.46|21', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|43391'), parent=None, start_ip=Reference('IPAddressV4|internet|93.187.201.46'), mask=21), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|93.187.201.46|tcp|80', address=Reference('IPAddressV4|internet|93.187.201.46'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.187.201.46', address=IPv4Address('93.187.201.46'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx||', name='nginx', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|93.187.201.46|Software|nginx||', ooi=Reference('IPAddressV4|internet|93.187.201.46'), software=Reference('Software|nginx||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx||'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|63949', number='63949', name='Akamai Connected Cloud'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.79.147.40', address=IPv4Address('178.79.147.40'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|178.79.147.40|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|63949'), parent=None, start_ip=Reference('IPAddressV4|internet|178.79.147.40'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|178.79.147.40|tcp|443', address=Reference('IPAddressV4|internet|178.79.147.40'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|178.79.147.40', address=IPv4Address('178.79.147.40'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Elasticsearch|7.17.9|', name='Elasticsearch', version='7.17.9', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|178.79.147.40|Software|Elasticsearch|7.17.9|', ooi=Reference('IPAddressV4|internet|178.79.147.40'), software=Reference('Software|Elasticsearch|7.17.9|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Elasticsearch|7.17.9||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Elasticsearch|7.17.9|'), proof=None, description='Software = "Elasticsearch".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|45102', number='45102', name='Alibaba US Technology Co., Ltd.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|8.219.94.19', address=IPv4Address('8.219.94.19'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|8.219.94.19|15', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|45102'), parent=None, start_ip=Reference('IPAddressV4|internet|8.219.94.19'), mask=15), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|8.219.94.19|tcp|443', address=Reference('IPAddressV4|internet|8.219.94.19'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Hostname(object_type='Hostname', scan_profile=None, user_id=None, primary_key='Hostname|internet|chat.getdeepin.org', network=Reference('Network|internet'), name='chat.getdeepin.org', dns_zone=None, registered_domain=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.23.3|', name='nginx', version='1.23.3', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|Hostname|internet|chat.getdeepin.org|Software|nginx|1.23.3|', ooi=Reference('Hostname|internet|chat.getdeepin.org'), software=Reference('Software|nginx|1.23.3|')), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|25400', number='25400', name='Telia Norge AS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|93.124.249.166', address=IPv4Address('93.124.249.166'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|93.124.249.166|17', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|25400'), parent=None, start_ip=Reference('IPAddressV4|internet|93.124.249.166'), mask=17), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|93.124.249.166|tcp|443', address=Reference('IPAddressV4|internet|93.124.249.166'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache|2.4.6|', name='Apache', version='2.4.6', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPPort|internet|93.124.249.166|tcp|443|Software|Apache|2.4.6|', ooi=Reference('IPPort|internet|93.124.249.166|tcp|443'), software=Reference('Software|Apache|2.4.6|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-LOW', id='KAT-LEAKIX-LOW', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|2.4.6||KAT-LEAKIX-LOW', finding_type=Reference('KATFindingType|KAT-LEAKIX-LOW'), ooi=Reference('Software|Apache|2.4.6|'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|16276', number='16276', name='OVH SAS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|213.251.158.214', address=IPv4Address('213.251.158.214'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|213.251.158.214|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|16276'), parent=None, start_ip=Reference('IPAddressV4|internet|213.251.158.214'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|213.251.158.214|tcp|80', address=Reference('IPAddressV4|internet|213.251.158.214'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|213.251.158.214', address=IPv4Address('213.251.158.214'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|213.251.158.214|Software|Apache||', ooi=Reference('IPAddressV4|internet|213.251.158.214'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|136052', number='136052', name='PT Cloud Hosting Indonesia'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|103.31.39.64', address=IPv4Address('103.31.39.64'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|103.31.39.64|23', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|136052'), parent=None, start_ip=Reference('IPAddressV4|internet|103.31.39.64'), mask=23), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|103.31.39.64|tcp|443', address=Reference('IPAddressV4|internet|103.31.39.64'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|103.31.39.64', address=IPv4Address('103.31.39.64'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.25.3|', name='nginx', version='1.25.3', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|103.31.39.64|Software|nginx|1.25.3|', ooi=Reference('IPAddressV4|internet|103.31.39.64'), software=Reference('Software|nginx|1.25.3|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.25.3||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.25.3|'), proof=None, description='Software = "nginx".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|63199', number='63199', name='CDSC-AS1'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|148.153.126.87', address=IPv4Address('148.153.126.87'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|148.153.126.87|20', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|63199'), parent=None, start_ip=Reference('IPAddressV4|internet|148.153.126.87'), mask=20), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|148.153.126.87|tcp|443', address=Reference('IPAddressV4|internet|148.153.126.87'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|148.153.126.87', address=IPv4Address('148.153.126.87'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|VIP|vipshop|', name='VIP', version='vipshop', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|148.153.126.87|Software|VIP|vipshop|', ooi=Reference('IPAddressV4|internet|148.153.126.87'), software=Reference('Software|VIP|vipshop|')), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|7922', number='7922', name='COMCAST-7922'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.171.169.158', address=IPv4Address('104.171.169.158'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|104.171.169.158|21', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|7922'), parent=None, start_ip=Reference('IPAddressV4|internet|104.171.169.158'), mask=21), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|104.171.169.158|tcp|6556', address=Reference('IPAddressV4|internet|104.171.169.158'), protocol=<Protocol.TCP: 'tcp'>, port=6556, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|104.171.169.158', address=IPv4Address('104.171.169.158'), network=Reference('Network|internet'), netblock=None), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-HIGH', id='KAT-LEAKIX-HIGH', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|IPAddressV4|internet|104.171.169.158|KAT-LEAKIX-HIGH', finding_type=Reference('KATFindingType|KAT-LEAKIX-HIGH'), ooi=Reference('IPAddressV4|internet|104.171.169.158'), proof=None, description='Plugin = "IPAddressV4|internet|104.171.169.158".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|60130', number='60130', name='Nexthop AS'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|185.56.187.42', address=IPv4Address('185.56.187.42'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|185.56.187.42|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|60130'), parent=None, start_ip=Reference('IPAddressV4|internet|185.56.187.42'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|185.56.187.42|tcp|443', address=Reference('IPAddressV4|internet|185.56.187.42'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|185.56.187.42', address=IPv4Address('185.56.187.42'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|185.56.187.42|Software|Apache||', ooi=Reference('IPAddressV4|internet|185.56.187.42'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|4766', number='4766', name='Korea Telecom'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|183.111.5.204', address=IPv4Address('183.111.5.204'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|183.111.5.204|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|4766'), parent=None, start_ip=Reference('IPAddressV4|internet|183.111.5.204'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|183.111.5.204|tcp|80', address=Reference('IPAddressV4|internet|183.111.5.204'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|183.111.5.204', address=IPv4Address('183.111.5.204'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|183.111.5.204|Software|Apache||', ooi=Reference('IPAddressV4|internet|183.111.5.204'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|8849', number='8849', name='Melbikomas UAB'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|162.247.152.131', address=IPv4Address('162.247.152.131'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|162.247.152.131|22', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|8849'), parent=None, start_ip=Reference('IPAddressV4|internet|162.247.152.131'), mask=22), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|162.247.152.131|tcp|443', address=Reference('IPAddressV4|internet|162.247.152.131'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|162.247.152.131', address=IPv4Address('162.247.152.131'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|162.247.152.131|Software|Apache||', ooi=Reference('IPAddressV4|internet|162.247.152.131'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|1136', number='1136', name='KPN B.V.'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|77.60.161.116', address=IPv4Address('77.60.161.116'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|77.60.161.116|16', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|1136'), parent=None, start_ip=Reference('IPAddressV4|internet|77.60.161.116'), mask=16), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|77.60.161.116|tcp|443', address=Reference('IPAddressV4|internet|77.60.161.116'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|77.60.161.116', address=IPv4Address('77.60.161.116'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|Apache||', name='Apache', version=None, cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|77.60.161.116|Software|Apache||', ooi=Reference('IPAddressV4|internet|77.60.161.116'), software=Reference('Software|Apache||')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|Apache|||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|Apache||'), proof=None, description='Software = "Apache".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|396982', number='396982', name='GOOGLE-CLOUD-PLATFORM'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|35.197.147.118', address=IPv4Address('35.197.147.118'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|35.197.147.118|15', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|396982'), parent=None, start_ip=Reference('IPAddressV4|internet|35.197.147.118'), mask=15), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|35.197.147.118|tcp|80', address=Reference('IPAddressV4|internet|35.197.147.118'), protocol=<Protocol.TCP: 'tcp'>, port=80, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|35.197.147.118', address=IPv4Address('35.197.147.118'), network=Reference('Network|internet'), netblock=None), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|IPAddressV4|internet|35.197.147.118|KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('IPAddressV4|internet|35.197.147.118'), proof=None, description='Plugin = "IPAddressV4|internet|35.197.147.118".', reproduce=None), AutonomousSystem(object_type='AutonomousSystem', scan_profile=None, user_id=None, primary_key='AutonomousSystem|14061', number='14061', name='DIGITALOCEAN-ASN'), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|143.244.145.201', address=IPv4Address('143.244.145.201'), network=Reference('Network|internet'), netblock=None), IPV4NetBlock(object_type='IPV4NetBlock', scan_profile=None, user_id=None, primary_key='IPV4NetBlock|internet|internet|143.244.145.201|18', network=Reference('Network|internet'), name=None, description=None, announced_by=Reference('AutonomousSystem|14061'), parent=None, start_ip=Reference('IPAddressV4|internet|143.244.145.201'), mask=18), IPPort(object_type='IPPort', scan_profile=None, user_id=None, primary_key='IPPort|internet|143.244.145.201|tcp|443', address=Reference('IPAddressV4|internet|143.244.145.201'), protocol=<Protocol.TCP: 'tcp'>, port=443, state=<PortState.OPEN: 'open'>), IPAddressV4(object_type='IPAddressV4', scan_profile=None, user_id=None, primary_key='IPAddressV4|internet|143.244.145.201', address=IPv4Address('143.244.145.201'), network=Reference('Network|internet'), netblock=None), Software(object_type='Software', scan_profile=None, user_id=None, primary_key='Software|nginx|1.14.0|', name='nginx', version='1.14.0', cpe=None), SoftwareInstance(object_type='SoftwareInstance', scan_profile=None, user_id=None, primary_key='SoftwareInstance|IPAddressV4|internet|143.244.145.201|Software|nginx|1.14.0|', ooi=Reference('IPAddressV4|internet|143.244.145.201'), software=Reference('Software|nginx|1.14.0|')), KATFindingType(object_type='KATFindingType', scan_profile=None, user_id=None, primary_key='KATFindingType|KAT-LEAKIX-MEDIUM', id='KAT-LEAKIX-MEDIUM', description=None, source=None, impact=None, recommendation=None, risk_score=0.0, risk_severity=<RiskLevelSeverity.PENDING: 'pending'>), Finding(object_type='Finding', scan_profile=None, user_id=None, primary_key='Finding|Software|nginx|1.14.0||KAT-LEAKIX-MEDIUM', finding_type=Reference('KATFindingType|KAT-LEAKIX-MEDIUM'), ooi=Reference('Software|nginx|1.14.0|'), proof=None, description='Software = "nginx".', reproduce=None)]
diff --git a/boefjes/tests/examples/raw/wappalizer.json b/boefjes/tests/examples/raw/wappalizer.json
deleted file mode 100644
index 817c338d212..00000000000
--- a/boefjes/tests/examples/raw/wappalizer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "urls": {
-    "https://redirected.url/": {
-      "status": 200
-    }
-  },
-  "technologies": [
-    {
-      "slug": "hugo",
-      "name": "Hugo",
-      "confidence": 100,
-      "version": "0.104.0",
-      "icon": "Hugo.png",
-      "website": "http://gohugo.io",
-      "cpe": null,
-      "categories": [
-        {
-          "id": 57,
-          "slug": "static-site-generator",
-          "name": "Static site generator"
-        }
-      ]
-    },
-    {
-      "slug": "ubuntu",
-      "name": "Ubuntu",
-      "confidence": 100,
-      "version": null,
-      "icon": "Ubuntu.png",
-      "website": "http://www.ubuntu.com/server",
-      "cpe": null,
-      "categories": [
-        {
-          "id": 28,
-          "slug": "operating-systems",
-          "name": "Operating systems"
-        }
-      ]
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/raw/wappalizer_redirected.json b/boefjes/tests/examples/raw/wappalizer_redirected.json
deleted file mode 100644
index 7b5094d83c3..00000000000
--- a/boefjes/tests/examples/raw/wappalizer_redirected.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "urls": {
-    "https://web.site/": {
-      "status": 301
-    },
-    "https://mid.url/": {
-      "status": 301
-    },
-    "https://redirected.url/": {
-      "status": 200
-    }
-  },
-  "technologies": [
-    {
-      "slug": "hugo",
-      "name": "Hugo",
-      "confidence": 100,
-      "version": "0.104.0",
-      "icon": "Hugo.png",
-      "website": "http://gohugo.io",
-      "cpe": null,
-      "categories": [
-        {
-          "id": 57,
-          "slug": "static-site-generator",
-          "name": "Static site generator"
-        }
-      ]
-    },
-    {
-      "slug": "ubuntu",
-      "name": "Ubuntu",
-      "confidence": 100,
-      "version": null,
-      "icon": "Ubuntu.png",
-      "website": "http://www.ubuntu.com/server",
-      "cpe": null,
-      "categories": [
-        {
-          "id": 28,
-          "slug": "operating-systems",
-          "name": "Operating systems"
-        }
-      ]
-    }
-  ]
-}
diff --git a/boefjes/tests/examples/scheduler/pop_response_boefje_2.json b/boefjes/tests/examples/scheduler/pop_response_boefje_2.json
new file mode 100644
index 00000000000..762be767cc9
--- /dev/null
+++ b/boefjes/tests/examples/scheduler/pop_response_boefje_2.json
@@ -0,0 +1,25 @@
+{
+  "id": "70da7d4f-f41f-4940-901b-d98a92e9014c",
+  "priority": 1,
+  "scheduler_id": "boefje-_dev",
+  "schedule_id": null,
+  "status": "dispatched",
+  "type": "boefje",
+  "hash": "70da7d4f-f41f-4940-901b-d98a92e9014c",
+  "data": {
+    "id": "70da7d4f-f41f-4940-901b-d98a92e9014c",
+    "boefje": {
+      "id": "dns-records",
+      "version": null
+    },
+    "input_ooi": "Hostname|internet|test.test",
+    "organization": "_dev",
+    "arguments": {},
+    "started_at": null,
+    "runnable_hash": null,
+    "environment": null,
+    "ended_at": null
+  },
+  "created_at": "2021-06-29T14:00:00",
+  "modified_at": "2021-06-29T14:00:00"
+}
diff --git a/boefjes/tests/examples/ssl-scan-normalize.json b/boefjes/tests/examples/ssl-scan-normalize.json
deleted file mode 100644
index ee2ce117c89..00000000000
--- a/boefjes/tests/examples/ssl-scan-normalize.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": "bd455215-93f0-4546-b291-6ad8336f7263",
-  "organization": "_dev",
-  "arguments": {},
-  "started_at": "2021-07-27T11:26:42.679000+00:00",
-  "ended_at": "2021-07-27T11:26:44.679000+00:00",
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/ssl-scan.json b/boefjes/tests/examples/ssl-scan.json
deleted file mode 100644
index 2d7fb98f2b3..00000000000
--- a/boefjes/tests/examples/ssl-scan.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "a52ff058-7be3-4d81-8675-b6357c9894eb",
-  "organization": "_dev",
-  "arguments": {
-    "domain": "example.nl"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_ssl_scan.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/website_similarity.json b/boefjes/tests/examples/website_similarity.json
deleted file mode 100644
index 42ba9f6bc48..00000000000
--- a/boefjes/tests/examples/website_similarity.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "645fd349-6d62-43dd-8cfe-d3ab03c9e4b7",
-  "organization": "_dev",
-  "arguments": {
-    "domain": "Hostname|internet|rijksoverheid.nl"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat-website-similarity.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/website_similarity_normalize.json b/boefjes/tests/examples/website_similarity_normalize.json
deleted file mode 100644
index 548029df968..00000000000
--- a/boefjes/tests/examples/website_similarity_normalize.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": "2460c0b6-83f5-49da-bcc7-5727e81f7028",
-  "organization": "_dev",
-  "arguments": {
-    "domain": "Hostname|internet|rijksoverheid.nl"
-  },
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/whois-job.json b/boefjes/tests/examples/whois-job.json
deleted file mode 100644
index 37968d4921d..00000000000
--- a/boefjes/tests/examples/whois-job.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "ce3564e5-b2f8-48fb-ac59-7fd172f71b9e",
-  "organization": "_dev",
-  "arguments": {
-    "domain": "tweakers.net"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_whois.whois_normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/whois-normalize.json b/boefjes/tests/examples/whois-normalize.json
deleted file mode 100644
index ce22d6983d6..00000000000
--- a/boefjes/tests/examples/whois-normalize.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "id": "1244e5f5-f8ea-4471-a0ce-24657f6907af",
-  "organization": "_dev",
-  "arguments": {},
-  "started_at": "2021-07-27T11:26:42.679000+00:00",
-  "ended_at": "2021-07-27T11:26:44.679000+00:00",
-  "dispatches": {
-    "normalizers": [],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/wpscan-job.json b/boefjes/tests/examples/wpscan-job.json
deleted file mode 100644
index 0d1f64a3b6c..00000000000
--- a/boefjes/tests/examples/wpscan-job.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "id": "1f1edf73-9fcf-4190-b810-1ecbd5926b8f",
-  "organization": "_dev",
-  "arguments": {
-    "url": "https://zorg4ons.nl"
-  },
-  "dispatches": {
-    "normalizers": [
-      "kat_wpscan.normalize"
-    ],
-    "boefjes": []
-  }
-}
diff --git a/boefjes/tests/examples/wpscan-normalize.json b/boefjes/tests/examples/wpscan-normalize.json
deleted file mode 100644
index 592a525e622..00000000000
--- a/boefjes/tests/examples/wpscan-normalize.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "id": "3a8c8b09-4c8d-415e-a58a-28b317c45ba8",
-  "organization": "_dev",
-  "arguments": {
-    "url": "https://zorg4ons.nl"
-  }
-}
diff --git a/boefjes/tests/integration/test_api.py b/boefjes/tests/integration/test_api.py
index d8bf1f8ae13..f889edfe259 100644
--- a/boefjes/tests/integration/test_api.py
+++ b/boefjes/tests/integration/test_api.py
@@ -1,251 +1,303 @@
 import os
-from unittest import TestCase, skipIf
 
-import alembic.config
-from sqlalchemy.orm import sessionmaker
-from starlette.testclient import TestClient
+import pytest
 
-from boefjes.config import settings
-from boefjes.dependencies.encryption import IdentityMiddleware
-from boefjes.katalogus.root import app
 from boefjes.models import Boefje, Normalizer, Organisation
-from boefjes.sql.config_storage import SQLConfigStorage
-from boefjes.sql.db import SQL_BASE, get_engine
-from boefjes.sql.organisation_storage import SQLOrganisationStorage
 
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
 
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestAPI(TestCase):
-    def setUp(self) -> None:
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
 
-        session = sessionmaker(bind=get_engine())()
-        self.organisation_storage = SQLOrganisationStorage(session, settings)
-        self.settings_storage = SQLConfigStorage(session, IdentityMiddleware())
+def test_get_local_plugin(test_client, organisation):
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/dns-records")
+    assert response.status_code == 200
+    data = response.json()
 
-        self.org = Organisation(id="test", name="Test Organisation")
-        self.client = TestClient(app)
-        response = self.client.post("/v1/organisations/", content=self.org.json())
-        self.assertEqual(response.status_code, 201)
+    assert data["id"] == "dns-records"
 
-    def tearDown(self) -> None:
-        session = sessionmaker(bind=get_engine())()
 
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"TRUNCATE {table} CASCADE")  # noqa: S608
+def test_filter_plugins(test_client, organisation):
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/")
+    assert len(response.json()) == 99
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins?plugin_type=boefje")
+    assert len(response.json()) == 44
 
-        session.commit()
-        session.close()
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins?limit=10")
+    assert len(response.json()) == 10
 
-    def test_get_local_plugin(self):
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/dns-records")
+    response = test_client.get(
+        f"/v1/organisations/{organisation.id}/plugins", params={"oci_image": "ghcr.io/minvws/openkat/nmap:latest"}
+    )
+    assert {x["id"] for x in response.json()} == {"nmap", "nmap-udp"}  # Nmap TCP and UDP
 
-        self.assertEqual(response.status_code, 200)
-        data = response.json()
+    boefje = Boefje(
+        id="test_plugin", name="My test boefje", static=False, oci_image="ghcr.io/minvws/openkat/nmap:latest"
+    )
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 201
 
-        self.assertEqual("dns-records", data["id"])
+    response = test_client.get(
+        f"/v1/organisations/{organisation.id}/plugins", params={"oci_image": "ghcr.io/minvws/openkat/nmap:latest"}
+    )
+    assert {x["id"] for x in response.json()} == {"nmap", "nmap-udp", "test_plugin"}  # Nmap TCP and UDP
 
-    def test_filter_plugins(self):
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/")
-        self.assertEqual(len(response.json()), 99)
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins?plugin_type=boefje")
-        self.assertEqual(len(response.json()), 44)
 
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins?limit=10")
-        self.assertEqual(len(response.json()), 10)
+def test_cannot_add_plugin_reserved_id(test_client, organisation):
+    boefje = Boefje(id="dns-records", name="My test boefje", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 400
+    assert response.json() == {"detail": "Duplicate plugin id"}
 
-    def test_cannot_add_plugin_reserved_id(self):
-        boefje = Boefje(id="dns-records", name="My test boefje", static=False)
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=boefje.json())
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.json(), {"message": "Plugin id 'dns-records' is already used"})
+    normalizer = Normalizer(id="kat_nmap_normalize", name="My test normalizer")
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    assert response.status_code == 400
+    assert response.json() == {"detail": "Duplicate plugin id"}
 
-        normalizer = Normalizer(id="kat_nmap_normalize", name="My test normalizer")
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=normalizer.json())
-        self.assertEqual(response.status_code, 400)
-        self.assertEqual(response.json(), {"message": "Plugin id 'kat_nmap_normalize' is already used"})
-
-    def test_add_boefje(self):
-        boefje = Boefje(id="test_plugin", name="My test boefje", static=False)
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=boefje.json())
-        self.assertEqual(response.status_code, 201)
 
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", json={"a": "b"})
-        self.assertEqual(response.status_code, 422)
-
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/?plugin_type=boefje")
-        self.assertEqual(len(response.json()), 45)
+def test_add_boefje(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 201
 
-        boefje_dict = boefje.dict()
-        boefje_dict["consumes"] = list(boefje_dict["consumes"])
-        boefje_dict["produces"] = list(boefje_dict["produces"])
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", json={"a": "b"})
+    assert response.status_code == 422
 
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/test_plugin")
-        self.assertEqual(response.json(), boefje_dict)
-
-    def test_delete_boefje(self):
-        boefje = Boefje(id="test_plugin", name="My test boefje", static=False)
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=boefje.json())
-        self.assertEqual(response.status_code, 201)
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/?plugin_type=boefje")
+    assert len(response.json()) == 45
 
-        response = self.client.delete(f"/v1/organisations/{self.org.id}/boefjes/test_plugin")
-        self.assertEqual(response.status_code, 204)
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/test_plugin")
-        self.assertEqual(response.status_code, 404)
+    boefje_dict = boefje.model_dump()
+    boefje_dict["consumes"] = list(boefje_dict["consumes"])
+    boefje_dict["produces"] = list(boefje_dict["produces"])
 
-    def test_add_normalizer(self):
-        normalizer = Normalizer(id="test_normalizer", name="My test normalizer", static=False)
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=normalizer.json())
-        self.assertEqual(response.status_code, 201)
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/test_plugin")
+    assert response.json() == boefje_dict
 
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/?plugin_type=normalizer")
-        self.assertEqual(len(response.json()), 56)
 
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/test_normalizer")
-        self.assertEqual(response.json(), normalizer.dict())
+def test_cannot_add_static_plugin_with_duplicate_name(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="DNS records", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 400
 
-    def test_delete_normalizer(self):
-        normalizer = Normalizer(id="test_normalizer", name="My test normalizer", static=False)
-        response = self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=normalizer.json())
-        self.assertEqual(response.status_code, 201)
+    boefje = Boefje(id="test_plugin", name="DNS records", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 400
+    assert response.json() == {"detail": "Duplicate plugin name"}
 
-        response = self.client.delete(f"/v1/organisations/{self.org.id}/normalizers/test_normalizer")
-        self.assertEqual(response.status_code, 204)
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/test_normalizer")
-        self.assertEqual(response.status_code, 404)
-
-    def test_update_plugins(self):
-        normalizer = Normalizer(id="norm_id", name="My test normalizer")
-        boefje = Boefje(id="test_plugin", name="My test boefje", description="123")
-
-        self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=boefje.json())
-        self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/{boefje.id}", json={"description": "4"})
-        self.client.patch(f"/v1/organisations/{self.org.id}/plugins/{boefje.id}", json={"enabled": True})
-
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/{boefje.id}")
-        self.assertEqual(response.json()["description"], "4")
-        self.assertTrue(response.json()["enabled"])
-
-        self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=normalizer.json())
-        self.client.patch(f"/v1/organisations/{self.org.id}/normalizers/{normalizer.id}", json={"version": "v1.2"})
-
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/{normalizer.id}")
-        self.assertEqual(response.json()["version"], "v1.2")
-
-    def test_cannot_create_boefje_with_invalid_schema(self):
-        boefje = Boefje(id="test_plugin", name="My test boefje", description="123").model_dump(mode="json")
-        boefje["schema"] = {"$schema": 3}
-
-        r = self.client.post(f"/v1/organisations/{self.org.id}/plugins", json=boefje)
-        self.assertEqual(r.status_code, 400)
-
-    def test_update_boefje_schema(self):
-        boefje = Boefje(id="test_plugin", name="My test boefje", description="123")
-        self.client.post(f"/v1/organisations/{self.org.id}/plugins", content=boefje.json())
-
-        r = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/{boefje.id}", json={"schema": {"$schema": 3}})
-        self.assertEqual(r.status_code, 400)
-
-        valid_schema = {
-            "title": "Arguments",
-            "type": "object",
-            "properties": {
-                "MY_KEY": {
-                    "title": "MY_KEY",
-                    "type": "integer",
-                }
-            },
-            "required": [],
-        }
-        r = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/{boefje.id}", json={"schema": valid_schema})
-        self.assertEqual(r.status_code, 204)
-
-        schema = self.client.get(f"/v1/organisations/{self.org.id}/plugins/{boefje.id}/schema.json").json()
-        assert schema == valid_schema
-
-        api_boefje = self.client.get(f"/v1/organisations/{self.org.id}/plugins/{boefje.id}").json()
-        assert api_boefje["schema"] == valid_schema
-
-        r = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/dns-records", json={"schema": valid_schema})
-        self.assertEqual(r.status_code, 404)
-
-    def test_cannot_update_static_plugins(self):
-        r = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/dns-records", json={"id": "4", "version": "s"})
-        self.assertEqual(r.status_code, 404)
-        r = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/dns-records", json={"name": "Overwrite name"})
-        self.assertEqual(r.status_code, 404)
-
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/dns-records")
-        self.assertEqual(response.json()["name"], "DNS records")
-        self.assertIsNone(response.json()["version"])
-        self.assertEqual(response.json()["id"], "dns-records")
-
-        self.client.patch(f"/v1/organisations/{self.org.id}/plugins/dns-records", json={"enabled": True})
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/dns-records")
-        self.assertTrue(response.json()["enabled"])
-
-        response = self.client.patch(f"/v1/organisations/{self.org.id}/boefjes/dns-records", json={"version": "v1.2"})
-        self.assertEqual(response.status_code, 400)
-
-        response = self.client.get(f"/v1/organisations/{self.org.id}/plugins/dns-records")
-        self.assertNotEqual(response.json()["version"], "v1.2")
-
-    def test_basic_settings_api(self):
-        plug = "dns-records"
-
-        self.client.put(f"/v1/organisations/{self.org.id}/{plug}/settings", json={"new": "settings", "with integer": 5})
-        response = self.client.get(f"/v1/organisations/{self.org.id}/{plug}/settings")
-        assert response.json() == {"new": "settings", "with integer": 5}
-
-        self.client.put(f"/v1/organisations/{self.org.id}/{plug}/settings", json={"with integer": 8})
-        response = self.client.get(f"/v1/organisations/{self.org.id}/{plug}/settings")
-        assert response.json() == {"with integer": 8}
-
-        self.client.delete(f"/v1/organisations/{self.org.id}/{plug}/settings")
-        response = self.client.get(f"/v1/organisations/{self.org.id}/{plug}/settings")
-        assert response.json() == {}
-
-    def test_clone_settings(self):
-        plug = "dns-records"
-
-        # Set a setting on the first organisation and enable dns-records
-        self.client.put(
-            f"/v1/organisations/{self.org.id}/{plug}/settings",
-            json={"test_key": "test value", "test_key_2": "test value 2"},
-        )
-        self.client.patch(f"/v1/organisations/{self.org.id}/plugins/{plug}", json={"enabled": True})
-
-        assert self.client.get(f"/v1/organisations/{self.org.id}/{plug}/settings").json() == {
-            "test_key": "test value",
-            "test_key_2": "test value 2",
-        }
-        assert self.client.get(f"/v1/organisations/{self.org.id}/plugins/{plug}").json()["enabled"] is True
-
-        # Add the second organisation
-        new_org_id = "org2"
-        org2 = Organisation(id=new_org_id, name="Second test Organisation")
-        self.client.post("/v1/organisations/", content=org2.json())
-        self.client.put(f"/v1/organisations/{new_org_id}/{plug}/settings", json={"test_key": "second value"})
-
-        # Show that the second organisation has no settings and dns-records is not enabled
-        assert self.client.get(f"/v1/organisations/{new_org_id}/{plug}/settings").json() == {"test_key": "second value"}
-        assert self.client.get(f"/v1/organisations/{new_org_id}/plugins/{plug}").json()["enabled"] is False
-
-        # Enable two boefjes that should get disabled by the cloning
-        self.client.patch(f"/v1/organisations/{new_org_id}/plugins/nmap", json={"enabled": True})
-        assert self.client.get(f"/v1/organisations/{new_org_id}/plugins/nmap").json()["enabled"] is True
-
-        # Call the clone endpoint
-        self.client.post(f"/v1/organisations/{self.org.id}/settings/clone/{new_org_id}")
-
-        # Verify that all settings are copied
-        response = self.client.get(f"/v1/organisations/{new_org_id}/{plug}/settings")
-        assert response.json() == {"test_key": "test value", "test_key_2": "test value 2"}
-
-        # And that the enabled boefje from the original organisation got enabled
-        response = self.client.get(f"/v1/organisations/{new_org_id}/plugins/{plug}")
-        assert response.json()["enabled"] is True
-
-        # And the originally enabled boefje got disabled
-        response = self.client.get(f"/v1/organisations/{new_org_id}/plugins/nmap")
-        assert response.json()["enabled"] is False
+
+def test_cannot_add_plugin_with_duplicate_name(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 201
+
+    boefje = Boefje(id="test_plugin_2", name="My test boefje", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 400
+    assert response.json() == {"detail": "Duplicate plugin name"}
+
+    normalizer = Normalizer(id="test_normalizer", name="My test normalizer", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    assert response.status_code == 201
+
+    normalizer = Normalizer(id="test_normalizer_2", name="My test normalizer", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    assert response.status_code == 400
+
+
+def test_delete_boefje(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    assert response.status_code == 201
+
+    response = test_client.delete(f"/v1/organisations/{organisation.id}/boefjes/test_plugin")
+    assert response.status_code == 204
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/test_plugin")
+    assert response.status_code == 404
+
+
+def test_add_normalizer(test_client, organisation):
+    normalizer = Normalizer(id="test_normalizer", name="My test normalizer", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    assert response.status_code == 201
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/?plugin_type=normalizer")
+    assert len(response.json()) == 56
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/test_normalizer")
+    assert response.json() == normalizer.model_dump()
+
+
+def test_delete_normalizer(test_client, organisation):
+    normalizer = Normalizer(id="test_normalizer", name="My test normalizer", static=False)
+    response = test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    assert response.status_code == 201
+
+    response = test_client.delete(f"/v1/organisations/{organisation.id}/normalizers/test_normalizer")
+    assert response.status_code == 204
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/test_normalizer")
+    assert response.status_code == 404
+
+
+def test_update_plugins(test_client, organisation):
+    normalizer = Normalizer(id="norm_id", name="My test normalizer")
+    boefje = Boefje(id="test_plugin", name="My test boefje", description="123", interval=20)
+
+    test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+    test_client.patch(f"/v1/organisations/{organisation.id}/plugins/{boefje.id}", json={"enabled": True})
+    test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"scan_level": 3})
+    test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"description": "4"})
+    test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"cron": "5 0 * 8 *"})
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/{boefje.id}")
+    assert response.json()["description"] == "4"
+    assert response.json()["scan_level"] == 3
+    assert response.json()["enabled"] is True
+    assert response.json()["scan_level"] == 3
+    assert response.json()["interval"] == 20
+    assert response.json()["cron"] == "5 0 * 8 *"
+
+    test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=normalizer.model_dump_json())
+    test_client.patch(f"/v1/organisations/{organisation.id}/normalizers/{normalizer.id}", json={"version": "v1.2"})
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/{normalizer.id}")
+    assert response.json()["version"] == "v1.2"
+
+
+def test_cannot_create_boefje_with_invalid_schema(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", description="123").model_dump(mode="json")
+    boefje["boefje_schema"] = {"$schema": 3}
+
+    r = test_client.post(f"/v1/organisations/{organisation.id}/plugins", json=boefje)
+    assert r.status_code == 422
+
+
+def test_cannot_set_invalid_cron(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", description="123").model_dump(mode="json")
+    boefje["cron"] = "bad format"
+
+    res = test_client.post(f"/v1/organisations/{organisation.id}/plugins", json=boefje)
+    assert res.status_code == 422
+
+    boefje = Boefje(id="test_plugin", name="My test boefje")
+    test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.json())
+    res = test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"cron": "bad format"})
+    assert res.status_code == 422
+
+
+def test_update_boefje_schema(test_client, organisation):
+    boefje = Boefje(id="test_plugin", name="My test boefje", description="123")
+    test_client.post(f"/v1/organisations/{organisation.id}/plugins", content=boefje.model_dump_json())
+
+    r = test_client.patch(
+        f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"boefje_schema": {"$schema": 3}}
+    )
+    assert r.status_code == 422
+
+    valid_schema = {
+        "title": "Arguments",
+        "type": "object",
+        "properties": {
+            "MY_KEY": {
+                "title": "MY_KEY",
+                "type": "integer",
+            }
+        },
+        "required": [],
+    }
+    r = test_client.patch(
+        f"/v1/organisations/{organisation.id}/boefjes/{boefje.id}", json={"boefje_schema": valid_schema}
+    )
+    assert r.status_code == 204
+
+    schema = test_client.get(f"/v1/organisations/{organisation.id}/plugins/{boefje.id}/schema.json").json()
+    assert schema == valid_schema
+
+    api_boefje = test_client.get(f"/v1/organisations/{organisation.id}/plugins/{boefje.id}").json()
+    assert api_boefje["boefje_schema"] == valid_schema
+
+    r = test_client.patch(
+        f"/v1/organisations/{organisation.id}/boefjes/dns-records", json={"boefje_schema": valid_schema}
+    )
+    assert r.status_code == 404
+
+
+def test_cannot_update_static_plugins(test_client, organisation):
+    r = test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/dns-records", json={"id": "4", "version": "s"})
+    assert r.status_code == 404
+    r = test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/dns-records", json={"name": "Overwrite name"})
+    assert r.status_code == 404
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/dns-records")
+    assert response.json()["name"] == "DNS records"
+    assert response.json()["version"] is None
+    assert response.json()["id"] == "dns-records"
+
+    test_client.patch(f"/v1/organisations/{organisation.id}/plugins/dns-records", json={"enabled": True})
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/dns-records")
+    assert response.json()["enabled"] is True
+
+    response = test_client.patch(f"/v1/organisations/{organisation.id}/boefjes/dns-records", json={"version": "v1.2"})
+    assert response.status_code == 403
+
+    response = test_client.get(f"/v1/organisations/{organisation.id}/plugins/dns-records")
+    assert response.json()["version"] != "v1.2"
+
+
+def test_basic_settings_api(test_client, organisation):
+    plug = "dns-records"
+
+    test_client.put(f"/v1/organisations/{organisation.id}/{plug}/settings", json={"new": "settings", "with integer": 5})
+    response = test_client.get(f"/v1/organisations/{organisation.id}/{plug}/settings")
+    assert response.json() == {"new": "settings", "with integer": 5}
+
+    test_client.put(f"/v1/organisations/{organisation.id}/{plug}/settings", json={"with integer": 8})
+    response = test_client.get(f"/v1/organisations/{organisation.id}/{plug}/settings")
+    assert response.json() == {"with integer": 8}
+
+    test_client.delete(f"/v1/organisations/{organisation.id}/{plug}/settings")
+    response = test_client.get(f"/v1/organisations/{organisation.id}/{plug}/settings")
+    assert response.json() == {}
+
+
+def test_clone_settings(test_client, organisation):
+    plug = "dns-records"
+
+    # Set a setting on the first organisation and enable dns-records
+    test_client.put(
+        f"/v1/organisations/{organisation.id}/{plug}/settings",
+        json={"test_key": "test value", "test_key_2": "test value 2"},
+    )
+    test_client.patch(f"/v1/organisations/{organisation.id}/plugins/{plug}", json={"enabled": True})
+
+    assert test_client.get(f"/v1/organisations/{organisation.id}/{plug}/settings").json() == {
+        "test_key": "test value",
+        "test_key_2": "test value 2",
+    }
+    assert test_client.get(f"/v1/organisations/{organisation.id}/plugins/{plug}").json()["enabled"] is True
+
+    # Add the second organisation
+    new_org_id = "org2"
+    org2 = Organisation(id=new_org_id, name="Second test Organisation")
+    test_client.post("/v1/organisations/", content=org2.model_dump_json())
+    test_client.put(f"/v1/organisations/{new_org_id}/{plug}/settings", json={"test_key": "second value"})
+
+    # Show that the second organisation has no settings and dns-records is not enabled
+    assert test_client.get(f"/v1/organisations/{new_org_id}/{plug}/settings").json() == {"test_key": "second value"}
+    assert test_client.get(f"/v1/organisations/{new_org_id}/plugins/{plug}").json()["enabled"] is False
+
+    # Enable two boefjes that should get disabled by the cloning
+    test_client.patch(f"/v1/organisations/{new_org_id}/plugins/nmap", json={"enabled": True})
+    assert test_client.get(f"/v1/organisations/{new_org_id}/plugins/nmap").json()["enabled"] is True
+
+    # Call the clone endpoint
+    test_client.post(f"/v1/organisations/{organisation.id}/settings/clone/{new_org_id}")
+
+    # Verify that all settings are copied
+    response = test_client.get(f"/v1/organisations/{new_org_id}/{plug}/settings")
+    assert response.json() == {"test_key": "test value", "test_key_2": "test value 2"}
+
+    # And that the enabled boefje from the original organisation got enabled
+    response = test_client.get(f"/v1/organisations/{new_org_id}/plugins/{plug}")
+    assert response.json()["enabled"] is True
+
+    # And the originally enabled boefje got disabled
+    response = test_client.get(f"/v1/organisations/{new_org_id}/plugins/nmap")
+    assert response.json()["enabled"] is False
diff --git a/boefjes/tests/integration/test_bench.py b/boefjes/tests/integration/test_bench.py
index a77d5732092..14123016904 100644
--- a/boefjes/tests/integration/test_bench.py
+++ b/boefjes/tests/integration/test_bench.py
@@ -19,7 +19,7 @@
 def test_migration(
     octopoes_api_connector: OctopoesAPIConnector,
     bytes_client: BytesAPIClient,
-    organisation_repository: SQLOrganisationStorage,
+    organisation_storage: SQLOrganisationStorage,
     valid_time,
 ):
     octopoes_api_connector.session._timeout.connect = 60
@@ -87,7 +87,7 @@ def test_migration(
             bytes_client.save_normalizer_meta(normalizer_meta)
 
     total_oois = octopoes_api_connector.list_objects(set(), valid_time).count
-    total_processed, total_failed = upgrade(organisation_repository, valid_time)
+    total_processed, total_failed = upgrade(organisation_storage, valid_time)
 
     assert total_processed == len(hostname_range)
     assert total_failed == 0
diff --git a/boefjes/tests/integration/test_get_environment.py b/boefjes/tests/integration/test_get_environment.py
new file mode 100644
index 00000000000..5aa209c0493
--- /dev/null
+++ b/boefjes/tests/integration/test_get_environment.py
@@ -0,0 +1,22 @@
+import pytest
+
+from boefjes.dependencies.plugins import PluginService
+from boefjes.job_handler import get_environment_settings
+from boefjes.models import Organisation
+from tests.loading import get_boefje_meta
+
+
+@pytest.mark.skipif("os.environ.get('CI') != '1'")
+def test_environment_builds_up_correctly(plugin_service: PluginService, organisation: Organisation):
+    plugin_id = "dns-records"
+    schema = plugin_service.schema(plugin_id)
+    environment = get_environment_settings(get_boefje_meta(boefje_id=plugin_id), schema)
+
+    assert environment == {}
+
+    with plugin_service:
+        plugin_service.upsert_settings({"RECORD_TYPES": "CNAME,AAAA", "WRONG": "3"}, organisation.id, plugin_id)
+
+    environment = get_environment_settings(get_boefje_meta(boefje_id=plugin_id), schema)
+
+    assert environment == {"RECORD_TYPES": "CNAME,AAAA"}
diff --git a/boefjes/tests/integration/test_json_settings_encryption_migration.py b/boefjes/tests/integration/test_json_settings_encryption_migration.py
index a3bb9a336bd..1792fccdb9d 100644
--- a/boefjes/tests/integration/test_json_settings_encryption_migration.py
+++ b/boefjes/tests/integration/test_json_settings_encryption_migration.py
@@ -1,9 +1,9 @@
 import os
-from unittest import TestCase, skipIf
 
 import alembic.config
+import pytest
 from sqlalchemy import text
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
 from boefjes.config import settings
 from boefjes.dependencies.encryption import NaclBoxMiddleware
@@ -12,71 +12,68 @@
 from boefjes.sql.db import SQL_BASE, get_engine
 from boefjes.sql.organisation_storage import SQLOrganisationStorage
 
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
 
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestJsonSecretsMigration(TestCase):
-    def setUp(self) -> None:
-        self.engine = get_engine()
-
-        # To reset autoincrement ids
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
-        # Set state to revision 197672984df0
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "197672984df0"])
-
-    def test_setting_to_settings_json(self):
-        session = sessionmaker(bind=self.engine)()
-
-        with SQLOrganisationStorage(session, settings) as storage:
-            storage.create(Organisation(id="dev1", name="Test 1 "))
-            storage.create(Organisation(id="dev2", name="Test 2 "))
-            storage.create(Organisation(id="dev3", name="Test 3 "))
-
-        encrypter = create_encrypter()
-        entries = self._collect_entries(encrypter)
-        query = f"INSERT INTO setting (key, value, organisation_pk, plugin_id) values {','.join(map(str, entries))}"  # noqa: S608
-        self.engine.execute(text(query))
-
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "cd34fdfafdaf"])
-
-        all_settings = list(self.engine.execute(text("select * from settings")).fetchall())
-        self.assertSetEqual(
-            {(encrypter.decode(x[1]), x[2], x[3]) for x in all_settings},
-            {
-                ('{"key2": "val2"}', "dns-records", 2),
-                ('{"key5": "val5", "key7": "val7"}', "nmap", 1),
-                ('{"key4": "val4", "key6": "val6"}', "nmap", 2),
-                ('{"key1": "val1", "key3": "val3"}', "dns-records", 1),
-            },
-        )
-
-        session.close()
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
-
-        results = [x[1:] for x in self.engine.execute(text("SELECT * FROM setting")).fetchall()]  # ignore pk's
-        decoded_results = [(x[0], encrypter.decode(x[1]), x[2], x[3]) for x in results]  # compare decoded, since
-        decoded_entries = [(x[0], encrypter.decode(x[1]), x[2], x[3]) for x in entries]  # encoding changes every time.
-
-        assert set(decoded_entries) == set(decoded_results)
-
-    def tearDown(self) -> None:
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
-
-        session = sessionmaker(bind=get_engine())()
-
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"DELETE FROM {table} CASCADE")  # noqa: S608
-
-        session.commit()
-        session.close()
-
-    @staticmethod
-    def _collect_entries(encrypter: NaclBoxMiddleware):
-        return [
-            ("key1", encrypter.encode("val1"), 1, "dns-records"),
-            ("key2", encrypter.encode("val2"), 2, "dns-records"),
-            ("key3", encrypter.encode("val3"), 1, "dns-records"),
-            ("key4", encrypter.encode("val4"), 2, "nmap"),
-            ("key5", encrypter.encode("val5"), 1, "nmap"),
-            ("key6", encrypter.encode("val6"), 2, "nmap"),
-            ("key7", encrypter.encode("val7"), 1, "nmap"),
-        ]
+
+@pytest.fixture
+def migration_197672984df0() -> Session:
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+    # To reset autoincrement ids
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
+    # Set state to revision 197672984df0
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "197672984df0"])
+
+    engine = get_engine()
+    session = sessionmaker(bind=engine)()
+
+    yield session
+    session.commit()
+
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+
+    engine.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
+
+
+def test_setting_to_settings_json(migration_197672984df0):
+    session = migration_197672984df0
+
+    with SQLOrganisationStorage(session, settings) as storage:
+        storage.create(Organisation(id="dev1", name="Test 1 "))
+        storage.create(Organisation(id="dev2", name="Test 2 "))
+        storage.create(Organisation(id="dev3", name="Test 3 "))
+
+    encrypter = create_encrypter()
+    entries = _collect_entries(encrypter)
+    query = f"INSERT INTO setting (key, value, organisation_pk, plugin_id) values {','.join(map(str, entries))}"  # noqa: S608
+    session.get_bind().execute(text(query))
+
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "cd34fdfafdaf"])
+
+    all_settings = list(session.execute(text("select * from settings")).fetchall())
+    assert {(encrypter.decode(x[1]), x[2], x[3]) for x in all_settings} == {
+        ('{"key2": "val2"}', "dns-records", 2),
+        ('{"key5": "val5", "key7": "val7"}', "nmap", 1),
+        ('{"key4": "val4", "key6": "val6"}', "nmap", 2),
+        ('{"key1": "val1", "key3": "val3"}', "dns-records", 1),
+    }
+
+    session.close()
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
+
+    results = [x[1:] for x in session.execute(text("SELECT * FROM setting")).fetchall()]  # ignore pk's
+    decoded_results = [(x[0], encrypter.decode(x[1]), x[2], x[3]) for x in results]  # compare decoded, since
+    decoded_entries = [(x[0], encrypter.decode(x[1]), x[2], x[3]) for x in entries]  # encoding changes every time.
+
+    assert set(decoded_entries) == set(decoded_results)
+
+
+def _collect_entries(encrypter: NaclBoxMiddleware):
+    return [
+        ("key1", encrypter.encode("val1"), 1, "dns-records"),
+        ("key2", encrypter.encode("val2"), 2, "dns-records"),
+        ("key3", encrypter.encode("val3"), 1, "dns-records"),
+        ("key4", encrypter.encode("val4"), 2, "nmap"),
+        ("key5", encrypter.encode("val5"), 1, "nmap"),
+        ("key6", encrypter.encode("val6"), 2, "nmap"),
+        ("key7", encrypter.encode("val7"), 1, "nmap"),
+    ]
diff --git a/boefjes/tests/integration/test_migration_add_schema_field.py b/boefjes/tests/integration/test_migration_add_schema_field.py
index bbd66fbafa7..75ff6e29407 100644
--- a/boefjes/tests/integration/test_migration_add_schema_field.py
+++ b/boefjes/tests/integration/test_migration_add_schema_field.py
@@ -1,166 +1,166 @@
 import os
-from unittest import TestCase, skipIf
 
 import alembic.config
+import pytest
 from psycopg2.extras import execute_values
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
-from boefjes.local_repository import get_local_repository
 from boefjes.sql.db import SQL_BASE, get_engine
 
-
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestSettingsToBoefjeConfig(TestCase):
-    def setUp(self) -> None:
-        self.engine = get_engine()
-
-        # To reset autoincrement ids
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
-        # Set state to revision 6f99834a4a5a
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
-
-        dns_records = get_local_repository().by_id("dns-records")
-        nmap_udp = get_local_repository().by_id("nmap-udp")
-
-        entries = [
-            (
-                boefje.id,
-                boefje.name,
-                boefje.description,
-                str(boefje.scan_level),
-                list(sorted(boefje.consumes)),
-                list(sorted(boefje.produces)),
-                boefje.environment_keys,
-                boefje.oci_image,
-                boefje.oci_arguments,
-                boefje.version,
-            )
-            for boefje in [dns_records, nmap_udp]
-        ]
-
-        connection = self.engine.connect()
-        query = """INSERT INTO boefje (plugin_id, name, description, scan_level, consumes, produces, environment_keys,
-                oci_image, oci_arguments, version) values %s"""
-
-        with connection.begin():
-            execute_values(connection.connection.cursor(), query, entries)
-
-    def test_fail_on_wrong_plugin_ids(self):
-        assert self.engine.execute("SELECT * from boefje").fetchall() == [
-            (
-                1,
-                "dns-records",
-                None,
-                "DNS records",
-                "Fetch the DNS record(s) of a hostname.",
-                "1",
-                ["Hostname"],
-                ["boefje/dns-records"],
-                ["RECORD_TYPES", "REMOTE_NS"],
-                None,
-                [],
-                None,
-                False,
-            ),
-            (
-                2,
-                "nmap-udp",
-                None,
-                "Nmap UDP",
-                "Defaults to top 250 UDP ports. Includes service detection.",
-                "2",
-                ["IPAddressV4", "IPAddressV6"],
-                ["boefje/nmap-udp"],
-                ["TOP_PORTS_UDP"],
-                "ghcr.io/minvws/openkat/nmap:latest",
-                ["--open", "-T4", "-Pn", "-r", "-v10", "-sV", "-sU"],
-                None,
-                False,
-            ),
-        ]
-
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "5be152459a7b"])
-
-        schema_dns = {
-            "title": "Arguments",
-            "type": "object",
-            "properties": {
-                "RECORD_TYPES": {
-                    "title": "RECORD_TYPES",
-                    "type": "string",
-                    "description": "List of comma separated DNS record types to query for.",
-                    "default": "A,AAAA,CAA,CERT,RP,SRV,TXT,MX,NS,CNAME,DNAME",
-                },
-                "REMOTE_NS": {
-                    "title": "REMOTE_NS",
-                    "maxLength": 45,
-                    "type": "string",
-                    "description": "The IP address of the DNS resolver you want to use.",
-                    "default": "1.1.1.1",
-                },
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
+
+
+@pytest.fixture
+def migration_f9de6eb7824b(local_repository) -> Session:
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+    # To reset autoincrement ids
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
+    # Set state to revision f9de6eb7824b
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
+
+    engine = get_engine()
+    session = sessionmaker(bind=engine)()
+
+    dns_records = local_repository.by_id("dns-records")
+    nmap_udp = local_repository.by_id("nmap-udp")
+    entries = [
+        (
+            boefje.id,
+            boefje.name,
+            boefje.description,
+            str(boefje.scan_level),
+            list(sorted(boefje.consumes)),
+            list(sorted(boefje.produces)),
+            ["RECORD_TYPES", "REMOTE_NS"],
+            boefje.oci_image,
+            boefje.oci_arguments,
+            boefje.version,
+        )
+        for boefje in [dns_records, nmap_udp]
+    ]
+
+    query = """INSERT INTO boefje (plugin_id, name, description, scan_level, consumes, produces, environment_keys,
+            oci_image, oci_arguments, version) values %s"""
+
+    connection = session.connection()
+    with connection.begin():
+        execute_values(connection.connection.cursor(), query, entries)
+
+    session.commit()
+
+    yield session
+    session.commit()
+
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+
+    engine.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
+
+
+def test_fail_on_wrong_plugin_ids(migration_f9de6eb7824b):
+    session = migration_f9de6eb7824b
+    assert session.execute("SELECT * from boefje").fetchall() == [
+        (
+            1,
+            "dns-records",
+            None,
+            "DNS records",
+            "Fetch the DNS record(s) of a hostname.",
+            "1",
+            ["Hostname"],
+            ["boefje/dns-records"],
+            ["RECORD_TYPES", "REMOTE_NS"],
+            None,
+            [],
+            None,
+            False,
+        ),
+        (
+            2,
+            "nmap-udp",
+            None,
+            "Nmap UDP",
+            "Defaults to top 250 UDP ports. Includes service detection.",
+            "2",
+            ["IPAddressV4", "IPAddressV6"],
+            ["boefje/nmap-udp"],
+            ["RECORD_TYPES", "REMOTE_NS"],
+            "ghcr.io/minvws/openkat/nmap:latest",
+            ["--open", "-T4", "-Pn", "-r", "-v10", "-sV", "-sU"],
+            None,
+            False,
+        ),
+    ]
+
+    session.close()
+
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "5be152459a7b"])
+
+    schema_dns = {
+        "title": "Arguments",
+        "type": "object",
+        "properties": {
+            "RECORD_TYPES": {
+                "title": "RECORD_TYPES",
+                "type": "string",
+                "description": "List of comma separated DNS record types to query for.",
+                "default": "A,AAAA,CAA,CERT,RP,SRV,TXT,MX,NS,CNAME,DNAME",
             },
-        }
-
-        schema_udp = {
-            "title": "Arguments",
-            "type": "object",
-            "properties": {
-                "TOP_PORTS_UDP": {
-                    "title": "TOP_PORTS_UDP",
-                    "type": "integer",
-                    "minimum": 1,
-                    "maximum": 65535,
-                    "description": "Scan TOP_PORTS_UDP most common ports. Defaults to 250.",
-                }
+            "REMOTE_NS": {
+                "title": "REMOTE_NS",
+                "maxLength": 45,
+                "type": "string",
+                "description": "The IP address of the DNS resolver you want to use.",
+                "default": "1.1.1.1",
             },
-            "required": [],
-        }
-
-        self.assertListEqual(
-            self.engine.execute("SELECT * from boefje").fetchall(),
-            [
-                (
-                    1,
-                    "dns-records",
-                    None,
-                    "DNS records",
-                    "Fetch the DNS record(s) of a hostname.",
-                    "1",
-                    ["Hostname"],
-                    ["boefje/dns-records"],
-                    ["RECORD_TYPES", "REMOTE_NS"],
-                    None,
-                    [],
-                    None,
-                    False,
-                    schema_dns,
-                ),
-                (
-                    2,
-                    "nmap-udp",
-                    None,
-                    "Nmap UDP",
-                    "Defaults to top 250 UDP ports. Includes service detection.",
-                    "2",
-                    ["IPAddressV4", "IPAddressV6"],
-                    ["boefje/nmap-udp"],
-                    ["TOP_PORTS_UDP"],
-                    "ghcr.io/minvws/openkat/nmap:latest",
-                    ["--open", "-T4", "-Pn", "-r", "-v10", "-sV", "-sU"],
-                    None,
-                    False,
-                    schema_udp,
-                ),
-            ],
-        )
-
-    def tearDown(self) -> None:
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
-
-        session = sessionmaker(bind=get_engine())()
-
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"DELETE FROM {table} CASCADE")  # noqa: S608
-
-        session.commit()
-        session.close()
+        },
+    }
+
+    schema_udp = {
+        "title": "Arguments",
+        "type": "object",
+        "properties": {
+            "TOP_PORTS_UDP": {
+                "title": "TOP_PORTS_UDP",
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 65535,
+                "description": "Scan TOP_PORTS_UDP most common ports. Defaults to 250.",
+            }
+        },
+        "required": [],
+    }
+
+    assert session.execute("SELECT * from boefje").fetchall() == [
+        (
+            1,
+            "dns-records",
+            None,
+            "DNS records",
+            "Fetch the DNS record(s) of a hostname.",
+            "1",
+            ["Hostname"],
+            ["boefje/dns-records"],
+            ["RECORD_TYPES", "REMOTE_NS"],
+            None,
+            [],
+            None,
+            False,
+            schema_dns,
+        ),
+        (
+            2,
+            "nmap-udp",
+            None,
+            "Nmap UDP",
+            "Defaults to top 250 UDP ports. Includes service detection.",
+            "2",
+            ["IPAddressV4", "IPAddressV6"],
+            ["boefje/nmap-udp"],
+            ["RECORD_TYPES", "REMOTE_NS"],
+            "ghcr.io/minvws/openkat/nmap:latest",
+            ["--open", "-T4", "-Pn", "-r", "-v10", "-sV", "-sU"],
+            None,
+            False,
+            schema_udp,
+        ),
+    ]
diff --git a/boefjes/tests/integration/test_remove_repository_migration.py b/boefjes/tests/integration/test_remove_repository_migration.py
index 33379d42714..e95ee054299 100644
--- a/boefjes/tests/integration/test_remove_repository_migration.py
+++ b/boefjes/tests/integration/test_remove_repository_migration.py
@@ -1,101 +1,97 @@
 import os
-from unittest import TestCase, skipIf
 
 import alembic.config
+import pytest
 from sqlalchemy import text
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
 from boefjes.config import settings
 from boefjes.models import Organisation
 from boefjes.sql.db import SQL_BASE, get_engine
 from boefjes.sql.organisation_storage import SQLOrganisationStorage
 
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
 
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestRemoveRepositories(TestCase):
-    def setUp(self) -> None:
-        self.engine = get_engine()
 
-        # To reset autoincrement ids
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
-        # Set state to revision cd34fdfafdaf
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "cd34fdfafdaf"])
+@pytest.fixture
+def migration_cd34fdfafdaf() -> Session:
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+    # To reset autoincrement ids
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
+    # Set state to revision cd34fdfafdaf
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "cd34fdfafdaf"])
 
-        session = sessionmaker(bind=self.engine)()
+    engine = get_engine()
+    session = sessionmaker(bind=engine)()
 
-        with SQLOrganisationStorage(session, settings) as storage:
-            storage.create(Organisation(id="dev1", name="Test 1 "))
-            storage.create(Organisation(id="dev2", name="Test 2 "))
+    with SQLOrganisationStorage(session, settings) as storage:
+        storage.create(Organisation(id="dev1", name="Test 1 "))
+        storage.create(Organisation(id="dev2", name="Test 2 "))
 
-        session.close()
+    entries = [(1, "LOCAL", "Repository Local", "https://local.com/")]
+    query = f"INSERT INTO repository (pk, id, name, base_url) values {','.join(map(str, entries))}"  # noqa: S608
 
-        entries = [(1, "LOCAL", "Repository Local", "https://local.com/")]
-        query = f"INSERT INTO repository (pk, id, name, base_url) values {','.join(map(str, entries))}"  # noqa: S608
-        self.engine.execute(text(query))
+    engine.execute(text(query))
 
-        entries = [(1, "test_plugin_id", True, 1, 1)]  # New unique constraint fails
-        query = (
-            f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk, repository_pk)"
-            f"values {','.join(map(str, entries))}"
-        )  # noqa: S608
+    entries = [(1, "test_plugin_id", True, 1, 1)]  # New unique constraint fails
+    query = (
+        f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk, repository_pk)"
+        f"values {','.join(map(str, entries))}"
+    )  # noqa: S608
 
-        self.engine.execute(text(query))
+    engine.execute(text(query))
 
-        entries = [(1, 1)]
-        query = (
-            f"INSERT INTO organisation_repository (repository_pk, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
-        )
-        self.engine.execute(text(query))
+    entries = [(1, 1)]
+    query = f"INSERT INTO organisation_repository (repository_pk, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
+    engine.execute(text(query))
 
-    def test_fail_on_non_unique(self):
-        session = sessionmaker(bind=self.engine)()
+    yield session
+    session.commit()
 
-        entries = [(2, "test", "test", "https://test.co/")]  # Another non-local repository
-        query = f"INSERT INTO repository (pk, id, name, base_url) values {','.join(map(str, entries))}"  # noqa: S608
-        self.engine.execute(text(query))
+    engine.execute(text("DELETE FROM plugin_state"))
 
-        entries = [(2, "test_plugin_id", True, 1, 2)]  # New unique constraint fails
-        query = (
-            f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk, repository_pk)"
-            f"values {','.join(map(str, entries))}"
-        )  # noqa: S608
-        self.engine.execute(text(query))
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
 
-        with self.assertRaises(Exception) as ctx:
-            alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "7c88b9cd96aa"])
+    engine.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
 
-        assert "remove plugin_states that refer to nonlocal repositories first" in str(ctx.exception)
 
-        self.engine.execute(text("DELETE FROM plugin_state WHERE id = 2"))  # Fix unique constraint fails
-        self.engine.execute(text("DELETE FROM repository WHERE pk = 2"))  # Fix unique constraint fails
+def test_fail_on_non_unique(migration_cd34fdfafdaf):
+    session = migration_cd34fdfafdaf
 
+    entries = [(2, "test", "test", "https://test.co/")]  # Another non-local repository
+    query = f"INSERT INTO repository (pk, id, name, base_url) values {','.join(map(str, entries))}"  # noqa: S608
+    session.get_bind().execute(text(query))
+    entries = [(2, "test_plugin_id", True, 1, 2)]  # New unique constraint fails
+    query = (
+        f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk, repository_pk)"
+        f"values {','.join(map(str, entries))}"
+    )  # noqa: S608
+    session.get_bind().execute(text(query))
+
+    with pytest.raises(Exception) as ctx:
         alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "7c88b9cd96aa"])
 
-        all_plugin_states = [x[1:] for x in self.engine.execute(text("SELECT * FROM plugin_state")).fetchall()]
-        assert all_plugin_states == [("test_plugin_id", True, 1)]
+    assert "remove plugin_states that refer to nonlocal repositories first" in str(ctx.value)
 
-        session.close()
+    # Fix unique constraint failures
+    session.get_bind().execute(text("DELETE FROM plugin_state WHERE id = 2; DELETE FROM repository WHERE pk = 2"))
 
-    def test_downgrade(self):
-        self.engine.execute(text("DELETE FROM plugin_state WHERE id = 2"))  # Fix unique constraint fails
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "7c88b9cd96aa"])
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "7c88b9cd96aa"])
 
-        all_plugin_states = [x[1:] for x in self.engine.execute(text("SELECT * FROM plugin_state")).fetchall()]
-        assert all_plugin_states == [("test_plugin_id", True, 1, 1)]
-        assert self.engine.execute(text("SELECT * from repository")).fetchall() == [
-            (1, "LOCAL", "Local Plugin Repository", "http://dev/null")
-        ]
+    all_plugin_states = [x[1:] for x in session.get_bind().execute(text("SELECT * FROM plugin_state")).fetchall()]
+    assert all_plugin_states == [("test_plugin_id", True, 1)]
 
-    def tearDown(self) -> None:
-        self.engine.execute(text("DELETE FROM plugin_state"))  # Fix unique constraint fails
 
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+def test_downgrade(migration_cd34fdfafdaf):
+    session = migration_cd34fdfafdaf
+    session.get_bind().execute(text("DELETE FROM plugin_state WHERE id = 2"))  # Fix unique constraint fails
 
-        session = sessionmaker(bind=get_engine())()
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "7c88b9cd96aa"])
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
 
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"DELETE FROM {table} CASCADE")  # noqa: S608
+    all_plugin_states = [x[1:] for x in session.get_bind().execute(text("SELECT * FROM plugin_state")).fetchall()]
 
-        session.commit()
-        session.close()
+    assert all_plugin_states == [("test_plugin_id", True, 1, 1)]
+    assert session.get_bind().execute(text("SELECT * from repository")).fetchall() == [
+        (1, "LOCAL", "Local Plugin Repository", "http://dev/null")
+    ]
diff --git a/boefjes/tests/integration/test_settings_to_boefje_config_migration.py b/boefjes/tests/integration/test_settings_to_boefje_config_migration.py
index 261a965240c..cd8fad90ef9 100644
--- a/boefjes/tests/integration/test_settings_to_boefje_config_migration.py
+++ b/boefjes/tests/integration/test_settings_to_boefje_config_migration.py
@@ -1,9 +1,9 @@
 import os
-from unittest import TestCase, skipIf
 
 import alembic.config
+import pytest
 from sqlalchemy import text
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
 from boefjes.config import settings
 from boefjes.models import Organisation
@@ -11,104 +11,109 @@
 from boefjes.sql.db import SQL_BASE, get_engine
 from boefjes.sql.organisation_storage import SQLOrganisationStorage
 
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
 
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestSettingsToBoefjeConfig(TestCase):
-    def setUp(self) -> None:
-        self.engine = get_engine()
 
-        # To reset autoincrement ids
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
-        # Set state to revision 6f99834a4a5a
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "6f99834a4a5a"])
+@pytest.fixture
+def migration_6f99834a4a5a() -> Session:
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
+    # To reset autoincrement ids
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "base"])
+    # Set state to revision 6f99834a4a5a
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "6f99834a4a5a"])
 
-        session = sessionmaker(bind=self.engine)()
+    engine = get_engine()
+    session = sessionmaker(bind=engine)()
 
-        with SQLOrganisationStorage(session, settings) as storage:
-            storage.create(Organisation(id="dev1", name="Test 1 "))
-            storage.create(Organisation(id="dev2", name="Test 2 "))
+    with SQLOrganisationStorage(session, settings) as storage:
+        storage.create(Organisation(id="dev1", name="Test 1 "))
+        storage.create(Organisation(id="dev2", name="Test 2 "))
 
-        session.close()
+    encrypter = create_encrypter()
+    entries = [
+        (1, encrypter.encode('{"key1": "val1"}'), "dns-records", 1),
+        (2, encrypter.encode('{"key1": "val1", "key2": "val2"}'), "dns-records", 2),
+        (3, encrypter.encode('{"key2": "val2", "key3": "val3"}'), "nmap", 1),
+    ]
+    query = f"INSERT INTO settings (id, values, plugin_id, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
 
-        encrypter = create_encrypter()
-        entries = [
-            (1, encrypter.encode('{"key1": "val1"}'), "dns-records", 1),
-            (2, encrypter.encode('{"key1": "val1", "key2": "val2"}'), "dns-records", 2),
-            (3, encrypter.encode('{"key2": "val2", "key3": "val3"}'), "nmap", 1),
-        ]
-        query = f"INSERT INTO settings (id, values, plugin_id, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
-        self.engine.execute(text(query))
+    engine.execute(text(query))
 
-        entries = [(1, "dns-records", True, 1), (2, "nmap-udp", True, 1)]
-        query = (
-            f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
-        )
-        self.engine.execute(text(query))
+    entries = [(1, "dns-records", True, 1), (2, "nmap-udp", True, 1)]
+    query = f"INSERT INTO plugin_state (id, plugin_id, enabled, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
+    engine.execute(text(query))
 
-    def test_fail_on_wrong_plugin_ids(self):
-        session = sessionmaker(bind=self.engine)()
+    yield session
+    session.commit()
 
-        encrypter = create_encrypter()
-        entries = [
-            (4, encrypter.encode('{"key2": "val2", "key3": "val3"}'), "test-unknown-plugin-id", 1),
-            (5, encrypter.encode('{"key1": "val1"}'), "kat_nmap_normalize", 2),
-        ]
-        query = f"INSERT INTO settings (id, values, plugin_id, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
-        self.engine.execute(text(query))
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
 
-        with self.assertRaises(Exception) as ctx:
-            alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
+    engine.execute(";".join([f"TRUNCATE TABLE {t} CASCADE" for t in SQL_BASE.metadata.tables]))
 
-        assert "Settings for normalizer or bit found: kat_nmap_normalize" in str(ctx.exception)
 
-        self.engine.execute(text("DELETE FROM settings WHERE id = 5"))  # Fix normalizer setting
+def test_fail_on_wrong_plugin_ids(migration_6f99834a4a5a):
+    session = migration_6f99834a4a5a
 
-        with self.assertRaises(Exception) as ctx:
-            alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
+    encrypter = create_encrypter()
+    entries = [
+        (4, encrypter.encode('{"key2": "val2", "key3": "val3"}'), "test-unknown-plugin-id", 1),
+        (5, encrypter.encode('{"key1": "val1"}'), "kat_nmap_normalize", 2),
+    ]
+    query = f"INSERT INTO settings (id, values, plugin_id, organisation_pk) values {','.join(map(str, entries))}"  # noqa: S608
+    session.execute(text(query))
+    session.commit()
+    session.close()
 
-        assert "Invalid plugin id found: test-unknown-plugin-id" in str(ctx.exception)
+    with pytest.raises(Exception) as ctx:
+        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
+
+    assert "Settings for normalizer or bit found: kat_nmap_normalize" in str(ctx.value)
 
-        self.engine.execute(text("DELETE FROM settings WHERE id = 4"))  # Fix unknown plugin
+    session.execute(text("DELETE FROM settings WHERE id = 5"))  # Fix normalizer setting
+    session.commit()
+    session.close()
 
+    with pytest.raises(Exception) as ctx:
         alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
 
-        assert self.engine.execute(text("SELECT id FROM boefje WHERE plugin_id = 'dns-records'")).fetchall() == [(2,)]
+    assert "Invalid plugin id found: test-unknown-plugin-id" in str(ctx.value)
 
-        config_storage = SQLConfigStorage(session, encrypter)
-        assert config_storage.get_all_settings("dev1", "dns-records") == {"key1": "val1"}
-        assert config_storage.get_all_settings("dev1", "nmap-udp") == {}
-        assert config_storage.get_all_settings("dev2", "dns-records") == {"key1": "val1", "key2": "val2"}
+    session.execute(text("DELETE FROM settings WHERE id = 4"))  # Fix unknown plugin
+    session.commit()
+    session.close()
 
-        assert config_storage.is_enabled_by_id("dns-records", "dev1")
-        assert config_storage.is_enabled_by_id("nmap-udp", "dev1")
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
 
-        session.commit()
-        session.close()
+    assert session.execute(text("SELECT id FROM boefje WHERE plugin_id = 'dns-records'")).fetchall() == [(2,)]
+    session.commit()
+    session.close()
 
-    def test_downgrade(self):
-        # No need to also create a Boefje entry, the seeded settings and migrations take care of that and
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
-
-        encrypter = create_encrypter()
-        all_settings = list(self.engine.execute(text("select * from settings")).fetchall())
-        self.assertSetEqual(
-            {(encrypter.decode(x[1]) if x[1] != "{}" else "{}", x[2], x[3]) for x in all_settings},
-            {
-                ('{"key1": "val1"}', "dns-records", 1),
-                ('{"key1": "val1", "key2": "val2"}', "dns-records", 2),
-                ('{"key2": "val2", "key3": "val3"}', "nmap", 1),
-                ("{}", "nmap-udp", 1),
-            },
-        )
-
-    def tearDown(self) -> None:
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
-
-        session = sessionmaker(bind=get_engine())()
-
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"DELETE FROM {table} CASCADE")  # noqa: S608
-
-        session.commit()
-        session.close()
+    config_storage = SQLConfigStorage(session, encrypter)
+    assert config_storage.get_all_settings("dev1", "dns-records") == {"key1": "val1"}
+    assert config_storage.get_all_settings("dev1", "nmap-udp") == {}
+    assert config_storage.get_all_settings("dev2", "dns-records") == {"key1": "val1", "key2": "val2"}
+
+    assert config_storage.is_enabled_by_id("dns-records", "dev1")
+    assert config_storage.is_enabled_by_id("nmap-udp", "dev1")
+
+    session.commit()
+    session.close()
+
+
+def test_downgrade(migration_6f99834a4a5a):
+    session = migration_6f99834a4a5a
+
+    # No need to also create a Boefje entry, the seeded settings and migrations take care of that and
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "f9de6eb7824b"])
+    alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "downgrade", "-1"])
+
+    encrypter = create_encrypter()
+    all_settings = list(session.execute(text("select * from settings")).fetchall())
+    session.commit()
+    session.close()
+    assert {(encrypter.decode(x[1]) if x[1] != "{}" else "{}", x[2], x[3]) for x in all_settings} == {
+        ('{"key1": "val1"}', "dns-records", 1),
+        ('{"key1": "val1", "key2": "val2"}', "dns-records", 2),
+        ('{"key2": "val2", "key3": "val3"}', "nmap", 1),
+        ("{}", "nmap-udp", 1),
+    }
diff --git a/boefjes/tests/integration/test_sql_repositories.py b/boefjes/tests/integration/test_sql_repositories.py
index ad4f804ad10..0bd76c21995 100644
--- a/boefjes/tests/integration/test_sql_repositories.py
+++ b/boefjes/tests/integration/test_sql_repositories.py
@@ -1,121 +1,86 @@
 import datetime
 import os
-from unittest import TestCase, skipIf
 
-import alembic.config
-from sqlalchemy.orm import sessionmaker
+import pytest
 
-from boefjes.config import settings
 from boefjes.models import Boefje, Normalizer, Organisation
-from boefjes.sql.config_storage import SQLConfigStorage, create_encrypter
-from boefjes.sql.db import SQL_BASE, get_engine
-from boefjes.sql.organisation_storage import SQLOrganisationStorage
-from boefjes.sql.plugin_storage import SQLPluginStorage
 from boefjes.storage.interfaces import ConfigNotFound, OrganisationNotFound, PluginNotFound, StorageError
 
+pytestmark = pytest.mark.skipif(os.environ.get("CI") != "1", reason="Needs a CI database.")
 
-@skipIf(os.environ.get("CI") != "1", "Needs a CI database.")
-class TestRepositories(TestCase):
-    def setUp(self) -> None:
-        alembic.config.main(argv=["--config", "/app/boefjes/boefjes/alembic.ini", "upgrade", "head"])
 
-        session = sessionmaker(bind=get_engine())()
-        self.organisation_storage = SQLOrganisationStorage(session, settings)
-        self.config_storage = SQLConfigStorage(session, create_encrypter())
-        self.plugin_storage = SQLPluginStorage(session, settings)
+def test_organisation_storage(organisation_storage):
+    organisation_id = "test"
 
-    def tearDown(self) -> None:
-        session = sessionmaker(bind=get_engine())()
+    org = Organisation(id=organisation_id, name="Test")
+    with organisation_storage as storage:
+        storage.create(org)
 
-        for table in SQL_BASE.metadata.tables:
-            session.execute(f"DELETE FROM {table} CASCADE")  # noqa: S608
+    returned_org = storage.get_by_id(organisation_id)
+    assert org == returned_org
 
-        session.commit()
-        session.close()
+    all_organisations = storage.get_all()
+    assert org == all_organisations[organisation_id]
 
-    def test_organisation_storage(self):
-        organisation_id = "test"
+    with organisation_storage as storage:
+        storage.delete_by_id(organisation_id)
 
-        org = Organisation(id=organisation_id, name="Test")
-        with self.organisation_storage as storage:
-            storage.create(org)
+    with pytest.raises(OrganisationNotFound):
+        storage.get_by_id(organisation_id)
 
-        returned_org = storage.get_by_id(organisation_id)
-        self.assertEqual(org, returned_org)
 
-        all_organisations = storage.get_all()
-        self.assertEqual(org, all_organisations[organisation_id])
+def test_settings_storage(plugin_storage, organisation_storage, config_storage):
+    organisation_id = "test"
+    plugin_id = 64 * "a"
 
-        with self.organisation_storage as storage:
-            storage.delete_by_id(organisation_id)
+    with plugin_storage as storage:
+        storage.create_boefje(Boefje(id=plugin_id, name="Test"))
 
-        with self.assertRaises(OrganisationNotFound):
-            storage.get_by_id(organisation_id)
+    org = Organisation(id=organisation_id, name="Test")
+    with organisation_storage as storage:
+        storage.create(org)
 
-    def test_settings_storage(self):
-        organisation_id = "test"
-        plugin_id = 64 * "a"
+    with config_storage as settings_storage:
+        settings_storage.upsert(organisation_id, plugin_id, {"TEST_SETTING": "123.9", "TEST_SETTING2": 12})
 
-        with self.plugin_storage as storage:
-            storage.create_boefje(Boefje(id=plugin_id, name="Test"))
+    with config_storage as settings_storage:
+        settings_storage.upsert(organisation_id, plugin_id, {"TEST_SETTING": "123.9", "TEST_SETTING2": 13})
 
-        org = Organisation(id=organisation_id, name="Test")
-        with self.organisation_storage as storage:
-            storage.create(org)
+    returned_settings = settings_storage.get_all_settings(organisation_id, plugin_id)
+    assert returned_settings["TEST_SETTING"] == "123.9"
+    assert returned_settings["TEST_SETTING2"] == 13
 
-        with self.config_storage as settings_storage:
-            settings_storage.upsert(organisation_id, plugin_id, {"TEST_SETTING": "123.9", "TEST_SETTING2": 12})
+    with pytest.raises(ConfigNotFound):
+        config_storage.delete("no organisation!", plugin_id)
 
-        with self.config_storage as settings_storage:
-            settings_storage.upsert(organisation_id, plugin_id, {"TEST_SETTING": "123.9", "TEST_SETTING2": 13})
+    assert {"TEST_SETTING": "123.9", "TEST_SETTING2": 13} == settings_storage.get_all_settings(org.id, plugin_id)
+    assert config_storage.get_all_settings(org.id, "wrong") == {}
+    assert config_storage.get_all_settings("wrong", plugin_id) == {}
 
-        returned_settings = settings_storage.get_all_settings(organisation_id, plugin_id)
-        self.assertEqual("123.9", returned_settings["TEST_SETTING"])
-        self.assertEqual(13, returned_settings["TEST_SETTING2"])
+    with config_storage as settings_storage:
+        settings_storage.delete(org.id, plugin_id)
 
-        with self.assertRaises(ConfigNotFound):
-            settings_storage.delete("no organisation!", plugin_id)
+    assert settings_storage.get_all_settings(org.id, plugin_id) == {}
 
-        self.assertEqual(
-            {"TEST_SETTING": "123.9", "TEST_SETTING2": 13}, settings_storage.get_all_settings(org.id, plugin_id)
-        )
-        self.assertEqual(dict(), settings_storage.get_all_settings(org.id, "wrong"))
-        self.assertEqual(dict(), settings_storage.get_all_settings("wrong", plugin_id))
-
-        with self.config_storage as settings_storage:
-            settings_storage.delete(org.id, plugin_id)
-
-        self.assertEqual(dict(), settings_storage.get_all_settings(org.id, plugin_id))
-
-        with self.assertRaises(StorageError), self.config_storage as settings_storage:
-            settings_storage.upsert(organisation_id, 65 * "a", {"TEST_SETTING": "123.9"})
-
-    def test_settings_storage_values_field_limits(self):
-        organisation_id = "test"
-        plugin_id = 64 * "a"
-
-        with self.plugin_storage as storage:
-            storage.create_boefje(Boefje(id=plugin_id, name="Test"))
-
-        org = Organisation(id=organisation_id, name="Test")
-        with self.organisation_storage as storage:
-            storage.create(org)
-
-        with self.config_storage as settings_storage:
-            settings_storage.upsert(
-                organisation_id,
-                plugin_id,
-                {
-                    "TEST_SETTING": 12 * "123.9",
-                    "TEST_SETTING2": 12000,
-                    "TEST_SETTING3": 30 * "b",
-                    "TEST_SETTING4": 30 * "b",
-                    "TEST_SETTING5": 10 * "b",
-                    "TEST_SETTING6": 123456789,
-                },
-            )
-
-        self.assertEqual(
+    with pytest.raises(StorageError), config_storage as settings_storage:
+        settings_storage.upsert(organisation_id, 65 * "a", {"TEST_SETTING": "123.9"})
+
+
+def test_settings_storage_values_field_limits(plugin_storage, organisation_storage, config_storage):
+    organisation_id = "test"
+    plugin_id = 64 * "a"
+
+    with plugin_storage as storage:
+        storage.create_boefje(Boefje(id=plugin_id, name="Test"))
+
+    org = Organisation(id=organisation_id, name="Test")
+    with organisation_storage as storage:
+        storage.create(org)
+
+    with config_storage as settings_storage:
+        settings_storage.upsert(
+            organisation_id,
+            plugin_id,
             {
                 "TEST_SETTING": 12 * "123.9",
                 "TEST_SETTING2": 12000,
@@ -124,151 +89,182 @@ def test_settings_storage_values_field_limits(self):
                 "TEST_SETTING5": 10 * "b",
                 "TEST_SETTING6": 123456789,
             },
-            settings_storage.get_all_settings(org.id, plugin_id),
         )
 
-    def test_plugin_enabled_storage(self):
-        with self.organisation_storage as storage:
-            org = Organisation(id="test", name="Test")
-            storage.create(org)
-
-        plugin = Boefje(
-            id="test-boefje-1",
-            name="Test Boefje 1",
-            version="0.1",
-            consumes={"WebPage"},
-            produces=["text/html"],
-            enabled=True,
-        )
+    assert {
+        "TEST_SETTING": 12 * "123.9",
+        "TEST_SETTING2": 12000,
+        "TEST_SETTING3": 30 * "b",
+        "TEST_SETTING4": 30 * "b",
+        "TEST_SETTING5": 10 * "b",
+        "TEST_SETTING6": 123456789,
+    } == settings_storage.get_all_settings(org.id, plugin_id)
+
+
+def test_plugin_enabled_storage(organisation_storage, plugin_storage, config_storage):
+    with organisation_storage as storage:
+        org = Organisation(id="test", name="Test")
+        storage.create(org)
 
-        with self.plugin_storage as storage:
-            storage.create_boefje(plugin)
+    plugin = Boefje(
+        id="test-boefje-1",
+        name="Test Boefje 1",
+        version="0.1",
+        consumes={"WebPage"},
+        produces=["text/html"],
+        enabled=True,
+    )
 
-        with self.config_storage as storage:
-            storage.upsert(org.id, plugin.id, enabled=plugin.enabled)
+    with plugin_storage as storage:
+        storage.create_boefje(plugin)
 
-        returned_state = storage.is_enabled_by_id(plugin.id, org.id)
-        self.assertTrue(returned_state)
+    with config_storage as storage:
+        storage.upsert(org.id, plugin.id, enabled=plugin.enabled)
 
-        with self.config_storage as storage:
-            storage.upsert(org.id, plugin.id, enabled=False)
+    returned_state = storage.is_enabled_by_id(plugin.id, org.id)
+    assert returned_state is True
 
-        returned_state = storage.is_enabled_by_id(plugin.id, org.id)
-        self.assertFalse(returned_state)
+    with config_storage as storage:
+        storage.upsert(org.id, plugin.id, enabled=False)
 
-        with self.assertRaises(ConfigNotFound):
-            storage.is_enabled_by_id("wrong", org.id)
+    returned_state = storage.is_enabled_by_id(plugin.id, org.id)
+    assert returned_state is False
 
-        with self.assertRaises(ConfigNotFound):
-            storage.is_enabled_by_id("wrong", org.id)
+    with pytest.raises(ConfigNotFound):
+        storage.is_enabled_by_id("wrong", org.id)
 
-        with self.assertRaises(ConfigNotFound):
-            storage.is_enabled_by_id(plugin.id, "wrong")
+    with pytest.raises(ConfigNotFound):
+        storage.is_enabled_by_id("wrong", org.id)
 
-    def test_bare_boefje_storage(self):
-        boefje = Boefje(id="test_boefje", name="Test", static=False)
+    with pytest.raises(ConfigNotFound):
+        storage.is_enabled_by_id(plugin.id, "wrong")
 
-        with self.plugin_storage as storage:
-            storage.create_boefje(boefje)
 
-        returned_boefje = storage.boefje_by_id(boefje.id)
-        self.assertEqual(boefje, returned_boefje)
+def test_bare_boefje_storage(plugin_storage):
+    boefje = Boefje(id="test_boefje", name="Test", static=False)
 
+    with plugin_storage as storage:
+        storage.create_boefje(boefje)
+
+    returned_boefje = storage.boefje_by_id(boefje.id)
+    assert boefje == returned_boefje
+
+    with plugin_storage as storage:
         storage.update_boefje(boefje.id, {"description": "4"})
-        self.assertEqual(storage.boefje_by_id(boefje.id).description, "4")
-        boefje.description = "4"
-
-        all_plugins = storage.get_all()
-        self.assertEqual(all_plugins, [boefje])
-
-        with self.plugin_storage as storage:
-            storage.delete_boefje_by_id(boefje.id)
-
-        with self.assertRaises(PluginNotFound):
-            storage.boefje_by_id(boefje.id)
-
-    def test_rich_boefje_storage(self):
-        boefje = Boefje(
-            id="test_boefje",
-            name="Test",
-            version="v1.09",
-            created=datetime.datetime(2010, 10, 10, 10, 10, 10, tzinfo=datetime.UTC),
-            description="My Boefje",
-            environment_keys=["api_key", "TOKEN"],
-            scan_level=4,
-            consumes=["Internet"],
-            produces=[
-                "image/png",
-                "application/zip+json",
-                "application/har+json",
-                "application/json",
-                "application/localstorage+json",
-            ],
-            oci_image="ghcr.io/test/image:123",
-            oci_arguments=["host", "-n", "123123123123123123123"],
-            static=False,
-        )
 
-        with self.plugin_storage as storage:
-            storage.create_boefje(boefje)
-
-        returned_boefje = storage.boefje_by_id(boefje.id)
-        self.assertEqual(boefje, returned_boefje)
-
-    def test_bare_normalizer_storage(self):
-        normalizer = Normalizer(id="test_boefje", name="Test", static=False)
-
-        with self.plugin_storage as storage:
-            storage.create_normalizer(normalizer)
-
-        returned_normalizer = storage.normalizer_by_id(normalizer.id)
-        self.assertEqual(normalizer, returned_normalizer)
-
-        storage.update_normalizer(normalizer.id, {"version": "v4"})
-        self.assertEqual(storage.normalizer_by_id(normalizer.id).version, "v4")
-        normalizer.version = "v4"
-
-        all_plugins = storage.get_all()
-        self.assertEqual(all_plugins, [normalizer])
-
-        with self.plugin_storage as storage:
-            storage.delete_normalizer_by_id(normalizer.id)
-
-        with self.assertRaises(PluginNotFound):
-            storage.normalizer_by_id(normalizer.id)
-
-    def test_rich_normalizer_storage(self):
-        normalizer = Normalizer(
-            id="test_normalizer",
-            name="Test",
-            version="v1.19",
-            created=datetime.datetime(2010, 10, 10, 10, 10, 10, tzinfo=datetime.UTC),
-            description="My Normalizer",
-            environment_keys=["api_key", "TOKEN"],
-            scan_level=4,
-            consumes=["Internet"],
-            produces=[
-                "image/png",
-                "application/zip+json",
-                "application/har+json",
-                "application/json",
-                "application/localstorage+json",
-            ],
-            static=False,
-        )
+    assert storage.boefje_by_id(boefje.id).description == "4"
+
+    with plugin_storage as storage:
+        storage.update_boefje(boefje.id, {"scan_level": 3})
+
+    assert storage.boefje_by_id(boefje.id).scan_level == 3
+
+    boefje.description = "4"
+    boefje.scan_level = 3
+
+    assert storage.boefje_by_id(boefje.id).description == "4"
+    boefje.description = "4"
+
+    with plugin_storage as storage:
+        storage.update_boefje(boefje.id, {"scan_level": 3})
+
+    assert storage.boefje_by_id(boefje.id).scan_level == 3
+
+    boefje.description = "4"
+    boefje.scan_level = 3
+    all_plugins = storage.get_all()
+    assert all_plugins == [boefje]
+
+    with plugin_storage as storage:
+        storage.delete_boefje_by_id(boefje.id)
+
+    with pytest.raises(PluginNotFound):
+        storage.boefje_by_id(boefje.id)
+
+
+def test_rich_boefje_storage(plugin_storage):
+    boefje = Boefje(
+        id="test_boefje",
+        name="Test",
+        version="v1.09",
+        created=datetime.datetime(2010, 10, 10, 10, 10, 10, tzinfo=datetime.UTC),
+        description="My Boefje",
+        scan_level=4,
+        consumes=["Internet"],
+        produces=[
+            "image/png",
+            "application/zip+json",
+            "application/har+json",
+            "application/json",
+            "application/localstorage+json",
+        ],
+        oci_image="ghcr.io/test/image:123",
+        oci_arguments=["host", "-n", "123123123123123123123"],
+        static=False,
+    )
+
+    with plugin_storage as storage:
+        storage.create_boefje(boefje)
+
+    returned_boefje = storage.boefje_by_id(boefje.id)
+    assert boefje == returned_boefje
+
+
+def test_bare_normalizer_storage(plugin_storage):
+    normalizer = Normalizer(id="test_boefje", name="Test", static=False)
+
+    with plugin_storage as storage:
+        storage.create_normalizer(normalizer)
+
+    returned_normalizer = storage.normalizer_by_id(normalizer.id)
+    assert normalizer == returned_normalizer
+
+    storage.update_normalizer(normalizer.id, {"version": "v4"})
+    assert storage.normalizer_by_id(normalizer.id).version == "v4"
+    normalizer.version = "v4"
+
+    all_plugins = storage.get_all()
+    assert all_plugins == [normalizer]
+
+    with plugin_storage as storage:
+        storage.delete_normalizer_by_id(normalizer.id)
+
+    with pytest.raises(PluginNotFound):
+        storage.normalizer_by_id(normalizer.id)
+
 
-        with self.plugin_storage as storage:
-            storage.create_normalizer(normalizer)
+def test_rich_normalizer_storage(plugin_storage):
+    normalizer = Normalizer(
+        id="test_normalizer",
+        name="Test",
+        version="v1.19",
+        created=datetime.datetime(2010, 10, 10, 10, 10, 10, tzinfo=datetime.UTC),
+        description="My Normalizer",
+        scan_level=4,
+        consumes=["Internet"],
+        produces=[
+            "image/png",
+            "application/zip+json",
+            "application/har+json",
+            "application/json",
+            "application/localstorage+json",
+        ],
+        static=False,
+    )
 
-        returned_normalizer = storage.normalizer_by_id(normalizer.id)
-        self.assertEqual(normalizer, returned_normalizer)
+    with plugin_storage as storage:
+        storage.create_normalizer(normalizer)
 
-    def test_plugin_storage(self):
-        boefje = Boefje(id="test_boefje", name="Test", static=False)
-        normalizer = Normalizer(id="test_boefje", name="Test", static=False)
+    returned_normalizer = storage.normalizer_by_id(normalizer.id)
+    assert normalizer == returned_normalizer
 
-        with self.plugin_storage as storage:
-            storage.create_boefje(boefje)
-            storage.create_normalizer(normalizer)
 
-        self.assertEqual(storage.get_all(), [boefje, normalizer])
+def test_plugin_storage(plugin_storage):
+    boefje = Boefje(id="test_boefje", name="Test", static=False)
+    normalizer = Normalizer(id="test_boefje", name="Test", static=False)
+
+    with plugin_storage as storage:
+        storage.create_boefje(boefje)
+        storage.create_normalizer(normalizer)
+
+    assert storage.get_all() == [boefje, normalizer]
diff --git a/boefjes/tests/katalogus/test_organisation_api.py b/boefjes/tests/katalogus/test_organisation_api.py
index 4f2c7364aa9..914012e3688 100644
--- a/boefjes/tests/katalogus/test_organisation_api.py
+++ b/boefjes/tests/katalogus/test_organisation_api.py
@@ -1,50 +1,35 @@
 import json
-from unittest import TestCase
 
-from fastapi.testclient import TestClient
 
-from boefjes.katalogus.root import app
-from boefjes.models import Organisation
-from boefjes.sql.organisation_storage import get_organisations_store
-from boefjes.storage.memory import OrganisationStorageMemory
+def test_list(unit_test_client):
+    res = unit_test_client.get("/v1/organisations")
+    assert res.status_code == 200
 
 
-class TestOrganisations(TestCase):
-    def setUp(self) -> None:
-        self.client = TestClient(app)
+def test_get_organisation(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test")
+    assert res.status_code == 200
 
-        self._store = OrganisationStorageMemory({"test": Organisation(id="test", name="Test")})
 
-        app.dependency_overrides[get_organisations_store] = lambda: self._store
+def test_non_existing_organisation(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/future-organisation")
+    assert res.status_code == 404
+    assert "unknown organisation" in res.text.lower()
 
-    def tearDown(self) -> None:
-        app.dependency_overrides = {}
 
-    def test_list(self):
-        res = self.client.get("/v1/organisations")
-        self.assertEqual(200, res.status_code)
+def test_add_organisation(unit_test_client):
+    res = unit_test_client.post("/v1/organisations/", content=json.dumps({"id": "new", "name": "New"}))
+    assert res.status_code == 201
 
-    def test_get_organisation(self):
-        res = self.client.get("/v1/organisations/test")
-        self.assertEqual(200, res.status_code)
+    res = unit_test_client.get("/v1/organisations")
+    assert res.status_code == 200
+    assert len(res.json()) == 2
 
-    def test_non_existing_organisation(self):
-        res = self.client.get("/v1/organisations/future-organisation")
-        self.assertEqual(404, res.status_code)
-        self.assertIn("unknown organisation", res.text.lower())
 
-    def test_add_organisation(self):
-        res = self.client.post("/v1/organisations/", data=json.dumps({"id": "new", "name": "New"}))
-        self.assertEqual(201, res.status_code)
+def test_delete_organisation(unit_test_client):
+    res = unit_test_client.delete("/v1/organisations/test")
+    assert res.status_code == 200
 
-        res = self.client.get("/v1/organisations")
-        self.assertEqual(200, res.status_code)
-        self.assertEqual(2, len(res.json()))
-
-    def test_delete_organisation(self):
-        res = self.client.delete("/v1/organisations/test")
-        self.assertEqual(200, res.status_code)
-
-        res = self.client.get("/v1/organisations")
-        self.assertEqual(200, res.status_code)
-        self.assertEqual(0, len(res.json()))
+    res = unit_test_client.get("/v1/organisations")
+    assert res.status_code == 200
+    assert len(res.json()) == 0
diff --git a/boefjes/tests/katalogus/test_plugin_service.py b/boefjes/tests/katalogus/test_plugin_service.py
index a86b4aa6fbf..4f1806f176a 100644
--- a/boefjes/tests/katalogus/test_plugin_service.py
+++ b/boefjes/tests/katalogus/test_plugin_service.py
@@ -1,163 +1,127 @@
-from unittest import TestCase
+import pytest
 
-from boefjes.config import BASE_DIR
-from boefjes.dependencies.plugins import PluginService
-from boefjes.local_repository import LocalPluginRepository
 from boefjes.storage.interfaces import SettingsNotConformingToSchema
-from boefjes.storage.memory import ConfigStorageMemory, PluginStorageMemory
 
 
-def mock_plugin_service(organisation_id: str) -> PluginService:
-    storage = ConfigStorageMemory()
-    storage.upsert("test", "test_plugin", {"DUMMY_VAR": "123"})
+def test_get_plugins(mock_plugin_service, test_organisation):
+    plugins = mock_plugin_service.get_all(test_organisation.id)
+    assert len(plugins) == 14
 
-    test_boefjes_dir = BASE_DIR.parent / "tests" / "katalogus" / "boefjes_test_dir"
+    kat_test = list(filter(lambda x: x.id == "kat_test", plugins)).pop()
+    assert kat_test.id == "kat_test"
+    assert kat_test.name == "Kat test name"
+    assert kat_test.consumes == {"DNSZone"}
+    assert set(kat_test.produces) == {"boefje/kat_test"}
 
-    return PluginService(
-        PluginStorageMemory(),
-        storage,
-        LocalPluginRepository(test_boefjes_dir),
-    )
+    kat_test_norm = list(filter(lambda x: x.id == "kat_test_normalize", plugins)).pop()
+    assert "kat_test_normalize" in kat_test_norm.id
+    assert kat_test_norm.consumes == ["text/html", "normalizer/kat_test_normalize"]
+    assert kat_test_norm.produces == []
 
 
-class TestPluginsService(TestCase):
-    def setUp(self) -> None:
-        self.organisation = "test"
-        self.service = mock_plugin_service(self.organisation)
+def test_get_plugin_by_id(mock_plugin_service, test_organisation):
+    plugin = mock_plugin_service.by_plugin_id("kat_test_normalize", test_organisation.id)
 
-    def test_get_plugins(self):
-        plugins = self.service.get_all(self.organisation)
+    assert plugin.id == "kat_test_normalize"
+    assert plugin.enabled is True
 
-        self.assertEqual(len(plugins), 5)
 
-        kat_test = list(filter(lambda x: x.id == "kat_test", plugins)).pop()
-        self.assertEqual("kat_test", kat_test.id)
-        self.assertEqual("Kat test name", kat_test.name)
-        self.assertEqual({"DNSZone"}, kat_test.consumes)
-        self.assertSetEqual({"boefje/kat_test"}, set(kat_test.produces))
+def test_update_by_id(mock_plugin_service, test_organisation):
+    mock_plugin_service.set_enabled_by_id("kat_test_normalize", test_organisation.id, False)
+    plugin = mock_plugin_service.by_plugin_id("kat_test_normalize", test_organisation.id)
+    assert plugin.enabled is False
 
-        kat_test_norm = list(filter(lambda x: x.id == "kat_test_normalize", plugins)).pop()
-        self.assertIn("kat_test_normalize", kat_test_norm.id)
-        self.assertListEqual(["text/html", "normalizer/kat_test_normalize"], kat_test_norm.consumes)
-        self.assertListEqual([], kat_test_norm.produces)
 
-    def test_get_plugin_by_id(self):
-        plugin = self.service.by_plugin_id("kat_test_normalize", self.organisation)
+def test_update_by_id_bad_schema(mock_plugin_service, test_organisation):
+    plugin_id = "kat_test"
 
-        self.assertEqual(plugin.id, "kat_test_normalize")
-        self.assertTrue(plugin.enabled)
+    mock_plugin_service.config_storage.upsert(test_organisation.id, plugin_id, {"api_key": 128 * "a"})
+    mock_plugin_service.set_enabled_by_id(plugin_id, test_organisation.id, True)
 
-    def test_update_by_id(self):
-        self.service.set_enabled_by_id("kat_test_normalize", self.organisation, False)
-        plugin = self.service.by_plugin_id("kat_test_normalize", self.organisation)
-        self.assertFalse(plugin.enabled)
+    with pytest.raises(SettingsNotConformingToSchema) as ctx:
+        mock_plugin_service.upsert_settings({"api_key": 129 * "a"}, test_organisation.id, plugin_id)
 
-    def test_update_by_id_bad_schema(self):
-        plugin_id = "kat_test"
+    msg = f"Settings for plugin kat_test are not conform the plugin schema: '{129 * 'a'}' is too long"
+    assert ctx.value.message == msg
 
-        with self.assertRaises(SettingsNotConformingToSchema) as ctx:
-            self.service.set_enabled_by_id(plugin_id, self.organisation, True)
 
-        msg = (
-            "Settings for organisation test and plugin kat_test are not conform the plugin schema: 'api_key' is a "
-            "required property"
-        )
-        self.assertEqual(ctx.exception.message, msg)
+def test_get_schema(mock_plugin_service):
+    schema = mock_plugin_service.schema("kat_test")
+    assert {
+        "title": "Arguments",
+        "type": "object",
+        "properties": {"api_key": {"title": "Api Key", "maxLength": 128, "type": "string"}},
+        "required": ["api_key"],
+    } == schema
 
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": 128 * "a"})
-        self.service.set_enabled_by_id(plugin_id, self.organisation, True)
+    schema = mock_plugin_service.schema("kat_test_normalize")
+    assert schema is None
 
-        value = 129 * "a"
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": 129 * "a"})
-        with self.assertRaises(SettingsNotConformingToSchema) as ctx:
-            self.service.set_enabled_by_id(plugin_id, self.organisation, True)
 
-        msg = (
-            f"Settings for organisation test and plugin kat_test are not conform the plugin schema: "
-            f"'{value}' is too long"
-        )
-        self.assertEqual(ctx.exception.message, msg)
+def test_removing_mandatory_setting_does_not_disable_plugin_anymore(mock_plugin_service, test_organisation):
+    plugin_id = "kat_test"
 
-    def test_get_schema(self):
-        schema = self.service.schema("kat_test")
-        self.assertDictEqual(
-            {
-                "title": "Arguments",
-                "type": "object",
-                "properties": {"api_key": {"title": "Api Key", "maxLength": 128, "type": "string"}},
-                "required": ["api_key"],
-            },
-            schema,
-        )
+    mock_plugin_service.config_storage.upsert(test_organisation.id, plugin_id, {"api_key": 128 * "a"})
+    mock_plugin_service.set_enabled_by_id(plugin_id, test_organisation.id, True)
 
-        schema = self.service.schema("kat_test_normalize")
-        self.assertIsNone(schema)
+    plugin = mock_plugin_service.by_plugin_id(plugin_id, test_organisation.id)
+    assert plugin.enabled is True
 
-    def test_removing_mandatory_setting_disables_plugin(self):
-        plugin_id = "kat_test"
+    mock_plugin_service.delete_settings(test_organisation.id, plugin_id)
 
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": 128 * "a"})
-        self.service.set_enabled_by_id(plugin_id, self.organisation, True)
+    plugin = mock_plugin_service.by_plugin_id(plugin_id, test_organisation.id)
+    assert plugin.enabled is True
 
-        plugin = self.service.by_plugin_id(plugin_id, self.organisation)
-        self.assertTrue(plugin.enabled)
 
-        self.service.delete_settings(self.organisation, plugin_id)
+def test_adding_integer_settings_within_given_constraints(mock_plugin_service, test_organisation):
+    plugin_id = "kat_test_2"
 
-        plugin = self.service.by_plugin_id(plugin_id, self.organisation)
-        self.assertFalse(plugin.enabled)
+    with pytest.raises(SettingsNotConformingToSchema) as ctx:
+        mock_plugin_service.upsert_settings({"api_key": "24"}, test_organisation.id, plugin_id)
 
-    def test_adding_integer_settings_within_given_constraints(self):
-        plugin_id = "kat_test_2"
+    assert "'24' is not of type 'integer'" in ctx.value.message
 
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": "24"})
+    mock_plugin_service.upsert_settings({"api_key": 24}, test_organisation.id, plugin_id)
+    mock_plugin_service.set_enabled_by_id(plugin_id, test_organisation.id, True)
 
-        with self.assertRaises(SettingsNotConformingToSchema) as ctx:
-            self.service.set_enabled_by_id(plugin_id, self.organisation, True)
+    plugin = mock_plugin_service.by_plugin_id(plugin_id, test_organisation.id)
+    assert plugin.enabled is True
+    mock_plugin_service.set_enabled_by_id(plugin_id, test_organisation.id, False)
 
-        self.assertIn("'24' is not of type 'integer'", ctx.exception.message)
 
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": 24})
+def test_clone_one_setting(mock_plugin_service, test_organisation):
+    new_org_id = "org2"
+    plugin_id = "kat_test"
+    mock_plugin_service.config_storage.upsert(test_organisation.id, plugin_id, {"api_key": "24"})
+    assert mock_plugin_service.get_all_settings(test_organisation.id, plugin_id) == {"api_key": "24"}
 
-        self.service.set_enabled_by_id(plugin_id, self.organisation, True)
+    mock_plugin_service.set_enabled_by_id(plugin_id, test_organisation.id, True)
 
-        plugin = self.service.by_plugin_id(plugin_id, self.organisation)
-        self.assertTrue(plugin.enabled)
-        self.service.set_enabled_by_id(plugin_id, self.organisation, False)
+    assert "api_key" not in mock_plugin_service.get_all_settings(new_org_id, plugin_id)
 
-    def test_clone_one_setting(self):
-        new_org_id = "org2"
-        plugin_id = "kat_test"
-        self.service.config_storage.upsert(self.organisation, plugin_id, {"api_key": "24"})
-        assert self.service.get_all_settings(self.organisation, plugin_id) == {"api_key": "24"}
+    new_org_plugins = mock_plugin_service.get_all(new_org_id)
+    assert len(new_org_plugins) == 14
+    assert len([x for x in new_org_plugins if x.enabled]) == 5  # 2 Normalizers
+    assert plugin_id not in [x.id for x in new_org_plugins if x.enabled]
 
-        self.service.set_enabled_by_id(plugin_id, self.organisation, True)
+    mock_plugin_service.clone_settings_to_organisation(test_organisation.id, new_org_id)
 
-        assert "api_key" not in self.service.get_all_settings(new_org_id, plugin_id)
+    assert mock_plugin_service.get_all_settings(test_organisation.id, plugin_id) == {"api_key": "24"}
+    assert mock_plugin_service.get_all_settings(new_org_id, plugin_id) == {"api_key": "24"}
 
-        new_org_plugins = self.service.get_all(new_org_id)
-        assert len(new_org_plugins) == 5
-        assert len([x for x in new_org_plugins if x.enabled]) == 2  # 2 Normalizers
-        assert plugin_id not in [x.id for x in new_org_plugins if x.enabled]
+    new_org_plugins = mock_plugin_service.get_all(new_org_id)
+    assert len(new_org_plugins) == 14
+    assert len([x for x in new_org_plugins if x.enabled]) == 6  # 2 Normalizers, 1 boefje
+    assert plugin_id in [x.id for x in new_org_plugins if x.enabled]
 
-        self.service.clone_settings_to_organisation(self.organisation, new_org_id)
 
-        assert self.service.get_all_settings(self.organisation, plugin_id) == {"api_key": "24"}
-        assert self.service.get_all_settings(new_org_id, plugin_id) == {"api_key": "24"}
+def test_clone_many_settings(mock_plugin_service, test_organisation):
+    plugin_id_1 = "kat_test"
 
-        new_org_plugins = self.service.get_all(new_org_id)
-        assert len(new_org_plugins) == 5
-        assert len([x for x in new_org_plugins if x.enabled]) == 3  # 2 Normalizers, 1 boefje
-        assert plugin_id in [x.id for x in new_org_plugins if x.enabled]
+    all_settings_1 = {"api_key": "123"}
+    mock_plugin_service.upsert_settings(all_settings_1, test_organisation.id, plugin_id_1)
+    mock_plugin_service.clone_settings_to_organisation(test_organisation.id, "org2")
 
-    def test_clone_many_settings(self):
-        plugin_id_1 = "kat_test"
-
-        all_settings_1 = {"api_key": "123"}
-        self.service.upsert_settings(all_settings_1, self.organisation, plugin_id_1)
-
-        self.service.clone_settings_to_organisation(self.organisation, "org2")
-
-        all_settings_for_new_org = self.service.get_all_settings("org2", plugin_id_1)
-        assert len(all_settings_for_new_org) == 1
-        assert all_settings_for_new_org == {"api_key": "123"}
+    all_settings_for_new_org = mock_plugin_service.get_all_settings("org2", plugin_id_1)
+    assert len(all_settings_for_new_org) == 1
+    assert all_settings_for_new_org == {"api_key": "123"}
diff --git a/boefjes/tests/katalogus/test_plugins_api.py b/boefjes/tests/katalogus/test_plugins_api.py
index 537e0ac81f2..e41ab2daf1a 100644
--- a/boefjes/tests/katalogus/test_plugins_api.py
+++ b/boefjes/tests/katalogus/test_plugins_api.py
@@ -1,145 +1,114 @@
-from unittest import TestCase
+def test_list(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {
+            "kat_test",
+            "kat_test_2",
+            "kat_test_4",
+            "kat_test_normalize",
+            "kat_test_normalize_2",
+        }
+    )
+
+
+def test_list_filter_by_type(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins?plugin_type=boefje")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {
+            "kat_test",
+            "kat_test_2",
+            "kat_test_4",
+        }
+    )
 
-from fastapi.testclient import TestClient
 
-from boefjes.dependencies.plugins import get_plugin_service
-from boefjes.katalogus.organisations import check_organisation_exists
-from boefjes.katalogus.root import app
-from boefjes.storage.interfaces import OrganisationNotFound
-from tests.katalogus.test_plugin_service import mock_plugin_service
+def test_list_filter_by_state(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins?state=true")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {
+            "kat_test_normalize",
+            "kat_test_normalize_2",
+        }
+    )
+    assert all([x["enabled"] for x in res.json()]) is True
 
 
-class TestPlugins(TestCase):
-    def setUp(self) -> None:
-        services = {
-            "test-org": mock_plugin_service("test-org"),
+def test_list_filter_by_id(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins?q=norm")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {
+            "kat_test_normalize",
+            "kat_test_normalize_2",
         }
+    )
+
+
+def test_list_pagination(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins?offset=2&limit=2&q=kat_")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {
+            "kat_test_4",
+            "kat_test_normalize",
+        }
+    )
+
+
+def test_list_plugins(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins")
+    assert res.status_code == 200
+    assert {x["id"] for x in res.json()}.issuperset(
+        {"kat_test", "kat_test_2", "kat_test_4", "kat_test_normalize", "kat_test_normalize_2"}
+    )
+
+
+def test_get_plugin(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins/kat_test")
+    assert res.status_code == 200
+    assert "produces" in res.json()
+    assert res.json()["produces"] == ["boefje/kat_test"]
+
+
+def test_non_existing_plugin(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins/future-plugin")
+    assert res.status_code == 404
+
+
+def test_default_enabled_property_list(unit_test_client):
+    res = unit_test_client.get("/v1/organisations/test/plugins?plugin_type=boefje")
+    assert res.status_code == 200
+    assert any([plugin["enabled"] for plugin in res.json()]) is False
+
+
+def test_patching_enabled_state(unit_test_client):
+    res = unit_test_client.patch(
+        "/v1/organisations/test/plugins/kat_test_normalize",
+        json={"enabled": False},
+    )
+    assert res.status_code == 204
+
+    res = unit_test_client.get("/v1/organisations/test/plugins")
+    assert res.status_code == 200
+    assert {plugin["id"]: plugin["enabled"] for plugin in res.json() if "kat_" in plugin["id"]} == {
+        "kat_test": False,
+        "kat_test_4": False,
+        "kat_test_2": False,
+        "kat_test_normalize": False,
+        "kat_test_normalize_2": True,
+    }
+
+
+def test_patching_enabled_state_non_existing_org(unit_test_client):
+    res = unit_test_client.patch(
+        "/v1/organisations/non-existing-org/plugins/kat_test_normalize",
+        json={"enabled": False},
+    )
+
+    assert res.status_code == 404
 
-        def get_service(organisation_id: str):
-            if organisation_id in services:
-                return services.get(organisation_id)
-
-            raise OrganisationNotFound(organisation_id)
-
-        app.dependency_overrides[get_plugin_service] = get_service
-        app.dependency_overrides[check_organisation_exists] = lambda: None
-
-        self.client = TestClient(app)
-
-    def tearDown(self) -> None:
-        app.dependency_overrides = {}
-
-    def test_list(self):
-        res = self.client.get("/v1/organisations/test-org/plugins")
-        self.assertEqual(200, res.status_code)
-        self.assertSetEqual(
-            {
-                "kat_test",
-                "kat_test_2",
-                "kat_test_4",
-                "kat_test_normalize",
-                "kat_test_normalize_2",
-            },
-            {x["id"] for x in res.json()},
-        )
-
-    def test_list_filter_by_type(self):
-        res = self.client.get("/v1/organisations/test-org/plugins?plugin_type=boefje")
-        self.assertEqual(200, res.status_code)
-        self.assertSetEqual(
-            {
-                "kat_test",
-                "kat_test_2",
-                "kat_test_4",
-            },
-            {x["id"] for x in res.json()},
-        )
-
-    def test_list_filter_by_state(self):
-        res = self.client.get("/v1/organisations/test-org/plugins?state=true")
-        self.assertEqual(200, res.status_code)
-        plugins = res.json()
-        self.assertSetEqual(
-            {
-                "kat_test_normalize",
-                "kat_test_normalize_2",
-            },
-            {x["id"] for x in plugins},
-        )
-        self.assertTrue(all([x["enabled"] for x in plugins]))
-
-    def test_list_filter_by_id(self):
-        res = self.client.get("/v1/organisations/test-org/plugins?q=norm")
-        self.assertEqual(200, res.status_code)
-        self.assertSetEqual(
-            {
-                "kat_test_normalize",
-                "kat_test_normalize_2",
-            },
-            {x["id"] for x in (res.json())},
-        )
-
-    def test_list_pagination(self):
-        res = self.client.get("/v1/organisations/test-org/plugins?offset=2&limit=2")
-        self.assertEqual(200, res.status_code)
-        self.assertSetEqual(
-            {
-                "kat_test_4",
-                "kat_test_normalize",
-            },
-            {x["id"] for x in (res.json())},
-        )
-
-    def test_list_plugins(self):
-        res = self.client.get("/v1/organisations/test-org/plugins")
-        self.assertEqual(200, res.status_code)
-        self.assertListEqual(
-            ["kat_test", "kat_test_2", "kat_test_4", "kat_test_normalize", "kat_test_normalize_2"],
-            [x["id"] for x in res.json()],
-        )
-
-    def test_get_plugin(self):
-        res = self.client.get("/v1/organisations/test-org/plugins/kat_test")
-        self.assertEqual(200, res.status_code)
-        assert "produces" in res.json()
-        assert res.json()["produces"] == ["boefje/kat_test"]
-
-    def test_non_existing_plugin(self):
-        res = self.client.get("/v1/organisations/test-org/plugins/future-plugin")
-        self.assertEqual(404, res.status_code)
-
-    def test_default_enabled_property_list(self):
-        res = self.client.get("/v1/organisations/test-org/plugins?plugin_type=boefje")
-        self.assertEqual(200, res.status_code)
-        self.assertFalse(any([plugin["enabled"] for plugin in res.json()]))
-
-    def test_patching_enabled_state(self):
-        res = self.client.patch(
-            "/v1/organisations/test-org/plugins/kat_test_normalize",
-            json={"enabled": False},
-        )
-        self.assertEqual(204, res.status_code)
-
-        res = self.client.get("/v1/organisations/test-org/plugins")
-        self.assertEqual(200, res.status_code)
-        self.assertEqual(
-            {
-                "kat_test": False,
-                "kat_test_4": False,
-                "kat_test_2": False,
-                "kat_test_normalize": False,
-                "kat_test_normalize_2": True,
-            },
-            {plugin["id"]: plugin["enabled"] for plugin in res.json()},
-        )
-
-    def test_patching_enabled_state_non_existing_org(self):
-        res = self.client.patch(
-            "/v1/organisations/non-existing-org/plugins/kat_test_normalize",
-            json={"enabled": False},
-        )
-
-        self.assertEqual(404, res.status_code)
-
-        res = self.client.get("/v1/organisations/non-existing-org/plugins")
-        self.assertEqual(404, res.status_code)
+    res = unit_test_client.get("/v1/organisations/non-existing-org/plugins")
+    assert res.status_code == 404
diff --git a/boefjes/tests/katalogus/test_settings.py b/boefjes/tests/katalogus/test_settings.py
index 603f6e88958..56cd442af3f 100644
--- a/boefjes/tests/katalogus/test_settings.py
+++ b/boefjes/tests/katalogus/test_settings.py
@@ -1,23 +1,20 @@
 import base64
-from unittest import TestCase
 
 from nacl.public import PrivateKey
 
 from boefjes.dependencies.encryption import NaclBoxMiddleware
 
 
-class TestSettingsEncryption(TestCase):
-    def setUp(self) -> None:
-        sk = PrivateKey.generate()
-        sk_b64 = base64.b64encode(bytes(sk)).decode()
-        pub_b64 = base64.b64encode(bytes(sk.public_key)).decode()
-        self.encryption = NaclBoxMiddleware(private_key=sk_b64, public_key=pub_b64)
+def test_encode_decode():
+    sk = PrivateKey.generate()
+    sk_b64 = base64.b64encode(bytes(sk)).decode()
+    pub_b64 = base64.b64encode(bytes(sk.public_key)).decode()
+    nacl_box_middleware = NaclBoxMiddleware(private_key=sk_b64, public_key=pub_b64)
 
-    def test_encode_decode(self):
-        msg = "The president is taking the underpass"
+    msg = "The president is taking the underpass"
 
-        encrypted = self.encryption.encode(msg)
-        decrypted = self.encryption.decode(encrypted)
+    encrypted = nacl_box_middleware.encode(msg)
+    decrypted = nacl_box_middleware.decode(encrypted)
 
-        self.assertNotEqual(encrypted, msg)
-        self.assertEqual(msg, decrypted)
+    assert encrypted != msg
+    assert decrypted == msg
diff --git a/boefjes/tests/modules/dummy_bad_normalizer_dict_structure/normalizer.json b/boefjes/tests/modules/dummy_bad_normalizer_dict_structure/normalizer.json
index cbfb74cfd32..fe23b0855ae 100644
--- a/boefjes/tests/modules/dummy_bad_normalizer_dict_structure/normalizer.json
+++ b/boefjes/tests/modules/dummy_bad_normalizer_dict_structure/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "dummy_bad_normalizer_dict_structure",
+  "name": "dummy_bad_normalizer_dict_structure",
   "description": "",
   "consumes": [],
   "produces": []
diff --git a/boefjes/tests/modules/dummy_bad_normalizer_return_type/normalizer.json b/boefjes/tests/modules/dummy_bad_normalizer_return_type/normalizer.json
index f0060d3b12e..8bcee7c4327 100644
--- a/boefjes/tests/modules/dummy_bad_normalizer_return_type/normalizer.json
+++ b/boefjes/tests/modules/dummy_bad_normalizer_return_type/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "dummy_bad_normalizer_return_type",
+  "name": "dummy_bad_normalizer_return_type",
   "description": "",
   "consumes": [],
   "produces": []
diff --git a/boefjes/tests/modules/dummy_boefje/boefje.json b/boefjes/tests/modules/dummy_boefje/boefje.json
index 791539e798f..81b94057368 100644
--- a/boefjes/tests/modules/dummy_boefje/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_boefje_environment/boefje.json b/boefjes/tests/modules/dummy_boefje_environment/boefje.json
index 838cef1dae7..2ad7fdddefa 100644
--- a/boefjes/tests/modules/dummy_boefje_environment/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje_environment/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_boefje_environment_with_pycache/boefje.json b/boefjes/tests/modules/dummy_boefje_environment_with_pycache/boefje.json
index 28f7090b2f0..009f2116c0f 100644
--- a/boefjes/tests/modules/dummy_boefje_environment_with_pycache/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje_environment_with_pycache/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_boefje_invalid_signature/boefje.json b/boefjes/tests/modules/dummy_boefje_invalid_signature/boefje.json
index 47f325f09e9..3fca5d08ce7 100644
--- a/boefjes/tests/modules/dummy_boefje_invalid_signature/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje_invalid_signature/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_boefje_missing_run/boefje.json b/boefjes/tests/modules/dummy_boefje_missing_run/boefje.json
index 838cef1dae7..2ad7fdddefa 100644
--- a/boefjes/tests/modules/dummy_boefje_missing_run/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje_missing_run/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_boefje_runtime_exception/boefje.json b/boefjes/tests/modules/dummy_boefje_runtime_exception/boefje.json
index 197a6aa43f0..e7dcc24f271 100644
--- a/boefjes/tests/modules/dummy_boefje_runtime_exception/boefje.json
+++ b/boefjes/tests/modules/dummy_boefje_runtime_exception/boefje.json
@@ -3,6 +3,5 @@
   "name": "dummy",
   "description": "",
   "consumes": [],
-  "produces": [],
-  "environment_keys": []
+  "produces": []
 }
diff --git a/boefjes/tests/modules/dummy_normalizer/normalizer.json b/boefjes/tests/modules/dummy_normalizer/normalizer.json
index a6447d09407..4347a7a0b47 100644
--- a/boefjes/tests/modules/dummy_normalizer/normalizer.json
+++ b/boefjes/tests/modules/dummy_normalizer/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "dummy_normalizer",
+  "name": "dummy_normalizer",
   "description": "",
   "consumes": [],
   "produces": []
diff --git a/boefjes/tests/modules/dummy_normalizer_import_error/normalizer.json b/boefjes/tests/modules/dummy_normalizer_import_error/normalizer.json
index a6447d09407..4347a7a0b47 100644
--- a/boefjes/tests/modules/dummy_normalizer_import_error/normalizer.json
+++ b/boefjes/tests/modules/dummy_normalizer_import_error/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "dummy_normalizer",
+  "name": "dummy_normalizer",
   "description": "",
   "consumes": [],
   "produces": []
diff --git a/boefjes/tests/modules/dummy_oci_boefje_no_main/boefje.json b/boefjes/tests/modules/dummy_oci_boefje_no_main/boefje.json
index 2ef96a5e2da..6e8c1bc69b3 100644
--- a/boefjes/tests/modules/dummy_oci_boefje_no_main/boefje.json
+++ b/boefjes/tests/modules/dummy_oci_boefje_no_main/boefje.json
@@ -4,6 +4,5 @@
   "description": "",
   "consumes": [],
   "produces": [],
-  "environment_keys": [],
   "oci_image": "openkat/test"
 }
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/__init__.py b/boefjes/tests/modules/kat_test/__init__.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/__init__.py
rename to boefjes/tests/modules/kat_test/__init__.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/boefje.json b/boefjes/tests/modules/kat_test/boefje.json
similarity index 83%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/boefje.json
rename to boefjes/tests/modules/kat_test/boefje.json
index 518d9804e4b..321d8541364 100644
--- a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/boefje.json
+++ b/boefjes/tests/modules/kat_test/boefje.json
@@ -5,6 +5,5 @@
   "consumes": [
     "DNSZone"
   ],
-  "environment_keys": [],
   "scan_level": 1
 }
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/__init__.py b/boefjes/tests/modules/kat_test/kat_test_2/__init__.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/__init__.py
rename to boefjes/tests/modules/kat_test/kat_test_2/__init__.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/boefje.json b/boefjes/tests/modules/kat_test/kat_test_2/boefje.json
similarity index 87%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/boefje.json
rename to boefjes/tests/modules/kat_test/kat_test_2/boefje.json
index 07c01db4d21..67dc80c70bf 100644
--- a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/boefje.json
+++ b/boefjes/tests/modules/kat_test/kat_test_2/boefje.json
@@ -8,6 +8,5 @@
   "produces": [
     "text/html"
   ],
-  "environment_keys": [],
   "scan_level": 1
 }
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/__init__.py b/boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/__init__.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/__init__.py
rename to boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/__init__.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/normalize.py b/boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/normalize.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/normalize.py
rename to boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/normalize.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/normalizer.json b/boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/normalizer.json
similarity index 80%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/normalizer.json
rename to boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/normalizer.json
index 0613a485c0a..25d874aa2d0 100644
--- a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/normalizer.json
+++ b/boefjes/tests/modules/kat_test/kat_test_2/kat_test_3/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "kat_test_normalize_2",
+  "name": "Test normalizer 2",
   "description": "Testing KAT 2",
   "consumes": [
     "text/html"
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/main.py b/boefjes/tests/modules/kat_test/kat_test_2/main.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/main.py
rename to boefjes/tests/modules/kat_test/kat_test_2/main.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/schema.json b/boefjes/tests/modules/kat_test/kat_test_2/schema.json
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/schema.json
rename to boefjes/tests/modules/kat_test/kat_test_2/schema.json
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/__init__.py b/boefjes/tests/modules/kat_test/kat_test_4/__init__.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_2/kat_test_3/__init__.py
rename to boefjes/tests/modules/kat_test/kat_test_4/__init__.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/boefje.json b/boefjes/tests/modules/kat_test/kat_test_4/boefje.json
similarity index 87%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/boefje.json
rename to boefjes/tests/modules/kat_test/kat_test_4/boefje.json
index b00b312a437..d419ffd073f 100644
--- a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/boefje.json
+++ b/boefjes/tests/modules/kat_test/kat_test_4/boefje.json
@@ -8,6 +8,5 @@
   "produces": [
     "text/html"
   ],
-  "environment_keys": [],
   "scan_level": 1
 }
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/schema.json b/boefjes/tests/modules/kat_test/kat_test_4/schema.json
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/schema.json
rename to boefjes/tests/modules/kat_test/kat_test_4/schema.json
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/main.py b/boefjes/tests/modules/kat_test/main.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/main.py
rename to boefjes/tests/modules/kat_test/main.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/normalize.py b/boefjes/tests/modules/kat_test/normalize.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/normalize.py
rename to boefjes/tests/modules/kat_test/normalize.py
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/normalizer.json b/boefjes/tests/modules/kat_test/normalizer.json
similarity index 80%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/normalizer.json
rename to boefjes/tests/modules/kat_test/normalizer.json
index 7b7ddc26ade..20e18b975b6 100644
--- a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/normalizer.json
+++ b/boefjes/tests/modules/kat_test/normalizer.json
@@ -1,5 +1,6 @@
 {
   "id": "kat_test_normalize",
+  "name": "Test normalizer",
   "description": "Testing KAT",
   "consumes": [
     "text/html"
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/schema.json b/boefjes/tests/modules/kat_test/schema.json
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/schema.json
rename to boefjes/tests/modules/kat_test/schema.json
diff --git a/boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/__init__.py b/boefjes/tests/plugins/__init__.py
similarity index 100%
rename from boefjes/tests/katalogus/boefjes_test_dir/kat_test/kat_test_4/__init__.py
rename to boefjes/tests/plugins/__init__.py
diff --git a/boefjes/tests/plugins/test_adr_validator.py b/boefjes/tests/plugins/test_adr_validator.py
new file mode 100644
index 00000000000..2bc6da84b8b
--- /dev/null
+++ b/boefjes/tests/plugins/test_adr_validator.py
@@ -0,0 +1,49 @@
+from boefjes.job_models import NormalizerMeta
+from tests.loading import get_dummy_data
+
+
+def test_no_findings(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("adr-validator-normalize.json"))
+
+    raw = """[{"rule": "TEST-01", "passed": true, "message": ""}]"""
+    output = normalizer_runner.run(meta, bytes(raw, "UTF-8"))
+
+    assert len(output.observations) == 1
+
+    observation = output.observations[0]
+
+    assert len(observation.results) == 2
+
+    assert observation.results[0].object_type == "APIDesignRule"
+    assert observation.results[0].name == "TEST-01"
+    assert observation.results[1].object_type == "APIDesignRuleResult"
+    assert observation.results[1].message == ""
+    assert observation.results[1].passed is True
+
+
+def test_with_findings(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("adr-validator-normalize.json"))
+
+    raw = """[
+        {"rule": "TEST-01", "passed": true, "message": ""},
+        {"rule": "TEST-02", "passed": false, "message": "An error"},
+        {"rule": "TEST-02", "passed": true, "message": ""}
+    ]"""
+    output = normalizer_runner.run(meta, bytes(raw, "UTF-8"))
+
+    assert len(output.observations) == 1
+
+    observation = output.observations[0]
+    assert len(observation.results) == 8
+
+    assert observation.results[2].object_type == "APIDesignRule"
+    assert observation.results[2].name == "TEST-02"
+    assert observation.results[3].object_type == "APIDesignRuleResult"
+    assert observation.results[3].message == "An error"
+    assert observation.results[3].passed is False
+
+    assert observation.results[4].object_type == "ADRFindingType"
+    assert observation.results[4].id == "TEST-02"
+    assert observation.results[5].object_type == "Finding"
+    assert observation.results[5].description == "An error"
+    assert str(observation.results[5].finding_type) == "ADRFindingType|TEST-02"
diff --git a/boefjes/tests/plugins/test_answer_parser.py b/boefjes/tests/plugins/test_answer_parser.py
new file mode 100644
index 00000000000..9762a2683ad
--- /dev/null
+++ b/boefjes/tests/plugins/test_answer_parser.py
@@ -0,0 +1,24 @@
+import pytest
+from pydantic import ValidationError
+
+from boefjes.job_models import NormalizerMeta
+from tests.loading import get_dummy_data
+
+
+def test_config_yielded(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("answer-normalize.json"))
+
+    with pytest.raises(TypeError):
+        raw = '[{"key": "test"}]'
+        normalizer_runner.run(meta, bytes(raw, "UTF-8"))
+
+    with pytest.raises(ValidationError):
+        raw = '{"schema": "/bit/port-classification-ip", "answer": [{"key": "test"}]}'
+        normalizer_runner.run(meta, bytes(raw, "UTF-8"))
+
+    raw = '{"schema": "/bit/port-classification-ip", "answer": {"key": "test"}}'
+    output = normalizer_runner.run(meta, bytes(raw, "UTF-8"))
+
+    assert len(output.observations) == 1
+    assert len(output.observations[0].results) == 1
+    assert output.observations[0].results[0].object_type == "Config"
diff --git a/boefjes/tests/plugins/test_bodyimage.py b/boefjes/tests/plugins/test_bodyimage.py
new file mode 100644
index 00000000000..241c3cdb927
--- /dev/null
+++ b/boefjes/tests/plugins/test_bodyimage.py
@@ -0,0 +1,82 @@
+import json
+
+from requests.models import CaseInsensitiveDict, PreparedRequest, Response
+
+from boefjes.job_models import BoefjeMeta, NormalizerMeta
+from tests.loading import get_dummy_data
+
+
+def test_website_analysis(boefje_runner, mocker):
+    do_request_mock = mocker.patch("boefjes.plugins.kat_webpage_analysis.main.do_request", spec=Response)
+    meta = BoefjeMeta.model_validate_json(get_dummy_data("webpage-analysis.json"))
+
+    mock_response = Response()
+    mock_response._content = bytes(get_dummy_data("download_body"))
+    mock_response.request = mocker.MagicMock(spec=PreparedRequest())
+    mock_response.request.url = ""
+    mock_response.request.method = "GET"
+    mock_response.headers = CaseInsensitiveDict(json.loads(get_dummy_data("download_headers.json")))
+
+    do_request_mock.return_value = mock_response
+
+    output = boefje_runner.run(meta, {})
+
+    assert "openkat-http/response" in output[0][0]
+    assert "openkat-http/headers" in output[1][0]
+    assert "openkat-http/body" in output[2][0]
+
+
+def test_website_analysis_for_image(boefje_runner, mocker):
+    do_request_mock = mocker.patch("boefjes.plugins.kat_webpage_analysis.main.do_request", spec=Response)
+    meta = BoefjeMeta.model_validate_json(get_dummy_data("webpage-analysis.json"))
+
+    mock_response = Response()
+    mock_response._content = bytes(get_dummy_data("cat_image"))
+    mock_response.request = mocker.MagicMock(spec=PreparedRequest())
+    mock_response.request.url = ""
+    mock_response.request.method = "GET"
+    mock_response.headers = CaseInsensitiveDict(json.loads(get_dummy_data("download_image_headers.json")))
+
+    do_request_mock.return_value = mock_response
+
+    output = boefje_runner.run(meta, {})
+    assert "image/jpeg" in output[2][0]
+
+
+def test_body_image_normalizer(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("bodyimage-normalize.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("cat_image")).observations[0].results
+
+    assert len(output) == 1
+    assert {
+        "object_type": "ImageMetadata",
+        "primary_key": "ImageMetadata|internet|134.209.85.72|tcp|443|https|internet"
+        "|mispo.es|https|internet|mispo.es|443|/",
+        "resource": "HTTPResource|internet|134.209.85.72|tcp|443|https|internet"
+        "|mispo.es|https|internet|mispo.es|443|/",
+        "scan_profile": None,
+        "user_id": None,
+        "image_info": {
+            "format": "JPEG",
+            "frames": 1,
+            "height": 600,
+            "is_animated": False,
+            "mode": "RGB",
+            "size": (600, 600),
+            "width": 600,
+        },
+    } == output[0].dict()
+
+
+def test_body_normalizer(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("body-normalize.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("download_body")).observations[0].results
+
+    assert len(output) == 4
+
+    output_dicts = sorted([o.dict() for o in output], key=lambda x: x["primary_key"])
+
+    assert output_dicts[0]["primary_key"] == "URL|internet|http://placekitten.com/600/600"
+    assert output_dicts[1]["primary_key"] == "URL|internet|http://placekitten.com/600/600.webp"
+    assert output_dicts[2]["primary_key"] == "URL|internet|https://mispo.es/600/600"
+    assert output_dicts[3]["primary_key"] == "URL|internet|https://mispo.es/600/600.webp"
diff --git a/boefjes/tests/plugins/test_calvin.py b/boefjes/tests/plugins/test_calvin.py
new file mode 100644
index 00000000000..46d07957702
--- /dev/null
+++ b/boefjes/tests/plugins/test_calvin.py
@@ -0,0 +1,126 @@
+from boefjes.job_models import NormalizerMeta
+from octopoes.models.ooi.monitoring import Application
+from tests.loading import get_dummy_data
+
+
+def test_parse_user_changed(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("user-changed.json"))
+
+    assert len(output.declarations) == 8
+    assert {
+        "application": Application(name="organisation/env/app").reference,
+        "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1655979300000',
+        "event_title": "UC: User privilege monitoring",
+        "event_type": "ksql-usecase",
+        "meta_data": {
+            "_id": "62b43a6e69c14474a3773f8b",
+            "log_action_code": "U",
+            "log_count": 9.0,
+            "log_routing_key": "test_app.account_change",
+            "log_user_user_id": 1234.0,
+            "outbox_sent": None,
+            "windowKey": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1655979300000',
+            "window_emit": 1655978930000.0,
+            "window_end": 1655979300000.0,
+            "window_start": 1655975700000.0,
+        },
+        "object_type": "Incident",
+        "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
+        '"log_user_user_id":1234}-1655979300000',
+        "scan_profile": None,
+        "user_id": None,
+        "severity": "MEDIUM",
+    } == output.declarations[1].ooi.dict()
+
+    assert {
+        "application": Application(name="organisation/env/app").reference,
+        "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658825100000',
+        "event_title": "UC: User privilege monitoring",
+        "event_type": "ksql-usecase",
+        "meta_data": {
+            "_id": "62df9e499dd2b029d842576d",
+            "log_action_code": "U",
+            "log_count": 4.0,
+            "log_routing_key": "test_app.account_change",
+            "log_user_user_id": 1234.0,
+            "outbox_sent": None,
+            "windowKey": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658825100000',
+            "window_emit": 1658822215000.0,
+            "window_end": 1658825100000.0,
+            "window_start": 1658821500000.0,
+        },
+        "object_type": "Incident",
+        "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
+        '"log_user_user_id":1234}-1658825100000',
+        "scan_profile": None,
+        "user_id": None,
+        "severity": "MEDIUM",
+    } == output.declarations[-1].ooi.dict()
+
+
+def test_parse_admin_login_failure(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("user-login-admin-failure.json"))
+
+    assert len(output.declarations) == 8
+    assert {
+        "application": Application(name="organisation/env/app").reference,
+        "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1659618600000',
+        "event_title": "UC: Detect brute force login attempts for an admin account",
+        "event_type": "ksql-usecase",
+        "meta_data": {
+            "_id": "62ebc44c9dd2b029d84ac32a",
+            "log_action_code": "E",
+            "log_count": 3.0,
+            "log_object_result": 0.0,
+            "log_routing_key": "test_app.user_login",
+            "log_user_roles": "ADMIN,REGISTRATOR,SHIFT_MANAGER,CSV,KVTB_ADMIN,STATS",
+            "log_user_user_id": 1234.0,
+            "outbox_sent": True,
+            "windowKey": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1659618600000',
+            "window_emit": 1659618378000.0,
+            "window_end": 1659618600000.0,
+            "window_start": 1659617700000.0,
+        },
+        "object_type": "Incident",
+        "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
+        '"log_user_user_id":1234}-1659618600000',
+        "scan_profile": None,
+        "user_id": None,
+        "severity": "MEDIUM",
+    } == output.declarations[1].ooi.dict()
+
+
+def test_parse_user_login_failure(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("user-login-failure.json"))
+
+    assert len(output.declarations) == 8
+    assert {
+        "application": Application(name="organisation/env/app").reference,
+        "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658998200000',
+        "event_title": "UC: Detects attempts to guess passwords",
+        "event_type": "ksql-usecase",
+        "meta_data": {
+            "_id": "62e24d509dd2b029d84391fb",
+            "log_action_code": "E",
+            "log_count": 10.0,
+            "log_object_result": 0.0,
+            "log_object_user_id": None,
+            "log_result": None,
+            "log_routing_key": "test_app.user_login",
+            "log_user_user_id": 1234.0,
+            "outbox_sent": None,
+            "windowKey": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658998200000',
+            "window_emit": 1658998093000.0,
+            "window_end": 1658998200000.0,
+            "window_start": 1658996400000.0,
+        },
+        "object_type": "Incident",
+        "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
+        '"log_user_user_id":1234}-1658998200000',
+        "scan_profile": None,
+        "user_id": None,
+        "severity": "MEDIUM",
+    } == output.declarations[1].ooi.dict()
diff --git a/boefjes/tests/plugins/test_cve-2023-35078.py b/boefjes/tests/plugins/test_cve-2023-35078.py
new file mode 100644
index 00000000000..589b1e81339
--- /dev/null
+++ b/boefjes/tests/plugins/test_cve-2023-35078.py
@@ -0,0 +1,45 @@
+from boefjes.plugins.kat_cve_2023_35078.normalize import VULNERABLE_RANGES, is_vulnerable_version, run
+from packaging import version
+from tests.loading import get_dummy_data
+
+
+def test_vulnerable_version_11_8():
+    detected_version = version.parse("11.8.0.0")
+    vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
+    assert is_vulnerable_version(vulnerable_ranges, detected_version) is True
+
+
+def test_vulnerable_version_11_9():
+    detected_version = version.parse("11.9.1.0")
+    vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
+    assert is_vulnerable_version(vulnerable_ranges, detected_version) is True
+
+
+def test_vulnerable_version_11_10():
+    detected_version = version.parse("11.10.0.1")
+    vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
+    assert is_vulnerable_version(vulnerable_ranges, detected_version) is True
+
+
+def test_patched_version_11_9():
+    detected_version = version.parse("11.9.2.0")
+    vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
+    assert is_vulnerable_version(vulnerable_ranges, detected_version) is False
+
+
+def test_equal_to_patched_version_11_9():
+    detected_version = version.parse("11.9.1.1")
+    vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
+    assert is_vulnerable_version(vulnerable_ranges, detected_version) is False
+
+
+def test_cve_2023_35078_vulnerable(mocker):
+    oois = set(run(mocker.MagicMock(), get_dummy_data("cve_2023_35078_vulnerable.html")))
+
+    assert any(ooi.object_type == "Finding" for ooi in oois)
+
+
+def test_cve_2023_35078_not_vulnerable(mocker):
+    oois = set(run(mocker.MagicMock(), get_dummy_data("cve_2023_35078_not_vulnerable.html")))
+
+    assert not any(ooi.object_type == "Finding" for ooi in oois)
diff --git a/boefjes/tests/test_cve-2024-6387.py b/boefjes/tests/plugins/test_cve-2024-6387.py
similarity index 100%
rename from boefjes/tests/test_cve-2024-6387.py
rename to boefjes/tests/plugins/test_cve-2024-6387.py
diff --git a/boefjes/tests/plugins/test_cve_finding_types.py b/boefjes/tests/plugins/test_cve_finding_types.py
new file mode 100644
index 00000000000..c6a53152193
--- /dev/null
+++ b/boefjes/tests/plugins/test_cve_finding_types.py
@@ -0,0 +1,87 @@
+from boefjes.job_models import NormalizerAffirmation
+from boefjes.plugins.kat_cve_finding_types.normalize import run
+from octopoes.models.ooi.findings import RiskLevelSeverity
+from octopoes.models.types import CVEFindingType
+from tests.loading import get_dummy_data
+
+
+def test_cve_with_cvss():
+    input_ooi = {"id": "CVE-2021-46882"}
+
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/cve-result-with-cvss.json"),
+        )
+    )
+
+    expected = [
+        NormalizerAffirmation(
+            ooi=CVEFindingType(
+                id="CVE-2021-46882",
+                description="The video framework has memory overwriting caused by addition overflow. "
+                "Successful exploitation of this vulnerability may affect availability.",
+                source="https://cve.circl.lu/cve/CVE-2021-46882",
+                risk_severity=RiskLevelSeverity.HIGH,
+                risk_score=7.5,
+            )
+        )
+    ]
+
+    assert expected == oois
+
+
+def test_cve_with_cvss2():
+    input_ooi = {"id": "CVE-2016-0616"}
+
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/cve-result-with-cvss2.json"),
+        )
+    )
+
+    expected = [
+        NormalizerAffirmation(
+            ooi=CVEFindingType(
+                id="CVE-2016-0616",
+                description="Unspecified vulnerability in Oracle MySQL 5.5.46 and earlier and MariaDB before "
+                "5.5.47, 10.0.x before 10.0.23, and 10.1.x before 10.1.10 allows remote authenticated users "
+                "to affect availability via unknown vectors related to Optimizer.",
+                source="https://cve.circl.lu/cve/CVE-2016-0616",
+                risk_severity=RiskLevelSeverity.MEDIUM,
+                risk_score=4.0,
+            )
+        )
+    ]
+
+    assert expected == oois
+
+
+def test_cve_without_cvss():
+    input_ooi = {"id": "CVE-2021-46882"}
+
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/cve-result-without-cvss.json"),
+        )
+    )
+
+    expected = [
+        NormalizerAffirmation(
+            ooi=CVEFindingType(
+                id="CVE-2021-46882",
+                description="The Nested Pages plugin for WordPress is vulnerable to unauthorized loss of "
+                "data due to a missing capability check on the 'reset' function in versions up to, and including, "
+                "3.2.3. This makes it possible for authenticated attackers, "
+                "with editor-level permissions and above, "
+                "to reset plugin settings.",
+                source="https://cve.circl.lu/cve/CVE-2021-46882",
+                risk_severity=RiskLevelSeverity.UNKNOWN,
+                risk_score=None,
+            ),
+        )
+    ]
+
+    assert expected == oois
diff --git a/boefjes/tests/plugins/test_dns.py b/boefjes/tests/plugins/test_dns.py
new file mode 100644
index 00000000000..063b666664d
--- /dev/null
+++ b/boefjes/tests/plugins/test_dns.py
@@ -0,0 +1,480 @@
+import uuid
+from ipaddress import IPv4Address, IPv6Address
+
+import pytest
+from pydantic import BaseModel
+
+from boefjes.job_models import Boefje, BoefjeMeta, Normalizer, NormalizerMeta, ObservationsWithoutInputOOI, RawDataMeta
+from octopoes.models import Reference
+from octopoes.models.ooi.dns.records import (
+    DNSAAAARecord,
+    DNSARecord,
+    DNSCNAMERecord,
+    DNSMXRecord,
+    DNSNSRecord,
+    DNSSOARecord,
+    DNSTXTRecord,
+)
+from octopoes.models.ooi.dns.zone import DNSZone, Hostname
+from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, Network
+from tests.loading import get_dummy_data
+
+
+def test_dns_normalizer(normalizer_runner):
+    internet = Network(name="internet")
+
+    zone_hostname = Hostname(name="example.nl", network=internet.reference)
+    zone = DNSZone(hostname=zone_hostname.reference)
+    zone_hostname.dns_zone = zone.reference
+
+    ip_v4_addresses = [
+        IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35")),
+        IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.36")),
+    ]
+    dns_a_records = [
+        DNSARecord(
+            hostname=zone_hostname.reference,
+            value=str(ip.address),
+            address=ip.reference,
+            ttl=14364,
+        )
+        for ip in ip_v4_addresses
+    ]
+    ip_v6_addresses = [
+        IPAddressV6(
+            network=internet.reference,
+            address=IPv6Address("2a00:d78:0:712:94:198:159:35"),
+        ),
+        IPAddressV6(
+            network=internet.reference,
+            address=IPv6Address("2a00:d78:0:712:94:198:159:36"),
+        ),
+    ]
+    dns_aaaa_records = [
+        DNSAAAARecord(
+            hostname=zone_hostname.reference,
+            value=str(ip.address),
+            address=ip.reference,
+            ttl=14400,
+        )
+        for ip in ip_v6_addresses
+    ]
+    dns_txt_records = [
+        DNSTXTRecord(
+            hostname=zone_hostname.reference,
+            value="v=spf1 redirect=spf-a.example.nl",
+            ttl=14400,
+        )
+    ]
+
+    mx_hostnames = [
+        Hostname(
+            network=internet.reference,
+            name="mail.example.nl",
+        ),
+        Hostname(
+            network=internet.reference,
+            name="mail2.example.nl",
+        ),
+    ]
+    dns_mx_records = [
+        DNSMXRecord(
+            hostname=zone_hostname.reference,
+            value=f"10 {mx_rec.name}.",
+            ttl=14400,
+            mail_hostname=mx_rec.reference,
+            preference=10,
+        )
+        for mx_rec in mx_hostnames
+    ]
+
+    ns_hostnames = [
+        Hostname(name=value, network=internet.reference)
+        for value in [
+            "ns3.examplenl.org",
+            "ns1.examplenl.nl",
+            "ns2.examplenl.eu",
+            "ns0.examplenl.com",
+        ]
+    ]
+
+    ns_records = [
+        DNSNSRecord(
+            hostname=zone_hostname.reference,
+            value=ns_hostname.name + ".",
+            name_server_hostname=ns_hostname.reference,
+            ttl=2634,
+        )
+        for ns_hostname in ns_hostnames
+    ]
+
+    soa_hostname = Hostname(
+        network=internet.reference,
+        name="ns1.examplenl.nl",
+        dns_zone=zone.reference,
+    )
+    soa_record = DNSSOARecord(
+        hostname=zone_hostname.reference,
+        value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
+        soa_hostname=soa_hostname.reference,
+        ttl=14340,
+        serial=2021111101,
+        retry=7200,
+        refresh=14400,
+        expire=1209600,
+        minimum=86400,
+    )
+
+    # noinspection PyTypeChecker
+    expected = (
+        [zone_hostname, zone]
+        + ip_v4_addresses
+        + dns_a_records
+        + ip_v6_addresses
+        + dns_aaaa_records
+        + dns_txt_records
+        + mx_hostnames
+        + dns_mx_records
+        + ns_hostnames
+        + ns_records
+        + [soa_record]
+    )
+
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
+    results = normalizer_runner.run(meta, get_dummy_data("inputs/dns-result-example.nl.json"))
+
+    assert len(results.observations) == 1
+    assert len(list(map(BaseModel.model_dump, expected))) == len(
+        list(map(BaseModel.model_dump, results.observations[0].results))
+    )
+
+
+def test_dns_normalizer_cname(normalizer_runner):
+    internet = Network(name="internet")
+
+    zone_hostname = Hostname(
+        network=internet.reference,
+        name="example.nl",
+    )
+    zone = DNSZone(
+        hostname=zone_hostname.reference,
+    )
+    zone_hostname.dns_zone = zone.reference
+
+    input_hostname = Hostname(
+        network=internet.reference,
+        name="www.example.nl",
+        dns_zone=zone.reference,
+    )
+    cname_target = Hostname(
+        network=internet.reference,
+        name="webredir.examplenl.nl",
+    )
+
+    soa_hostname = Hostname(network=internet.reference, name="ns1.examplenl.nl")
+    soa_record = DNSSOARecord(
+        hostname=zone_hostname.reference,
+        value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
+        ttl=14340,
+        soa_hostname=soa_hostname.reference,
+        serial=2021111101,
+        refresh=14400,
+        retry=7200,
+        expire=1209600,
+        minimum=86400,
+    )
+
+    cname_record = DNSCNAMERecord(
+        hostname=input_hostname.reference,
+        value=cname_target.name + ".",
+        ttl=10800,
+        target_hostname=cname_target.reference,
+    )
+
+    ip_address = IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35"))
+    dns_a_record = DNSARecord(
+        hostname=cname_target.reference,
+        address=ip_address.reference,
+        value=str(ip_address.address),
+        ttl=10800,
+    )
+
+    expected = [
+        zone,
+        zone_hostname,
+        soa_hostname,
+        soa_record,
+        cname_target,
+        cname_record,
+        ip_address,
+        dns_a_record,
+        input_hostname,
+    ]
+
+    meta = NormalizerMeta(
+        id=uuid.UUID("72c7d302-0d6f-407a-aaec-9ffcad0ee7c6"),
+        normalizer=Normalizer(id="kat_dns_normalize"),
+        raw_data=RawDataMeta(
+            id=uuid.UUID("3b8397ba-50e4-476e-834a-2fa2595a43a5"),
+            boefje_meta=BoefjeMeta(
+                id=uuid.UUID("10535bba-2715-42f9-be47-ccd985b59eea"),
+                boefje=Boefje(id="dns-records"),
+                organization="_dev",
+                input_ooi="Hostname|internet|www.example.nl",
+                arguments={
+                    "domain": "www.example.nl.",
+                    "input": {"name": "www.example.nl."},
+                },
+            ),
+            mime_types=[{"value": "boefje/dns-records"}],
+        ),
+    )
+
+    results = normalizer_runner.run(meta, get_dummy_data("inputs/dns-result-www.example.nl.json"))
+    assert len(list(map(BaseModel.model_dump, expected))) == len(
+        list(map(BaseModel.model_dump, results.observations[0].results))
+    )
+
+
+def test_parse_record_null_mx_record(normalizer_runner):
+    meta = NormalizerMeta(
+        id=uuid.UUID("d7d65462-5ced-4a57-a1d7-c6d2edf38354"),
+        normalizer=Normalizer(id="kat_dns_normalize"),
+        raw_data=RawDataMeta(
+            id=uuid.UUID("94fe3b47-fb41-4ad7-b2de-1bfe63460c98"),
+            boefje_meta=BoefjeMeta(
+                id=uuid.UUID("f1e72e47-c11f-47e9-953a-52e3b6833eaf"),
+                boefje=Boefje(id="dns-records"),
+                organization="_dev",
+                input_ooi="Hostname|internet|english.example.nl",
+                arguments={
+                    "domain": "english.example.nl",
+                    "input": {"name": "english.example.nl"},
+                },
+            ),
+            mime_types=[{"value": "boefje/dns-records"}],
+        ),
+    )
+
+    answer = get_dummy_data("inputs/dns-result-mx-example.nl.json")
+
+    internet = Network(name="internet")
+    input_hostname = Hostname(
+        network=internet.reference,
+        name="english.example.nl",
+    )
+
+    cname_target = Hostname(network=internet.reference, name="redir.example.nl")
+    cname_record = DNSCNAMERecord(
+        hostname=input_hostname.reference,
+        value="redir.example.nl.",
+        ttl=60,
+        target_hostname=cname_target.reference,
+    )
+    mx_record = DNSMXRecord(
+        hostname=cname_target.reference,
+        value="0 .",
+        ttl=14400,
+        preference=0,
+    )
+
+    results = normalizer_runner.run(meta, answer)
+
+    expected = [cname_target, cname_record, mx_record, input_hostname]
+    assert len(list(map(BaseModel.model_dump, expected))) == len(
+        list(map(BaseModel.model_dump, results.observations[0].results))
+    )
+
+
+def test_parse_cname_soa(normalizer_runner):
+    internet = Network(name="internet")
+
+    zone_hostname = Hostname(
+        network=internet.reference,
+        name="example.com",
+    )
+    zone = DNSZone(
+        hostname=zone_hostname.reference,
+    )
+    zone_hostname.dns_zone = zone.reference
+
+    input_hostname = Hostname(
+        network=internet.reference,
+        name="www.example.com",
+        dns_zone=zone.reference,
+    )
+
+    cname_record = DNSCNAMERecord(
+        hostname=input_hostname.reference,
+        value="example.com.",
+        ttl=60,
+        target_hostname=zone_hostname.reference,
+    )
+    ip_address = IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35"))
+    a_record = DNSARecord(
+        hostname=zone_hostname.reference,
+        address=ip_address.reference,
+        value=str(ip_address.address),
+        ttl=60,
+    )
+    soa_hostname = Hostname(network=internet.reference, name="ns.icann.org")
+    ns_hostnames = [
+        Hostname(name=value, network=internet.reference)
+        for value in [
+            "a.iana-servers.net",
+            "b.iana-servers.net",
+        ]
+    ]
+    ns_records = [
+        DNSNSRecord(
+            hostname=zone_hostname.reference,
+            value=ns_hostname.name + ".",
+            name_server_hostname=ns_hostname.reference,
+            ttl=60,
+        )
+        for ns_hostname in ns_hostnames
+    ]
+    soa_record = DNSSOARecord(
+        hostname=zone_hostname.reference,
+        value="ns.icann.org. noc.dns.icann.org. 2022040432 7200 3600 1209600 3600",
+        ttl=21,
+        soa_hostname=soa_hostname.reference,
+        serial=2022040432,
+        retry=3600,
+        refresh=7200,
+        expire=1209600,
+        minimum=3600,
+    )
+    txt_record = DNSTXTRecord(
+        hostname=zone_hostname.reference,
+        value="v=spf1 -all",
+        ttl=60,
+    )
+    mx_record = DNSMXRecord(
+        hostname=zone_hostname.reference,
+        value="0 example.com.",
+        ttl=60,
+        mail_hostname=zone_hostname.reference,
+        preference=0,
+    )
+
+    meta = NormalizerMeta(
+        id=uuid.UUID("a2a85d54-a6ce-495d-b7a5-23c1a79f4cec"),
+        normalizer=Normalizer(id="kat_dns_normalize"),
+        raw_data=RawDataMeta(
+            id=uuid.UUID("ac481bc2-a524-4dcc-91a4-28ed9c2c142b"),
+            boefje_meta=BoefjeMeta(
+                id=uuid.UUID("0671b9ac-1624-4c09-a94a-4f9edbc40064"),
+                boefje=Boefje(id="dns-records"),
+                organization="_dev",
+                input_ooi="Hostname|internet|www.example.com",
+                arguments={
+                    "domain": "www.example.com",
+                    "input": {"name": "www.example.com"},
+                },
+            ),
+            mime_types=[{"value": "boefje/dns-records"}],
+        ),
+    )
+
+    results = normalizer_runner.run(meta, get_dummy_data("inputs/dns-result-example.com-cnames.json"))
+
+    expected = (
+        [
+            zone,
+            zone_hostname,
+            cname_record,
+            ip_address,
+            a_record,
+            soa_record,
+            txt_record,
+            mx_record,
+            input_hostname,
+            soa_hostname,
+        ]
+        + ns_hostnames
+        + ns_records
+    )
+    assert len(list(map(BaseModel.model_dump, expected))) == len(
+        list(map(BaseModel.model_dump, results.observations[0].results))
+    )
+
+
+def test_find_parent_dns_zone(normalizer_runner):
+    internet = Network(name="internet")
+
+    requested_zone = DNSZone(
+        hostname=Hostname(
+            network=internet.reference,
+            name="sub.example.nl",
+        ).reference
+    )
+    parent_zone_hostname = Hostname(
+        network=internet.reference,
+        name="example.nl",
+    )
+    parent_zone = DNSZone(hostname=parent_zone_hostname.reference)
+    parent_zone_hostname.dns_zone = parent_zone.reference
+
+    requested_zone.parent = parent_zone.reference
+
+    name_server_hostname = Hostname(
+        network=internet.reference,
+        name="ns1.examplenl.nl",
+    )
+
+    soa_record = DNSSOARecord(
+        hostname=parent_zone_hostname.reference,
+        value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
+        ttl=14340,
+        soa_hostname=name_server_hostname.reference,
+        serial=2021111101,
+        retry=7200,
+        refresh=14400,
+        expire=1209600,
+        minimum=86400,
+    )
+
+    input_ = DNSZone(
+        hostname=Hostname(
+            network=Reference.from_str("Network|internet"),
+            name="sub.example.nl",
+        ).reference
+    ).serialize()
+
+    meta = NormalizerMeta(
+        id=uuid.UUID("ee8374bb-e79f-4083-9ce9-add4f96006f2"),
+        normalizer=Normalizer(id="kat_dns_zone_normalize"),
+        raw_data=RawDataMeta(
+            id=uuid.UUID("2147da2a-921c-4c51-aef3-fa82d8d6e089"),
+            boefje_meta=BoefjeMeta(
+                id=uuid.UUID("ff1f0d62-a2e0-480f-8b11-5fb24974edce"),
+                boefje=Boefje(id="dns-records"),
+                organization="_dev",
+                input_ooi="DnsZone|internet|sub.example.nl",
+                arguments={"input": input_},
+            ),
+            mime_types=[{"value": "boefje/dns-records"}],
+        ),
+    )
+
+    results = normalizer_runner.run(meta, get_dummy_data("inputs/dns-zone-result-sub.example.nl.txt"))
+
+    expected = [
+        requested_zone,
+        parent_zone,
+        parent_zone_hostname,
+        name_server_hostname,
+        soa_record,
+    ]
+    assert len(list(map(BaseModel.model_dump, expected))) == len(
+        list(map(BaseModel.model_dump, results.observations[0].results))
+    )
+
+
+def test_exception_raised_no_input_ooi(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
+    meta.raw_data.boefje_meta.input_ooi = None
+
+    with pytest.raises(ObservationsWithoutInputOOI):
+        normalizer_runner.run(meta, get_dummy_data("inputs/dns-result-example.nl.json"))
diff --git a/boefjes/tests/test_dnssec.py b/boefjes/tests/plugins/test_dnssec.py
similarity index 100%
rename from boefjes/tests/test_dnssec.py
rename to boefjes/tests/plugins/test_dnssec.py
diff --git a/boefjes/tests/test_fierce.py b/boefjes/tests/plugins/test_fierce.py
similarity index 100%
rename from boefjes/tests/test_fierce.py
rename to boefjes/tests/plugins/test_fierce.py
diff --git a/boefjes/tests/plugins/test_generic_finding_normalizer.py b/boefjes/tests/plugins/test_generic_finding_normalizer.py
new file mode 100644
index 00000000000..28fbbf7e51c
--- /dev/null
+++ b/boefjes/tests/plugins/test_generic_finding_normalizer.py
@@ -0,0 +1,44 @@
+from boefjes.plugins.kat_finding_normalizer.normalize import run
+from octopoes.models import Reference
+from octopoes.models.ooi.findings import KATFindingType
+from octopoes.models.types import CVEFindingType, Finding
+
+
+def test_single():
+    input_ooi = {"primary_key": "Network|internet"}
+
+    oois = list(run(input_ooi, b"CVE-2021-00000"))
+
+    expected = [
+        CVEFindingType(id="CVE-2021-00000"),
+        Finding(
+            finding_type=CVEFindingType(id="CVE-2021-00000").reference,
+            ooi=Reference.from_str("Network|internet"),
+            description="CVE-2021-00000 is found on this OOI",
+        ),
+    ]
+
+    assert expected == oois
+
+
+def test_multiple():
+    input_ooi = {"primary_key": "Network|internet"}
+
+    oois = list(run(input_ooi, b"CVE-2021-00000, KAT-MOCK-FINDING"))
+
+    expected = [
+        CVEFindingType(id="CVE-2021-00000"),
+        Finding(
+            finding_type=CVEFindingType(id="CVE-2021-00000").reference,
+            ooi=Reference.from_str("Network|internet"),
+            description="CVE-2021-00000 is found on this OOI",
+        ),
+        KATFindingType(id="KAT-MOCK-FINDING"),
+        Finding(
+            finding_type=KATFindingType(id="KAT-MOCK-FINDING").reference,
+            ooi=Reference.from_str("Network|internet"),
+            description="KAT-MOCK-FINDING is found on this OOI",
+        ),
+    ]
+
+    assert expected == oois
diff --git a/boefjes/tests/plugins/test_leakix.py b/boefjes/tests/plugins/test_leakix.py
new file mode 100644
index 00000000000..371df6d42c8
--- /dev/null
+++ b/boefjes/tests/plugins/test_leakix.py
@@ -0,0 +1,23 @@
+from pydantic import TypeAdapter
+
+from boefjes.plugins.kat_leakix.normalize import run
+from octopoes.models.types import OOIType
+from tests.loading import get_dummy_data
+
+
+def test_output():
+    input_ooi = TypeAdapter(OOIType).validate_python(
+        {
+            "object_type": "HostnameHTTPURL",
+            "network": "Network|internet",
+            "scheme": "https",
+            "port": 443,
+            "path": "/",
+            "netloc": "Hostname|internet|example.com",
+        },
+    )
+
+    output = [x for x in run(input_ooi.serialize(), get_dummy_data("raw/leakix-example.com.json"))]
+
+    assert len(output) == 170
+    assert str(output) == get_dummy_data("raw/leakix-example.com-output.txt").decode().strip()
diff --git a/boefjes/tests/plugins/test_manual.py b/boefjes/tests/plugins/test_manual.py
new file mode 100644
index 00000000000..93f9d37bb8c
--- /dev/null
+++ b/boefjes/tests/plugins/test_manual.py
@@ -0,0 +1,168 @@
+from pathlib import Path
+
+from pydantic_core import Url
+
+from boefjes.job_models import NormalizerMeta, NormalizerResults
+from boefjes.local import LocalNormalizerJobRunner
+from boefjes.local_repository import LocalPluginRepository
+from octopoes.models import Reference
+from tests.loading import get_dummy_data
+
+TEST_DECLARATIONS_DATA = (
+    b"["
+    b'{"ooi": {"object_type": "Network", "scan_profile": null, "user_id": null\
+    , "primary_key": "Network|net1", "name": "net1"}},'
+    b'{"ooi": {"object_type": "Network", "scan_profile": null, "user_id": null\
+    , "primary_key": "Network|net2", "name": "net2"}}'
+    b"]"
+)
+CSV_EXAMPLES = [
+    # hostname
+    b"name,network\nexample.com,internet",
+    # hostname without network
+    b"name\nexample.net",
+    # ipv4s
+    b"""address,network
+1.1.1.1,internet
+2.2.2.2,internet
+3.3.3.3,darknet""",
+    # ipv6s
+    b"""address,network
+FE80:CD00:0000:0CDE:1257:0000:211E:729C,internet
+FE80:CD00:0000:0CDE:1257:0000:211E:729D,darknet""",
+    # urls
+    b"""network,raw
+internet,https://example.com/
+darknet,https://openkat.nl/""",
+    # url without network
+    b"raw\nhttps://example.com/",
+]
+
+
+def test_parse_manual_declarations(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("manual-ooi.json"))
+    output = normalizer_runner.run(meta, TEST_DECLARATIONS_DATA)
+
+    assert len(output.declarations) == 2
+    assert len(output.observations) == 0
+
+    assert {
+        "name": "net1",
+        "object_type": "Network",
+        "primary_key": "Network|net1",
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[0].ooi.dict()
+    assert {
+        "name": "net2",
+        "object_type": "Network",
+        "primary_key": "Network|net2",
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[1].ooi.dict()
+
+
+def test_parse_manual_hostname_csv(normalizer_runner):
+    meta, output, runner = check_network_created(normalizer_runner, 0)
+
+    assert len(output.declarations) == 2
+    assert {
+        "dns_zone": None,
+        "name": "example.com",
+        "network": Reference("Network|internet"),
+        "object_type": "Hostname",
+        "primary_key": "Hostname|internet|example.com",
+        "registered_domain": None,
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[1].ooi.dict()
+
+    meta, output, runner = check_network_created(normalizer_runner, 1)
+
+    assert len(output.declarations) == 2
+    assert {
+        "dns_zone": None,
+        "name": "example.net",
+        "network": Reference("Network|internet"),
+        "object_type": "Hostname",
+        "primary_key": "Hostname|internet|example.net",
+        "registered_domain": None,
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[1].ooi.dict()
+
+
+def test_parse_manual_ip_csv(normalizer_runner):
+    meta, output, runner = check_network_created(normalizer_runner, 2)
+    assert len(output.declarations) == 6
+    assert {
+        "address": "1.1.1.1",
+        "netblock": None,
+        "network": Reference("Network|internet"),
+        "object_type": "IPAddressV4",
+        "primary_key": "IPAddressV4|internet|1.1.1.1",
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[1].ooi.model_dump()
+
+    meta, output, runner = check_network_created(normalizer_runner, 3)
+    assert {
+        "address": "fe80:cd00:0:cde:1257:0:211e:729c",
+        "netblock": None,
+        "network": Reference("Network|internet"),
+        "object_type": "IPAddressV6",
+        "primary_key": "IPAddressV6|internet|fe80:cd00:0:cde:1257:0:211e:729c",
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[1].ooi.model_dump()
+
+
+def test_parse_url_csv(normalizer_runner):
+    meta, output, runner = check_network_created(normalizer_runner, 4)
+    assert len(output.declarations) == 4
+
+    assert {
+        "network": Reference("Network|internet"),
+        "object_type": "URL",
+        "primary_key": "URL|internet|https://example.com/",
+        "raw": Url(
+            "https://example.com/",
+        ),
+        "scan_profile": None,
+        "user_id": None,
+        "web_url": None,
+    } == output.declarations[1].ooi.model_dump()
+
+    meta, output, runner = check_network_created(normalizer_runner, 5)
+    assert len(output.declarations) == 2
+    assert {
+        "network": Reference("Network|internet"),
+        "object_type": "URL",
+        "primary_key": "URL|internet|https://example.com/",
+        "raw": Url(
+            "https://example.com/",
+        ),
+        "scan_profile": None,
+        "user_id": None,
+        "web_url": None,
+    } == output.declarations[1].ooi.dict()
+
+
+def check_network_created(
+    normalizer_runner, csv_idx: int
+) -> tuple[NormalizerMeta, NormalizerResults, LocalNormalizerJobRunner]:
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("manual-csv.json"))
+    local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
+    runner = LocalNormalizerJobRunner(local_repository)
+    output = normalizer_runner.run(meta, CSV_EXAMPLES[csv_idx])
+
+    assert len(output.observations) == 0
+    assert {
+        "name": "internet",
+        "object_type": "Network",
+        "primary_key": "Network|internet",
+        "scan_profile": None,
+        "user_id": None,
+    } == output.declarations[0].ooi.dict()
+
+    return meta, output, runner
diff --git a/boefjes/tests/plugins/test_nmap.py b/boefjes/tests/plugins/test_nmap.py
new file mode 100644
index 00000000000..76e6c8159ca
--- /dev/null
+++ b/boefjes/tests/plugins/test_nmap.py
@@ -0,0 +1,77 @@
+import re
+
+import pytest
+from jsonschema.exceptions import ValidationError
+from jsonschema.validators import validate
+
+from boefjes.plugins.kat_nmap_tcp.normalize import run
+from octopoes.models.ooi.network import IPAddressV4, Network
+from tests.loading import get_dummy_data
+
+
+def test_normalizer():
+    input_ooi = IPAddressV4(network=Network(name="internet").reference, address="134.209.85.72")
+    output = list(run(input_ooi.serialize(), get_dummy_data("raw/nmap_mispoes.xml")))
+    assert len(output) == 15
+    for i, out in enumerate(output[:-1]):
+        if out.object_type == "IPPort" and output[i + 1].object_type == "Service":
+            name = output[i + 1].name
+            if out.port == 80:
+                assert name == "http"
+            elif out.port == 443:
+                assert name == "https"
+            else:
+                assert name != "http"
+                assert name != "https"
+
+
+def get_pattern():
+    max_65535 = r"(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]\d{0,4}|\d)"
+    max_65535_or_port_range = f"({max_65535}|{max_65535}-{max_65535})"
+    one_or_comma_separated = f"^{max_65535_or_port_range}$|^{max_65535_or_port_range}(,{max_65535_or_port_range})+$"
+
+    return re.compile(one_or_comma_separated)
+
+
+def test_single_port_pattern(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for single_port in ["1", "2", "20", "200", "2000", "20000", "65535"]:
+        assert get_pattern().search(single_port) is not None
+        validate(instance={"PORTS": single_port}, schema=schema)
+
+
+def test_bad_single_port_pattern(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for bad_single_port in ["-1", "-2000", "65536", "222222"]:
+        assert get_pattern().search(bad_single_port) is None
+        with pytest.raises(ValidationError):
+            validate(instance={"PORTS": bad_single_port}, schema=schema)
+
+
+def test_multi_ports_pattern(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for multi_port in ["1,2", "2,3,4", "2,3,4,5,6,7", "2,20,200,2000,65535"]:
+        assert get_pattern().search(multi_port) is not None
+        validate(instance={"PORTS": multi_port}, schema=schema)
+
+
+def test_port_range_pattern(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for port_range in ["1-2", "2-20000", "65533-65535"]:
+        assert get_pattern().search(port_range) is not None
+        validate(instance={"PORTS": port_range}, schema=schema)
+
+
+def test_combined(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for port_range in ["1,1-65000", "1,2,234,4300-5999,1"]:
+        assert get_pattern().search(port_range) is not None
+        validate(instance={"PORTS": port_range}, schema=schema)
+
+
+def test_badly_combined(local_repository):
+    schema = local_repository.schema("nmap-ports")
+    for port_range in ["1,1-", "1-234-323"]:
+        assert get_pattern().search(port_range) is None
+        with pytest.raises(ValidationError):
+            validate(instance={"PORTS": port_range}, schema=schema)
diff --git a/boefjes/tests/test_rdns.py b/boefjes/tests/plugins/test_rdns.py
similarity index 100%
rename from boefjes/tests/test_rdns.py
rename to boefjes/tests/plugins/test_rdns.py
diff --git a/boefjes/tests/test_report_data.py b/boefjes/tests/plugins/test_report_data.py
similarity index 63%
rename from boefjes/tests/test_report_data.py
rename to boefjes/tests/plugins/test_report_data.py
index d8a8ed591ed..beda0a2f069 100644
--- a/boefjes/tests/test_report_data.py
+++ b/boefjes/tests/plugins/test_report_data.py
@@ -1,19 +1,14 @@
 import json
-from pathlib import Path
 
 from boefjes.job_models import NormalizerDeclaration, NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
 from tests.loading import get_dummy_data
 
 
-def test_report_data():
-    local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-    runner = LocalNormalizerJobRunner(local_repository)
+def test_report_data(normalizer_runner):
     meta = NormalizerMeta.model_validate_json(get_dummy_data("report-data-normalize.json"))
 
     raw = get_dummy_data("report-data.json")
-    output = runner.run(meta, raw)
+    output = normalizer_runner.run(meta, raw)
     ooi_dict = json.loads(raw)
 
     declaration = NormalizerDeclaration(
diff --git a/boefjes/tests/plugins/test_scan_profiles.py b/boefjes/tests/plugins/test_scan_profiles.py
new file mode 100644
index 00000000000..2c52709f2e0
--- /dev/null
+++ b/boefjes/tests/plugins/test_scan_profiles.py
@@ -0,0 +1,73 @@
+import json
+import os
+
+import pytest
+from pydantic import ValidationError
+
+from boefjes.config import Settings
+from boefjes.job_handler import NormalizerHandler
+from boefjes.job_models import NormalizerMeta
+from octopoes.models import DeclaredScanProfile
+from tests.loading import get_dummy_data
+
+RAW_DATA = json.dumps(
+    {"ip_addresses": [{"address": "127.0.0.1"}, {"address": "10.0.0.0"}], "domains": [{"name": "example.com"}]}
+)
+
+
+def test_normalizer_can_yield_scan_profiles(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("external_db.json"))
+    output = normalizer_runner.run(meta, bytes(RAW_DATA, "UTF-8"))
+
+    assert len(output.observations) == 1
+    assert len(output.observations[0].results) == 3
+    assert len(output.scan_profiles) == 3
+
+    profile = output.scan_profiles[0]
+    assert isinstance(profile, DeclaredScanProfile)
+    assert profile.reference == "IPAddressV4|internet|127.0.0.1"
+    assert profile.level == 3
+
+    profile = output.scan_profiles[1]
+    assert isinstance(profile, DeclaredScanProfile)
+    assert profile.reference == "IPAddressV4|internet|10.0.0.0"
+    assert profile.level == 3
+
+    profile = output.scan_profiles[2]
+    assert isinstance(profile, DeclaredScanProfile)
+    assert profile.reference == "Hostname|internet|example.com"
+    assert profile.level == 3
+
+
+def test_job_handler_respects_whitelist(normalizer_runner, mocker):
+    bytes_mock = mocker.Mock()
+    bytes_mock.get_raw.return_value = RAW_DATA
+    octopoes = mocker.Mock()
+
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("external_db.json"))
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": 5}'
+    with pytest.raises(ValidationError):
+        Settings()
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": -1}'
+    with pytest.raises(ValidationError):
+        Settings()
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": 3}'
+    NormalizerHandler(normalizer_runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
+    assert octopoes.save_many_scan_profiles.call_count == 0
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 2}'
+    NormalizerHandler(normalizer_runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
+    assert octopoes.save_many_scan_profiles.call_count == 1
+    assert octopoes.save_many_scan_profiles.call_args[0][0][0].level == 2
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 3}'
+    NormalizerHandler(normalizer_runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
+    assert octopoes.save_many_scan_profiles.call_count == 2
+    assert octopoes.save_many_scan_profiles.call_args[0][0][0].level == 3
+
+    os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 4, "abc": 0}'
+    NormalizerHandler(normalizer_runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
+    assert octopoes.save_many_scan_profiles.call_count == 3
diff --git a/boefjes/tests/plugins/test_security_txt.py b/boefjes/tests/plugins/test_security_txt.py
new file mode 100644
index 00000000000..f6be6bd8623
--- /dev/null
+++ b/boefjes/tests/plugins/test_security_txt.py
@@ -0,0 +1,89 @@
+from boefjes.plugins.kat_security_txt_downloader.normalize import run
+from octopoes.models import Reference
+from octopoes.models.ooi.dns.zone import Hostname
+from octopoes.models.ooi.network import IPAddressV4, IPPort, Network
+from octopoes.models.ooi.service import IPService, Service
+from octopoes.models.ooi.web import URL, SecurityTXT, Website
+from tests.loading import get_dummy_data
+
+input_ooi = {
+    "object_type": "Website",
+    "scan_profile": "scan_profile_type='declared' "
+    "reference=Reference('Website|internet|192.0.2.0|tcp|443|https|internet|example.com') level=<ScanLevel.L2: 2>",
+    "primary_key": "Website|internet|192.0.2.0|tcp|443|https|internet|example.com",
+    "ip_service": {
+        "ip_port": {
+            "address": {"network": {"name": "internet"}, "address": "192.0.2.0"},
+            "protocol": "tcp",
+            "port": "443",
+        },
+        "service": {"name": "https"},
+    },
+    "hostname": {"network": {"name": "internet"}, "name": "example.com"},
+    "certificate": "None",
+}
+
+
+def test_security_txt_same_website():
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/security_txt_result_same_website.json"),
+        )
+    )
+
+    expected = []
+    expected.append(URL(raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference))
+    url = URL(raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference)
+    expected.append(url)
+    expected.append(
+        SecurityTXT(
+            website=Reference.from_str("Website|internet|192.0.2.0|tcp|443|https|internet|example.com"),
+            url=url.reference,
+            security_txt="This is the content",
+            redirects_to=None,
+        )
+    )
+
+    assert expected == oois
+
+
+def test_security_txt_different_website():
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/security_txt_result_different_website.json"),
+        )
+    )
+
+    expected = []
+    url_original = URL(raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference)
+    expected.append(url_original)
+    url = URL(raw="https://www.example.com/.well-known/security.txt", network=Network(name="internet").reference)
+    expected.append(url)
+    expected.append(Hostname(name="www.example.com", network=Network(name="internet").reference))
+    ip = IPAddressV4(address="192.0.2.1", network=Network(name="internet").reference)
+    expected.append(ip)
+    expected.append(Service(name="https"))
+    port = IPPort(address=ip.reference, port=443, protocol="tcp")
+    expected.append(port)
+    ip_service = IPService(ip_port=port.reference, service=Service(name="https").reference)
+    expected.append(ip_service)
+    website = Website(
+        ip_service=ip_service.reference,
+        hostname=Hostname(name="www.example.com", network=Network(name="internet").reference).reference,
+    )
+    expected.append(website)
+    security_txt = SecurityTXT(
+        website=website.reference, url=url.reference, security_txt="This is the content", redirects_to=None
+    )
+    expected.append(security_txt)
+    expected.append(
+        SecurityTXT(
+            website=Reference.from_str("Website|internet|192.0.2.0|tcp|443|https|internet|example.com"),
+            url=url_original.reference,
+            security_txt=None,
+            redirects_to=security_txt.reference,
+        )
+    )
+    assert expected == oois
diff --git a/boefjes/tests/plugins/test_snyk.py b/boefjes/tests/plugins/test_snyk.py
new file mode 100644
index 00000000000..3a2fa504195
--- /dev/null
+++ b/boefjes/tests/plugins/test_snyk.py
@@ -0,0 +1,114 @@
+import json
+from unittest import mock
+
+from boefjes.job_models import BoefjeMeta
+from boefjes.plugins.kat_snyk.main import run as run_boefje
+from boefjes.plugins.kat_snyk.normalize import run
+from octopoes.models.ooi.findings import SnykFindingType
+from octopoes.models.types import CVEFindingType, Finding, Software
+from tests.loading import get_dummy_data
+
+input_ooi = {
+    "primary_key": "Software|lodash|1.1.0|",
+    "software": {
+        "name": "lodash",
+        "version": "1.1.0",
+    },
+}
+
+
+def test_snyk_no_findings():
+    assert not list(run(input_ooi, get_dummy_data("inputs/snyk-result-no-findings.json")))
+
+
+def test_snyk_findings():
+    oois = list(run(input_ooi, get_dummy_data("inputs/snyk-result-findings.json")))
+    software = Software(name="lodash", version="1.1.0")
+
+    snyk_finding_data = [
+        ("SNYK-JS-LODASH-590103", "Prototype Pollution"),
+        ("SNYK-JS-LODASH-608086", "Prototype Pollution"),
+    ]
+    cve_finding_data = [
+        ("CVE-2018-16487", "Prototype Pollution"),
+        ("CVE-2018-3721", "Prototype Pollution"),
+        ("CVE-2019-1010266", "Regular Expression Denial of Service (ReDoS)"),
+        ("CVE-2019-10744", "Prototype Pollution"),
+        ("CVE-2020-28500", "Regular Expression Denial of Service (ReDoS)"),
+        ("CVE-2020-8203", "Prototype Pollution"),
+        ("CVE-2021-23337", "Command Injection"),
+    ]
+
+    snyk_findingtypes = []
+    snyk_findings = []
+    cve_findingtypes = []
+    cve_findings = []
+
+    for finding in snyk_finding_data:
+        snyk_ft = SnykFindingType(id=finding[0])
+        snyk_findingtypes.append(snyk_ft)
+        snyk_findings.append(
+            Finding(
+                finding_type=snyk_ft.reference,
+                ooi=software.reference,
+                description=finding[1],
+            )
+        )
+
+    for finding in cve_finding_data:
+        cve_ft = CVEFindingType(id=finding[0])
+        cve_findingtypes.append(cve_ft)
+        cve_findings.append(
+            Finding(
+                finding_type=cve_ft.reference,
+                ooi=software.reference,
+                description=finding[1],
+            )
+        )
+
+    # noinspection PyTypeChecker
+    expected = snyk_findingtypes + snyk_findings + cve_findingtypes + cve_findings
+
+    assert len(expected) == len(oois)
+
+
+def test_snyk_html_parser(mocker):
+    mock_get = mocker.patch("boefjes.plugins.kat_snyk.main.requests.get")
+    boefje_meta = BoefjeMeta.model_validate_json(get_dummy_data("snyk-job.json"))
+
+    # Mock the first GET request
+    mock_first_get = mock.Mock()
+    mock_first_get.content = get_dummy_data("snyk-vuln.html")
+
+    # Mock the next GET request
+    mock_second_get = mock.Mock()
+    mock_second_get.content = get_dummy_data("snyk-vuln2.html")
+
+    # Mock the next 7 GET requests
+    mock_third_get = mock.Mock()
+    mock_third_get.content = get_dummy_data("snyk-vuln3.html")
+
+    mock_get.side_effect = [mock_first_get] + [mock_second_get] + [mock_third_get] * 7
+
+    mime_types, result = run_boefje(boefje_meta)[0]
+
+    output = json.loads(result)
+
+    assert output["table_versions"] == []
+    assert output["table_vulnerabilities"] == [
+        {
+            "Vuln_href": "SNYK-JS-LODASH-1018905",
+            "Vuln_text": "Regular Expression Denial of Service (ReDoS)",
+            "Vuln_versions": "<4.17.21",
+        },
+        {"Vuln_href": "SNYK-JS-LODASH-608086", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.17"},
+        {"Vuln_href": "SNYK-JS-LODASH-450202", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.12"},
+        {
+            "Vuln_href": "SNYK-JS-LODASH-73639",
+            "Vuln_text": "Regular Expression Denial of Service (ReDoS)",
+            "Vuln_versions": "<4.17.11",
+        },
+        {"Vuln_href": "SNYK-JS-LODASH-73638", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.11"},
+        {"Vuln_href": "npm:lodash:20180130", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.5"},
+    ]
+    assert output["cve_vulnerabilities"] == [{"cve_code": "CVE-2021-23337", "Vuln_text": "Command Injection"}]
diff --git a/boefjes/tests/test_sslcertificate_normalizer.py b/boefjes/tests/plugins/test_sslcertificate_normalizer.py
similarity index 100%
rename from boefjes/tests/test_sslcertificate_normalizer.py
rename to boefjes/tests/plugins/test_sslcertificate_normalizer.py
diff --git a/boefjes/tests/plugins/test_testssl_sh.py b/boefjes/tests/plugins/test_testssl_sh.py
new file mode 100644
index 00000000000..397b5d3884d
--- /dev/null
+++ b/boefjes/tests/plugins/test_testssl_sh.py
@@ -0,0 +1,120 @@
+from boefjes.plugins.kat_testssl_sh_ciphers.normalize import run
+from tests.loading import get_dummy_data
+
+input_ooi = {
+    "object_type": "IPService",
+    "scan_profile": "scan_profile_type='declared' "
+    "reference=Reference('IPService|internet|134.209.85.72|tcp|80|http') level=<ScanLevel.L2: 2>",
+    "primary_key": "IPService|internet|134.209.85.72|tcp|80|http",
+    "ip_port": {
+        "address": {"network": {"name": "internet"}, "address": "134.209.85.72"},
+        "protocol": "tcp",
+        "port": "80",
+    },
+    "service": {"name": "http"},
+}
+
+
+def test_cipherless_service():
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/testssl-sh-cipherless.json"),
+        )
+    )
+
+    # noinspection PyTypeChecker
+    expected = []
+
+    assert expected == oois
+
+
+def test_ciphered_service():
+    oois = list(
+        run(
+            input_ooi,
+            get_dummy_data("inputs/testssl-sh-ciphered.json"),
+        )
+    )
+
+    # noinspection PyTypeChecker
+    expected_suites = {
+        "TLSv1.3": [
+            {
+                "cipher_suite_alias": "TLS_AES_256_GCM_SHA384",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "TLS_AES_256_GCM_SHA384",
+                "key_size": 253,
+                "bits": 256,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "x1302",
+            },
+            {
+                "cipher_suite_alias": "TLS_CHACHA20_POLY1305_SHA256",
+                "encryption_algorithm": "ChaCha20",
+                "cipher_suite_name": "TLS_CHACHA20_POLY1305_SHA256",
+                "key_size": 253,
+                "bits": 256,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "x1303",
+            },
+            {
+                "cipher_suite_alias": "TLS_AES_128_GCM_SHA256",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "TLS_AES_128_GCM_SHA256",
+                "key_size": 253,
+                "bits": 128,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "x1301",
+            },
+        ],
+        "TLSv1.2": [
+            {
+                "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "ECDHE-RSA-AES256-GCM-SHA384",
+                "key_size": 521,
+                "bits": 256,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "xc030",
+            },
+            {
+                "cipher_suite_alias": "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "DHE-RSA-AES256-GCM-SHA384",
+                "key_size": 2048,
+                "bits": 256,
+                "key_exchange_algorithm": "DH",
+                "cipher_suite_code": "x9f",
+            },
+            {
+                "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
+                "encryption_algorithm": "ChaCha20",
+                "cipher_suite_name": "ECDHE-RSA-CHACHA20-POLY1305",
+                "key_size": 521,
+                "bits": 256,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "xcca8",
+            },
+            {
+                "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "ECDHE-RSA-AES128-GCM-SHA256",
+                "key_size": 521,
+                "bits": 128,
+                "key_exchange_algorithm": "ECDH",
+                "cipher_suite_code": "xc02f",
+            },
+            {
+                "cipher_suite_alias": "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
+                "encryption_algorithm": "AESGCM",
+                "cipher_suite_name": "DHE-RSA-AES128-GCM-SHA256",
+                "key_size": 2048,
+                "bits": 128,
+                "key_exchange_algorithm": "DH",
+                "cipher_suite_code": "x9e",
+            },
+        ],
+    }
+    assert len(oois) == 1
+    assert oois[0].suites == expected_suites
diff --git a/boefjes/tests/plugins/test_wappalyzer_normalizer.py b/boefjes/tests/plugins/test_wappalyzer_normalizer.py
new file mode 100644
index 00000000000..c89fc63cc49
--- /dev/null
+++ b/boefjes/tests/plugins/test_wappalyzer_normalizer.py
@@ -0,0 +1,15 @@
+from boefjes.job_models import NormalizerMeta
+from tests.loading import get_dummy_data
+
+
+def test_page_analyzer_normalizer(normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("body-page-analysis-normalize.json"))
+    output = normalizer_runner.run(meta, get_dummy_data("download_page_analysis.raw"))
+
+    results = output.observations[0].results
+    assert len(results) == 6
+    assert {o.primary_key for o in results if o.object_type == "Software"} == {
+        "Software|jQuery Migrate|1.0.0|",
+        "Software|jQuery|3.6.0|",
+        "Software|Bootstrap|3.3.7|",
+    }
diff --git a/boefjes/tests/test_adr_validator.py b/boefjes/tests/test_adr_validator.py
deleted file mode 100644
index 1a60197127c..00000000000
--- a/boefjes/tests/test_adr_validator.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from pathlib import Path
-from unittest import TestCase
-
-from boefjes.job_models import NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from tests.loading import get_dummy_data
-
-
-class ADRValidatorNormalizerTest(TestCase):
-    def test_no_findings(self):
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("adr-validator-normalize.json"))
-
-        raw = """[{"rule": "TEST-01", "passed": true, "message": ""}]"""
-        output = runner.run(meta, bytes(raw, "UTF-8"))
-
-        self.assertEqual(1, len(output.observations))
-
-        observation = output.observations[0]
-        self.assertEqual(2, len(observation.results))
-
-        self.assertEqual("APIDesignRule", observation.results[0].object_type)
-        self.assertEqual("TEST-01", observation.results[0].name)
-        self.assertEqual("APIDesignRuleResult", observation.results[1].object_type)
-        self.assertEqual("", observation.results[1].message)
-        self.assertTrue(observation.results[1].passed)
-
-    def test_with_findings(self):
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("adr-validator-normalize.json"))
-
-        raw = """[
-            {"rule": "TEST-01", "passed": true, "message": ""},
-            {"rule": "TEST-02", "passed": false, "message": "An error"},
-            {"rule": "TEST-02", "passed": true, "message": ""}
-        ]"""
-        output = runner.run(meta, bytes(raw, "UTF-8"))
-
-        self.assertEqual(1, len(output.observations))
-
-        observation = output.observations[0]
-        self.assertEqual(8, len(observation.results))
-
-        self.assertEqual("APIDesignRule", observation.results[2].object_type)
-        self.assertEqual("TEST-02", observation.results[2].name)
-        self.assertEqual("APIDesignRuleResult", observation.results[3].object_type)
-        self.assertEqual("An error", observation.results[3].message)
-        self.assertFalse(observation.results[3].passed)
-
-        self.assertEqual("ADRFindingType", observation.results[4].object_type)
-        self.assertEqual("TEST-02", observation.results[4].id)
-        self.assertEqual("Finding", observation.results[5].object_type)
-        self.assertEqual("An error", observation.results[5].description)
-        self.assertEqual("ADRFindingType|TEST-02", str(observation.results[5].finding_type))
diff --git a/boefjes/tests/test_answer_parser.py b/boefjes/tests/test_answer_parser.py
deleted file mode 100644
index ff4114116a9..00000000000
--- a/boefjes/tests/test_answer_parser.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from pathlib import Path
-from unittest import TestCase
-
-import pytest
-from pydantic import ValidationError
-
-from boefjes.job_models import NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from tests.loading import get_dummy_data
-
-
-class AnswerParserNormalizerTest(TestCase):
-    def test_config_yielded(self):
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("answer-normalize.json"))
-
-        with pytest.raises(TypeError):
-            raw = '[{"key": "test"}]'
-            runner.run(meta, bytes(raw, "UTF-8"))
-
-        with pytest.raises(ValidationError):
-            raw = '{"schema": "/bit/port-classification-ip", "answer": [{"key": "test"}]}'
-            runner.run(meta, bytes(raw, "UTF-8"))
-
-        raw = '{"schema": "/bit/port-classification-ip", "answer": {"key": "test"}}'
-        output = runner.run(meta, bytes(raw, "UTF-8"))
-
-        self.assertEqual(1, len(output.observations))
-        self.assertEqual(1, len(output.observations[0].results))
-        self.assertEqual("Config", output.observations[0].results[0].object_type)
diff --git a/boefjes/tests/test_api.py b/boefjes/tests/test_api.py
index e1e95b7b50e..f6cac54d1f3 100644
--- a/boefjes/tests/test_api.py
+++ b/boefjes/tests/test_api.py
@@ -1,7 +1,10 @@
 from pathlib import Path
+from unittest import mock
 
 import boefjes.api
 from boefjes.clients.scheduler_client import TaskStatus
+from boefjes.dependencies.plugins import PluginService
+from boefjes.local_repository import get_local_repository
 from tests.conftest import MockSchedulerClient
 from tests.loading import get_dummy_data
 
@@ -26,6 +29,11 @@ def test_boefje_input_running(api, tmp_path):
     task = scheduler_client.pop_item("boefje")
     scheduler_client.patch_task(task.id, TaskStatus.RUNNING)
     api.app.dependency_overrides[boefjes.api.get_scheduler_client] = lambda: scheduler_client
+    api.app.dependency_overrides[boefjes.api.get_plugin_service] = lambda: PluginService(
+        mock.MagicMock(),
+        mock.MagicMock(),
+        get_local_repository(),
+    )
 
     boefjes.api.get_environment_settings = lambda *_: {}
     response = api.get("/api/v0/tasks/70da7d4f-f41f-4940-901b-d98a92e9014b")
diff --git a/boefjes/tests/test_app.py b/boefjes/tests/test_app.py
index 05bc10a35d5..8cd124940f6 100644
--- a/boefjes/tests/test_app.py
+++ b/boefjes/tests/test_app.py
@@ -22,10 +22,15 @@ def test_one_process(manager: SchedulerWorkerManager, item_handler: MockHandler)
 
     patched_tasks = manager.scheduler_client.get_all_patched_tasks()
 
-    assert len(patched_tasks) == 3
-    assert patched_tasks[0] == ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")
-    assert patched_tasks[1] == ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")
-    assert patched_tasks[2] == ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed")
+    assert len(patched_tasks) == 6
+    assert set(patched_tasks) == {
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014c", "running"),
+        ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014c", "completed"),
+        ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed"),
+    }
 
 
 def test_two_processes(manager: SchedulerWorkerManager, item_handler: MockHandler) -> None:
@@ -39,9 +44,14 @@ def test_two_processes(manager: SchedulerWorkerManager, item_handler: MockHandle
     assert len(items) == 2
 
     patched_tasks = manager.scheduler_client.get_all_patched_tasks()
-    assert len(patched_tasks) == 3
-    assert patched_tasks.count(("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")) == 2
-    assert patched_tasks.count(("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed")) == 1
+    assert set(patched_tasks) == {
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014c", "running"),
+        ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014c", "completed"),
+        ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed"),
+    }
 
 
 def test_two_processes_exception(manager: SchedulerWorkerManager, item_handler: MockHandler, tmp_path) -> None:
@@ -78,20 +88,41 @@ def test_two_processes_handler_exception(manager: SchedulerWorkerManager, item_h
 
     patched_tasks = manager.scheduler_client.get_all_patched_tasks()
 
-    assert len(patched_tasks) == 3
-    # Handler starts raising an Exception from the second call onward,
-    # so we have 2 completed tasks and 4 failed tasks.
-    assert patched_tasks.count(("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")) == 1
-    assert patched_tasks.count(("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed")) == 2
+    # Handler starts raising an Exception from the second call onward. So each process picks up a task, of which the one
+    # with id 9071c9fd-2b9f-440f-a524-ef1ca4824fd4 crashes. Task 70da7d4f-f41f-4940-901b-d98a92e9014b will be picked up
+    # by the other process in parallel, and completes before the crash of the other task. Since one process completes,
+    # it pops the same crashing task 9071c9fd-2b9f-440f-a524-ef1ca4824fd4 from the queue to simplify the test.
+
+    # We expect the first two patches to set the task status to running of both task and then process 1 to finish, as
+    # the exception has been set up with a small delay.
+    assert len(patched_tasks) == 6
+    assert sorted(patched_tasks[:3]) == sorted(
+        [
+            ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),  # Process 1
+            ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),  # Process 1
+            ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "running"),  # Process 2
+        ]
+    )
+
+    # The process completing status then to be set to completed/failed for both tasks.
+    assert sorted(patched_tasks[3:]) == sorted(
+        [
+            ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "running"),  # Process 1
+            ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed"),  # Process 2
+            ("9071c9fd-2b9f-440f-a524-ef1ca4824fd4", "failed"),  # Process 1
+        ]
+    )
 
 
 def test_two_processes_cleanup_unfinished_tasks(
     manager: SchedulerWorkerManager, item_handler: MockHandler, tmp_path
 ) -> None:
     """
-    Push 3 slow tasks to 2 workers,
-    then crash (from popping from an empty queue),
-    then clean up task on queue and the tasks being handled
+    We push 2 slow tasks to the Queue, which will be popped by 2 workers, emptying the Queue and stalling the 2 workers.
+    Because the Queue is now empty, the manager will get 2 new tasks from the scheduler to push to the queue. But only
+    one will be pushed because we do not have any tasks from the scheduler anymore (triggering a KeyboardInterrupt to
+    crash the main process). Then the manager should clean up the running tasks by setting the status of the running
+    tasks to failed and push any tasks still on the Queue back to the scheduler.
     """
 
     manager.scheduler_client = MockSchedulerClient(
@@ -112,15 +143,19 @@ def test_two_processes_cleanup_unfinished_tasks(
     assert len(items) == 0
 
     patched_tasks = manager.scheduler_client.get_all_patched_tasks()
-    assert len(patched_tasks) == 1
+    assert len(patched_tasks) == 3
 
     # Task was running but main process crashed intentionally and cleaned it up
-    assert patched_tasks.count(("70da7d4f-f41f-4940-901b-d98a92e9014b", "failed")) == 1
+    assert set(patched_tasks) == {
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "failed"),
+    }
 
     # Tasks (one with the same id) was still unhandled the queue and pushed back to the scheduler by the main process
-    assert manager.scheduler_client._pushed_items["70da7d4f-f41f-4940-901b-d98a92e9014b"][0] == "boefje"
+    assert manager.scheduler_client._pushed_items["70da7d4f-f41f-4940-901b-d98a92e9014b"].scheduler_id == "boefje-_dev"
     assert json.loads(
-        manager.scheduler_client._pushed_items["70da7d4f-f41f-4940-901b-d98a92e9014b"][1].json()
+        manager.scheduler_client._pushed_items["70da7d4f-f41f-4940-901b-d98a92e9014b"].json()
     ) == json.loads(get_dummy_data("scheduler/pop_response_boefje.json"))
 
 
@@ -140,6 +175,7 @@ def test_null(manager: SchedulerWorkerManager, tmp_path: Path, item_handler: Moc
         [get_dummy_data("scheduler/pop_response_normalizer.json")],
         tmp_path / "patch_task_log",
         iterations_to_wait_for_exception=2,
+        sleep_time=0.3,
     )
 
     with pytest.raises(KeyboardInterrupt):
@@ -149,9 +185,15 @@ def test_null(manager: SchedulerWorkerManager, tmp_path: Path, item_handler: Moc
     patched_tasks = manager.scheduler_client.get_all_patched_tasks()
 
     assert len(items) == 3
-    assert len(patched_tasks) == 3
-    assert patched_tasks[0] == ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")
-    assert patched_tasks[2] == ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed")
+    assert len(patched_tasks) == 6
+    assert set(patched_tasks) == {
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "running"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),
+        ("70da7d4f-f41f-4940-901b-d98a92e9014b", "completed"),
+    }
 
 
 def test_create_manager():
diff --git a/boefjes/tests/test_bodyimage.py b/boefjes/tests/test_bodyimage.py
deleted file mode 100644
index 52e646c5d33..00000000000
--- a/boefjes/tests/test_bodyimage.py
+++ /dev/null
@@ -1,102 +0,0 @@
-import json
-from pathlib import Path
-from unittest import TestCase, mock
-from unittest.mock import MagicMock
-
-from requests.models import CaseInsensitiveDict, PreparedRequest, Response
-
-from boefjes.job_models import BoefjeMeta, NormalizerMeta
-from boefjes.local import LocalBoefjeJobRunner, LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from tests.loading import get_dummy_data
-
-
-class WebsiteAnalysisTest(TestCase):
-    maxDiff = None
-
-    @mock.patch("boefjes.plugins.kat_webpage_analysis.main.do_request", spec=Response)
-    def test_website_analysis(self, do_request_mock: MagicMock):
-        meta = BoefjeMeta.model_validate_json(get_dummy_data("webpage-analysis.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalBoefjeJobRunner(local_repository)
-
-        mock_response = Response()
-        mock_response._content = bytes(get_dummy_data("download_body"))
-        mock_response.request = MagicMock(spec=PreparedRequest())
-        mock_response.request.url = ""
-        mock_response.request.method = "GET"
-        mock_response.headers = CaseInsensitiveDict(json.loads(get_dummy_data("download_headers.json")))
-
-        do_request_mock.return_value = mock_response
-
-        output = runner.run(meta, {})
-
-        self.assertIn("openkat-http/response", output[0][0])
-        self.assertIn("openkat-http/headers", output[1][0])
-        self.assertIn("openkat-http/body", output[2][0])
-
-    @mock.patch("boefjes.plugins.kat_webpage_analysis.main.do_request")
-    def test_website_analysis_for_image(self, do_request_mock: MagicMock):
-        meta = BoefjeMeta.model_validate_json(get_dummy_data("webpage-analysis.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalBoefjeJobRunner(local_repository)
-
-        mock_response = Response()
-        mock_response._content = bytes(get_dummy_data("cat_image"))
-        mock_response.request = MagicMock(spec=PreparedRequest())
-        mock_response.request.url = ""
-        mock_response.request.method = "GET"
-        mock_response.headers = CaseInsensitiveDict(json.loads(get_dummy_data("download_image_headers.json")))
-
-        do_request_mock.return_value = mock_response
-
-        output = runner.run(meta, {})
-        self.assertIn("image/jpeg", output[2][0])
-
-    def test_body_image_normalizer(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("bodyimage-normalize.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("cat_image")).observations[0].results
-
-        self.assertEqual(1, len(output))
-        self.assertEqual(
-            {
-                "object_type": "ImageMetadata",
-                "primary_key": "ImageMetadata|internet|134.209.85.72|tcp|443|https|internet"
-                "|mispo.es|https|internet|mispo.es|443|/",
-                "resource": "HTTPResource|internet|134.209.85.72|tcp|443|https|internet"
-                "|mispo.es|https|internet|mispo.es|443|/",
-                "scan_profile": None,
-                "user_id": None,
-                "image_info": {
-                    "format": "JPEG",
-                    "frames": 1,
-                    "height": 600,
-                    "is_animated": False,
-                    "mode": "RGB",
-                    "size": (600, 600),
-                    "width": 600,
-                },
-            },
-            output[0].dict(),
-        )
-
-    def test_body_normalizer(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("body-normalize.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("download_body")).observations[0].results
-
-        self.assertEqual(4, len(output))
-
-        output_dicts = sorted([o.dict() for o in output], key=lambda x: x["primary_key"])
-
-        self.assertEqual("URL|internet|http://placekitten.com/600/600", output_dicts[0]["primary_key"])
-        self.assertEqual("URL|internet|http://placekitten.com/600/600.webp", output_dicts[1]["primary_key"])
-        self.assertEqual("URL|internet|https://mispo.es/600/600", output_dicts[2]["primary_key"])
-        self.assertEqual("URL|internet|https://mispo.es/600/600.webp", output_dicts[3]["primary_key"])
diff --git a/boefjes/tests/test_calvin.py b/boefjes/tests/test_calvin.py
deleted file mode 100644
index 35fe48f771d..00000000000
--- a/boefjes/tests/test_calvin.py
+++ /dev/null
@@ -1,155 +0,0 @@
-from pathlib import Path
-from unittest import TestCase
-
-from boefjes.job_models import NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from octopoes.models.ooi.monitoring import Application
-from tests.loading import get_dummy_data
-
-
-class CalvinTest(TestCase):
-    def test_parse_user_changed(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("user-changed.json"))
-
-        self.assertEqual(8, len(output.declarations))
-        self.assertEqual(
-            {
-                "application": Application(name="organisation/env/app").reference,
-                "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1655979300000',
-                "event_title": "UC: User privilege monitoring",
-                "event_type": "ksql-usecase",
-                "meta_data": {
-                    "_id": "62b43a6e69c14474a3773f8b",
-                    "log_action_code": "U",
-                    "log_count": 9.0,
-                    "log_routing_key": "test_app.account_change",
-                    "log_user_user_id": 1234.0,
-                    "outbox_sent": None,
-                    "windowKey": '{"client_environment_app":"organisation/env/app",'
-                    '"log_user_user_id":1234}-1655979300000',
-                    "window_emit": 1655978930000.0,
-                    "window_end": 1655979300000.0,
-                    "window_start": 1655975700000.0,
-                },
-                "object_type": "Incident",
-                "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
-                '"log_user_user_id":1234}-1655979300000',
-                "scan_profile": None,
-                "user_id": None,
-                "severity": "MEDIUM",
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-        self.assertEqual(
-            {
-                "application": Application(name="organisation/env/app").reference,
-                "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658825100000',
-                "event_title": "UC: User privilege monitoring",
-                "event_type": "ksql-usecase",
-                "meta_data": {
-                    "_id": "62df9e499dd2b029d842576d",
-                    "log_action_code": "U",
-                    "log_count": 4.0,
-                    "log_routing_key": "test_app.account_change",
-                    "log_user_user_id": 1234.0,
-                    "outbox_sent": None,
-                    "windowKey": '{"client_environment_app":"organisation/env/app",'
-                    '"log_user_user_id":1234}-1658825100000',
-                    "window_emit": 1658822215000.0,
-                    "window_end": 1658825100000.0,
-                    "window_start": 1658821500000.0,
-                },
-                "object_type": "Incident",
-                "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
-                '"log_user_user_id":1234}-1658825100000',
-                "scan_profile": None,
-                "user_id": None,
-                "severity": "MEDIUM",
-            },
-            output.declarations[-1].ooi.dict(),
-        )
-
-    def test_parse_admin_login_failure(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("user-login-admin-failure.json"))
-
-        self.assertEqual(8, len(output.declarations))
-        self.assertEqual(
-            {
-                "application": Application(name="organisation/env/app").reference,
-                "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1659618600000',
-                "event_title": "UC: Detect brute force login attempts for an admin account",
-                "event_type": "ksql-usecase",
-                "meta_data": {
-                    "_id": "62ebc44c9dd2b029d84ac32a",
-                    "log_action_code": "E",
-                    "log_count": 3.0,
-                    "log_object_result": 0.0,
-                    "log_routing_key": "test_app.user_login",
-                    "log_user_roles": "ADMIN,REGISTRATOR,SHIFT_MANAGER,CSV,KVTB_ADMIN,STATS",
-                    "log_user_user_id": 1234.0,
-                    "outbox_sent": True,
-                    "windowKey": '{"client_environment_app":"organisation/env/app",'
-                    '"log_user_user_id":1234}-1659618600000',
-                    "window_emit": 1659618378000.0,
-                    "window_end": 1659618600000.0,
-                    "window_start": 1659617700000.0,
-                },
-                "object_type": "Incident",
-                "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
-                '"log_user_user_id":1234}-1659618600000',
-                "scan_profile": None,
-                "user_id": None,
-                "severity": "MEDIUM",
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-    def test_parse_user_login_failure(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("calvin-normalizer.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("user-login-failure.json"))
-
-        self.assertEqual(8, len(output.declarations))
-        self.assertEqual(
-            {
-                "application": Application(name="organisation/env/app").reference,
-                "event_id": '{"client_environment_app":"organisation/env/app","log_user_user_id":1234}-1658998200000',
-                "event_title": "UC: Detects attempts to guess passwords",
-                "event_type": "ksql-usecase",
-                "meta_data": {
-                    "_id": "62e24d509dd2b029d84391fb",
-                    "log_action_code": "E",
-                    "log_count": 10.0,
-                    "log_object_result": 0.0,
-                    "log_object_user_id": None,
-                    "log_result": None,
-                    "log_routing_key": "test_app.user_login",
-                    "log_user_user_id": 1234.0,
-                    "outbox_sent": None,
-                    "windowKey": '{"client_environment_app":"organisation/env/app",'
-                    '"log_user_user_id":1234}-1658998200000',
-                    "window_emit": 1658998093000.0,
-                    "window_end": 1658998200000.0,
-                    "window_start": 1658996400000.0,
-                },
-                "object_type": "Incident",
-                "primary_key": 'Incident|organisation/env/app|{"client_environment_app":"organisation/env/app",'
-                '"log_user_user_id":1234}-1658998200000',
-                "scan_profile": None,
-                "user_id": None,
-                "severity": "MEDIUM",
-            },
-            output.declarations[1].ooi.dict(),
-        )
diff --git a/boefjes/tests/test_cve-2023-35078.py b/boefjes/tests/test_cve-2023-35078.py
deleted file mode 100644
index 8d7d4d97339..00000000000
--- a/boefjes/tests/test_cve-2023-35078.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from unittest import TestCase
-from unittest.mock import MagicMock
-
-from boefjes.plugins.kat_cve_2023_35078.normalize import VULNERABLE_RANGES, is_vulnerable_version, run
-from packaging import version
-from tests.loading import get_dummy_data
-
-
-class CVE_2023_35078Test(TestCase):
-    maxDiff = None
-
-    def test_vulnerable_version_11_8(self):
-        detected_version = version.parse("11.8.0.0")
-        vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
-        self.assertTrue(is_vulnerable_version(vulnerable_ranges, detected_version))
-
-    def test_vulnerable_version_11_9(self):
-        detected_version = version.parse("11.9.1.0")
-        vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
-        self.assertTrue(is_vulnerable_version(vulnerable_ranges, detected_version))
-
-    def test_vulnerable_version_11_10(self):
-        detected_version = version.parse("11.10.0.1")
-        vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
-        self.assertTrue(is_vulnerable_version(vulnerable_ranges, detected_version))
-
-    def test_patched_version_11_9(self):
-        detected_version = version.parse("11.9.2.0")
-        vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
-        self.assertFalse(is_vulnerable_version(vulnerable_ranges, detected_version))
-
-    def test_equal_to_patched_version_11_9(self):
-        detected_version = version.parse("11.9.1.1")
-        vulnerable_ranges = [(version.parse(start), version.parse(end)) for start, end in VULNERABLE_RANGES]
-        self.assertFalse(is_vulnerable_version(vulnerable_ranges, detected_version))
-
-
-def test_cve_2023_35078_vulnerable():
-    oois = set(run(MagicMock(), get_dummy_data("cve_2023_35078_vulnerable.html")))
-
-    assert any(ooi.object_type == "Finding" for ooi in oois)
-
-
-def test_cve_2023_35078_not_vulnerable():
-    oois = set(run(MagicMock(), get_dummy_data("cve_2023_35078_not_vulnerable.html")))
-
-    assert not any(ooi.object_type == "Finding" for ooi in oois)
diff --git a/boefjes/tests/test_cve_finding_types.py b/boefjes/tests/test_cve_finding_types.py
deleted file mode 100644
index a67ac217e20..00000000000
--- a/boefjes/tests/test_cve_finding_types.py
+++ /dev/null
@@ -1,90 +0,0 @@
-from unittest import TestCase
-
-from boefjes.job_models import NormalizerAffirmation
-from boefjes.plugins.kat_cve_finding_types.normalize import run
-from octopoes.models.ooi.findings import RiskLevelSeverity
-from octopoes.models.types import CVEFindingType
-from tests.loading import get_dummy_data
-
-
-class CVETest(TestCase):
-    maxDiff = None
-
-    def test_cve_with_cvss(self):
-        input_ooi = {"id": "CVE-2021-46882"}
-
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/cve-result-with-cvss.json"),
-            )
-        )
-
-        expected = [
-            NormalizerAffirmation(
-                ooi=CVEFindingType(
-                    id="CVE-2021-46882",
-                    description="The video framework has memory overwriting caused by addition overflow. "
-                    "Successful exploitation of this vulnerability may affect availability.",
-                    source="https://cve.circl.lu/cve/CVE-2021-46882",
-                    risk_severity=RiskLevelSeverity.HIGH,
-                    risk_score=7.5,
-                )
-            )
-        ]
-
-        self.assertEqual(expected, oois)
-
-    def test_cve_with_cvss2(self):
-        input_ooi = {"id": "CVE-2016-0616"}
-
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/cve-result-with-cvss2.json"),
-            )
-        )
-
-        expected = [
-            NormalizerAffirmation(
-                ooi=CVEFindingType(
-                    id="CVE-2016-0616",
-                    description="Unspecified vulnerability in Oracle MySQL 5.5.46 and earlier and MariaDB before "
-                    "5.5.47, 10.0.x before 10.0.23, and 10.1.x before 10.1.10 allows remote authenticated users "
-                    "to affect availability via unknown vectors related to Optimizer.",
-                    source="https://cve.circl.lu/cve/CVE-2016-0616",
-                    risk_severity=RiskLevelSeverity.MEDIUM,
-                    risk_score=4.0,
-                )
-            )
-        ]
-
-        self.assertEqual(expected, oois)
-
-    def test_cve_without_cvss(self):
-        input_ooi = {"id": "CVE-2021-46882"}
-
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/cve-result-without-cvss.json"),
-            )
-        )
-
-        expected = [
-            NormalizerAffirmation(
-                ooi=CVEFindingType(
-                    id="CVE-2021-46882",
-                    description="The Nested Pages plugin for WordPress is vulnerable to unauthorized loss of "
-                    "data due to a missing capability check on the 'reset' function in versions up to, and including, "
-                    "3.2.3. This makes it possible for authenticated attackers, "
-                    "with editor-level permissions and above, "
-                    "to reset plugin settings.",
-                    source="https://cve.circl.lu/cve/CVE-2021-46882",
-                    risk_severity=RiskLevelSeverity.UNKNOWN,
-                    risk_score=None,
-                ),
-            )
-        ]
-
-        self.assertEqual(expected, oois)
diff --git a/boefjes/tests/test_dns.py b/boefjes/tests/test_dns.py
deleted file mode 100644
index 0ae1124b0f8..00000000000
--- a/boefjes/tests/test_dns.py
+++ /dev/null
@@ -1,494 +0,0 @@
-import uuid
-from ipaddress import IPv4Address, IPv6Address
-from pathlib import Path
-from unittest import TestCase
-
-from pydantic import BaseModel
-
-from boefjes.job_models import Boefje, BoefjeMeta, Normalizer, NormalizerMeta, ObservationsWithoutInputOOI, RawDataMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from octopoes.models import Reference
-from octopoes.models.ooi.dns.records import (
-    DNSAAAARecord,
-    DNSARecord,
-    DNSCNAMERecord,
-    DNSMXRecord,
-    DNSNSRecord,
-    DNSSOARecord,
-    DNSTXTRecord,
-)
-from octopoes.models.ooi.dns.zone import DNSZone, Hostname
-from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, Network
-from tests.loading import get_dummy_data
-
-
-class DnsTest(TestCase):
-    maxDiff = None
-
-    def test_dns_normalizer(self):
-        internet = Network(name="internet")
-
-        zone_hostname = Hostname(name="example.nl", network=internet.reference)
-        zone = DNSZone(hostname=zone_hostname.reference)
-        zone_hostname.dns_zone = zone.reference
-
-        ip_v4_addresses = [
-            IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35")),
-            IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.36")),
-        ]
-        dns_a_records = [
-            DNSARecord(
-                hostname=zone_hostname.reference,
-                value=str(ip.address),
-                address=ip.reference,
-                ttl=14364,
-            )
-            for ip in ip_v4_addresses
-        ]
-        ip_v6_addresses = [
-            IPAddressV6(
-                network=internet.reference,
-                address=IPv6Address("2a00:d78:0:712:94:198:159:35"),
-            ),
-            IPAddressV6(
-                network=internet.reference,
-                address=IPv6Address("2a00:d78:0:712:94:198:159:36"),
-            ),
-        ]
-        dns_aaaa_records = [
-            DNSAAAARecord(
-                hostname=zone_hostname.reference,
-                value=str(ip.address),
-                address=ip.reference,
-                ttl=14400,
-            )
-            for ip in ip_v6_addresses
-        ]
-        dns_txt_records = [
-            DNSTXTRecord(
-                hostname=zone_hostname.reference,
-                value="v=spf1 redirect=spf-a.example.nl",
-                ttl=14400,
-            )
-        ]
-
-        mx_hostnames = [
-            Hostname(
-                network=internet.reference,
-                name="mail.example.nl",
-            ),
-            Hostname(
-                network=internet.reference,
-                name="mail2.example.nl",
-            ),
-        ]
-        dns_mx_records = [
-            DNSMXRecord(
-                hostname=zone_hostname.reference,
-                value=f"10 {mx_rec.name}.",
-                ttl=14400,
-                mail_hostname=mx_rec.reference,
-                preference=10,
-            )
-            for mx_rec in mx_hostnames
-        ]
-
-        ns_hostnames = [
-            Hostname(name=value, network=internet.reference)
-            for value in [
-                "ns3.examplenl.org",
-                "ns1.examplenl.nl",
-                "ns2.examplenl.eu",
-                "ns0.examplenl.com",
-            ]
-        ]
-
-        ns_records = [
-            DNSNSRecord(
-                hostname=zone_hostname.reference,
-                value=ns_hostname.name + ".",
-                name_server_hostname=ns_hostname.reference,
-                ttl=2634,
-            )
-            for ns_hostname in ns_hostnames
-        ]
-
-        soa_hostname = Hostname(
-            network=internet.reference,
-            name="ns1.examplenl.nl",
-            dns_zone=zone.reference,
-        )
-        soa_record = DNSSOARecord(
-            hostname=zone_hostname.reference,
-            value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
-            soa_hostname=soa_hostname.reference,
-            ttl=14340,
-            serial=2021111101,
-            retry=7200,
-            refresh=14400,
-            expire=1209600,
-            minimum=86400,
-        )
-
-        # noinspection PyTypeChecker
-        expected = (
-            [zone_hostname, zone]
-            + ip_v4_addresses
-            + dns_a_records
-            + ip_v6_addresses
-            + dns_aaaa_records
-            + dns_txt_records
-            + mx_hostnames
-            + dns_mx_records
-            + ns_hostnames
-            + ns_records
-            + [soa_record]
-        )
-
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        results = runner.run(meta, get_dummy_data("inputs/dns-result-example.nl.json"))
-
-        self.assertEqual(1, len(results.observations))
-        self.assertCountEqual(
-            map(BaseModel.model_dump, expected), map(BaseModel.model_dump, results.observations[0].results)
-        )
-
-    def test_dns_normalizer_cname(self):
-        internet = Network(name="internet")
-
-        zone_hostname = Hostname(
-            network=internet.reference,
-            name="example.nl",
-        )
-        zone = DNSZone(
-            hostname=zone_hostname.reference,
-        )
-        zone_hostname.dns_zone = zone.reference
-
-        input_hostname = Hostname(
-            network=internet.reference,
-            name="www.example.nl",
-            dns_zone=zone.reference,
-        )
-        cname_target = Hostname(
-            network=internet.reference,
-            name="webredir.examplenl.nl",
-        )
-
-        soa_hostname = Hostname(network=internet.reference, name="ns1.examplenl.nl")
-        soa_record = DNSSOARecord(
-            hostname=zone_hostname.reference,
-            value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
-            ttl=14340,
-            soa_hostname=soa_hostname.reference,
-            serial=2021111101,
-            refresh=14400,
-            retry=7200,
-            expire=1209600,
-            minimum=86400,
-        )
-
-        cname_record = DNSCNAMERecord(
-            hostname=input_hostname.reference,
-            value=cname_target.name + ".",
-            ttl=10800,
-            target_hostname=cname_target.reference,
-        )
-
-        ip_address = IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35"))
-        dns_a_record = DNSARecord(
-            hostname=cname_target.reference,
-            address=ip_address.reference,
-            value=str(ip_address.address),
-            ttl=10800,
-        )
-
-        expected = [
-            zone,
-            zone_hostname,
-            soa_hostname,
-            soa_record,
-            cname_target,
-            cname_record,
-            ip_address,
-            dns_a_record,
-            input_hostname,
-        ]
-
-        meta = NormalizerMeta(
-            id=uuid.UUID("72c7d302-0d6f-407a-aaec-9ffcad0ee7c6"),
-            normalizer=Normalizer(id="kat_dns_normalize"),
-            raw_data=RawDataMeta(
-                id=uuid.UUID("3b8397ba-50e4-476e-834a-2fa2595a43a5"),
-                boefje_meta=BoefjeMeta(
-                    id=uuid.UUID("10535bba-2715-42f9-be47-ccd985b59eea"),
-                    boefje=Boefje(id="dns-records"),
-                    organization="_dev",
-                    input_ooi="Hostname|internet|www.example.nl",
-                    arguments={
-                        "domain": "www.example.nl.",
-                        "input": {"name": "www.example.nl."},
-                    },
-                ),
-                mime_types=[{"value": "boefje/dns-records"}],
-            ),
-        )
-
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        results = runner.run(meta, get_dummy_data("inputs/dns-result-www.example.nl.json"))
-
-        self.assertCountEqual(
-            map(BaseModel.model_dump, expected), map(BaseModel.model_dump, results.observations[0].results)
-        )
-
-    def test_parse_record_null_mx_record(self):
-        meta = NormalizerMeta(
-            id=uuid.UUID("d7d65462-5ced-4a57-a1d7-c6d2edf38354"),
-            normalizer=Normalizer(id="kat_dns_normalize"),
-            raw_data=RawDataMeta(
-                id=uuid.UUID("94fe3b47-fb41-4ad7-b2de-1bfe63460c98"),
-                boefje_meta=BoefjeMeta(
-                    id=uuid.UUID("f1e72e47-c11f-47e9-953a-52e3b6833eaf"),
-                    boefje=Boefje(id="dns-records"),
-                    organization="_dev",
-                    input_ooi="Hostname|internet|english.example.nl",
-                    arguments={
-                        "domain": "english.example.nl",
-                        "input": {"name": "english.example.nl"},
-                    },
-                ),
-                mime_types=[{"value": "boefje/dns-records"}],
-            ),
-        )
-
-        answer = get_dummy_data("inputs/dns-result-mx-example.nl.json")
-
-        internet = Network(name="internet")
-        input_hostname = Hostname(
-            network=internet.reference,
-            name="english.example.nl",
-        )
-
-        cname_target = Hostname(network=internet.reference, name="redir.example.nl")
-        cname_record = DNSCNAMERecord(
-            hostname=input_hostname.reference,
-            value="redir.example.nl.",
-            ttl=60,
-            target_hostname=cname_target.reference,
-        )
-        mx_record = DNSMXRecord(
-            hostname=cname_target.reference,
-            value="0 .",
-            ttl=14400,
-            preference=0,
-        )
-
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        results = runner.run(meta, answer)
-
-        expected = [cname_target, cname_record, mx_record, input_hostname]
-        self.assertCountEqual(
-            map(BaseModel.model_dump, expected), map(BaseModel.model_dump, results.observations[0].results)
-        )
-
-    def test_parse_cname_soa(self):
-        internet = Network(name="internet")
-
-        zone_hostname = Hostname(
-            network=internet.reference,
-            name="example.com",
-        )
-        zone = DNSZone(
-            hostname=zone_hostname.reference,
-        )
-        zone_hostname.dns_zone = zone.reference
-
-        input_hostname = Hostname(
-            network=internet.reference,
-            name="www.example.com",
-            dns_zone=zone.reference,
-        )
-
-        cname_record = DNSCNAMERecord(
-            hostname=input_hostname.reference,
-            value="example.com.",
-            ttl=60,
-            target_hostname=zone_hostname.reference,
-        )
-        ip_address = IPAddressV4(network=internet.reference, address=IPv4Address("94.198.159.35"))
-        a_record = DNSARecord(
-            hostname=zone_hostname.reference,
-            address=ip_address.reference,
-            value=str(ip_address.address),
-            ttl=60,
-        )
-        soa_hostname = Hostname(network=internet.reference, name="ns.icann.org")
-        ns_hostnames = [
-            Hostname(name=value, network=internet.reference)
-            for value in [
-                "a.iana-servers.net",
-                "b.iana-servers.net",
-            ]
-        ]
-        ns_records = [
-            DNSNSRecord(
-                hostname=zone_hostname.reference,
-                value=ns_hostname.name + ".",
-                name_server_hostname=ns_hostname.reference,
-                ttl=60,
-            )
-            for ns_hostname in ns_hostnames
-        ]
-        soa_record = DNSSOARecord(
-            hostname=zone_hostname.reference,
-            value="ns.icann.org. noc.dns.icann.org. 2022040432 7200 3600 1209600 3600",
-            ttl=21,
-            soa_hostname=soa_hostname.reference,
-            serial=2022040432,
-            retry=3600,
-            refresh=7200,
-            expire=1209600,
-            minimum=3600,
-        )
-        txt_record = DNSTXTRecord(
-            hostname=zone_hostname.reference,
-            value="v=spf1 -all",
-            ttl=60,
-        )
-        mx_record = DNSMXRecord(
-            hostname=zone_hostname.reference,
-            value="0 example.com.",
-            ttl=60,
-            mail_hostname=zone_hostname.reference,
-            preference=0,
-        )
-
-        meta = NormalizerMeta(
-            id=uuid.UUID("a2a85d54-a6ce-495d-b7a5-23c1a79f4cec"),
-            normalizer=Normalizer(id="kat_dns_normalize"),
-            raw_data=RawDataMeta(
-                id=uuid.UUID("ac481bc2-a524-4dcc-91a4-28ed9c2c142b"),
-                boefje_meta=BoefjeMeta(
-                    id=uuid.UUID("0671b9ac-1624-4c09-a94a-4f9edbc40064"),
-                    boefje=Boefje(id="dns-records"),
-                    organization="_dev",
-                    input_ooi="Hostname|internet|www.example.com",
-                    arguments={
-                        "domain": "www.example.com",
-                        "input": {"name": "www.example.com"},
-                    },
-                ),
-                mime_types=[{"value": "boefje/dns-records"}],
-            ),
-        )
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        results = runner.run(meta, get_dummy_data("inputs/dns-result-example.com-cnames.json"))
-
-        expected = (
-            [
-                zone,
-                zone_hostname,
-                cname_record,
-                ip_address,
-                a_record,
-                soa_record,
-                txt_record,
-                mx_record,
-                input_hostname,
-                soa_hostname,
-            ]
-            + ns_hostnames
-            + ns_records
-        )
-        self.assertCountEqual(
-            map(BaseModel.model_dump, expected), map(BaseModel.model_dump, results.observations[0].results)
-        )
-
-    def test_find_parent_dns_zone(self):
-        internet = Network(name="internet")
-
-        requested_zone = DNSZone(
-            hostname=Hostname(
-                network=internet.reference,
-                name="sub.example.nl",
-            ).reference
-        )
-        parent_zone_hostname = Hostname(
-            network=internet.reference,
-            name="example.nl",
-        )
-        parent_zone = DNSZone(hostname=parent_zone_hostname.reference)
-        parent_zone_hostname.dns_zone = parent_zone.reference
-
-        requested_zone.parent = parent_zone.reference
-
-        name_server_hostname = Hostname(
-            network=internet.reference,
-            name="ns1.examplenl.nl",
-        )
-
-        soa_record = DNSSOARecord(
-            hostname=parent_zone_hostname.reference,
-            value="ns1.examplenl.nl. hostmaster.sidn.nl. 2021111101 14400 7200 1209600 86400",
-            ttl=14340,
-            soa_hostname=name_server_hostname.reference,
-            serial=2021111101,
-            retry=7200,
-            refresh=14400,
-            expire=1209600,
-            minimum=86400,
-        )
-
-        input_ = DNSZone(
-            hostname=Hostname(
-                network=Reference.from_str("Network|internet"),
-                name="sub.example.nl",
-            ).reference
-        ).serialize()
-
-        meta = NormalizerMeta(
-            id=uuid.UUID("ee8374bb-e79f-4083-9ce9-add4f96006f2"),
-            normalizer=Normalizer(id="kat_dns_zone_normalize"),
-            raw_data=RawDataMeta(
-                id=uuid.UUID("2147da2a-921c-4c51-aef3-fa82d8d6e089"),
-                boefje_meta=BoefjeMeta(
-                    id=uuid.UUID("ff1f0d62-a2e0-480f-8b11-5fb24974edce"),
-                    boefje=Boefje(id="dns-records"),
-                    organization="_dev",
-                    input_ooi="DnsZone|internet|sub.example.nl",
-                    arguments={"input": input_},
-                ),
-                mime_types=[{"value": "boefje/dns-records"}],
-            ),
-        )
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        results = runner.run(meta, get_dummy_data("inputs/dns-zone-result-sub.example.nl.txt"))
-
-        expected = [
-            requested_zone,
-            parent_zone,
-            parent_zone_hostname,
-            name_server_hostname,
-            soa_record,
-        ]
-        self.assertCountEqual(
-            map(BaseModel.model_dump, expected), map(BaseModel.model_dump, results.observations[0].results)
-        )
-
-    def test_exception_raised_no_input_ooi(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
-        meta.raw_data.boefje_meta.input_ooi = None
-
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-
-        with self.assertRaises(ObservationsWithoutInputOOI):
-            runner.run(meta, get_dummy_data("inputs/dns-result-example.nl.json"))
diff --git a/boefjes/tests/test_generic_finding_normalizer.py b/boefjes/tests/test_generic_finding_normalizer.py
deleted file mode 100644
index 9e8da108984..00000000000
--- a/boefjes/tests/test_generic_finding_normalizer.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from unittest import TestCase
-
-from boefjes.plugins.kat_finding_normalizer.normalize import run
-from octopoes.models import Reference
-from octopoes.models.ooi.findings import KATFindingType
-from octopoes.models.types import CVEFindingType, Finding
-
-
-class CVETest(TestCase):
-    maxDiff = None
-
-    def test_single(self):
-        input_ooi = {"primary_key": "Network|internet"}
-
-        oois = list(run(input_ooi, b"CVE-2021-00000"))
-
-        expected = [
-            CVEFindingType(id="CVE-2021-00000"),
-            Finding(
-                finding_type=CVEFindingType(id="CVE-2021-00000").reference,
-                ooi=Reference.from_str("Network|internet"),
-                description="CVE-2021-00000 is found on this OOI",
-            ),
-        ]
-
-        self.assertEqual(expected, oois)
-
-    def test_multiple(self):
-        input_ooi = {"primary_key": "Network|internet"}
-
-        oois = list(run(input_ooi, b"CVE-2021-00000, KAT-MOCK-FINDING"))
-
-        expected = [
-            CVEFindingType(id="CVE-2021-00000"),
-            Finding(
-                finding_type=CVEFindingType(id="CVE-2021-00000").reference,
-                ooi=Reference.from_str("Network|internet"),
-                description="CVE-2021-00000 is found on this OOI",
-            ),
-            KATFindingType(id="KAT-MOCK-FINDING"),
-            Finding(
-                finding_type=KATFindingType(id="KAT-MOCK-FINDING").reference,
-                ooi=Reference.from_str("Network|internet"),
-                description="KAT-MOCK-FINDING is found on this OOI",
-            ),
-        ]
-
-        self.assertEqual(expected, oois)
diff --git a/boefjes/tests/test_leakix.py b/boefjes/tests/test_leakix.py
deleted file mode 100644
index 5f3658aa550..00000000000
--- a/boefjes/tests/test_leakix.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from unittest import TestCase
-
-from pydantic import parse_obj_as
-
-from boefjes.plugins.kat_leakix.normalize import run
-from octopoes.models.types import OOIType
-from tests.loading import get_dummy_data
-
-
-class LeakIxNormalizerTest(TestCase):
-    def test_output(self):
-        input_ooi = parse_obj_as(
-            OOIType,
-            {
-                "object_type": "HostnameHTTPURL",
-                "network": "Network|internet",
-                "scheme": "https",
-                "port": 443,
-                "path": "/",
-                "netloc": "Hostname|internet|example.com",
-            },
-        )
-
-        output = [x for x in run(input_ooi.serialize(), get_dummy_data("raw/leakix-example.com.json"))]
-
-        self.assertEqual(170, len(output))
-        self.assertEqual(get_dummy_data("raw/leakix-example.com-output.txt").decode().strip(), str(output))
diff --git a/boefjes/tests/test_manual.py b/boefjes/tests/test_manual.py
deleted file mode 100644
index 70e71d4fe2c..00000000000
--- a/boefjes/tests/test_manual.py
+++ /dev/null
@@ -1,194 +0,0 @@
-from ipaddress import IPv4Address, IPv6Address
-from pathlib import Path
-from unittest import TestCase
-
-from pydantic_core import Url
-
-from boefjes.job_models import NormalizerMeta, NormalizerResults
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from octopoes.models import Reference
-from tests.loading import get_dummy_data
-
-
-class ManualTest(TestCase):
-    TEST_DECLARATIONS_DATA = (
-        b"["
-        b'{"ooi": {"object_type": "Network", "scan_profile": null, "user_id": null\
-        , "primary_key": "Network|net1", "name": "net1"}},'
-        b'{"ooi": {"object_type": "Network", "scan_profile": null, "user_id": null\
-        , "primary_key": "Network|net2", "name": "net2"}}'
-        b"]"
-    )
-    CSV_EXAMPLES = [
-        # hostname
-        b"name,network\nexample.com,internet",
-        # hostname without network
-        b"name\nexample.net",
-        # ipv4s
-        b"""address,network
-1.1.1.1,internet
-2.2.2.2,internet
-3.3.3.3,darknet""",
-        # ipv6s
-        b"""address,network
-FE80:CD00:0000:0CDE:1257:0000:211E:729C,internet
-FE80:CD00:0000:0CDE:1257:0000:211E:729D,darknet""",
-        # urls
-        b"""network,raw
-internet,https://example.com/
-darknet,https://openkat.nl/""",
-        # url without network
-        b"raw\nhttps://example.com/",
-    ]
-
-    def test_parse_manual_declarations(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("manual-ooi.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, self.TEST_DECLARATIONS_DATA)
-
-        self.assertEqual(2, len(output.declarations))
-        self.assertEqual(0, len(output.observations))
-
-        self.assertEqual(
-            {
-                "name": "net1",
-                "object_type": "Network",
-                "primary_key": "Network|net1",
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[0].ooi.dict(),
-        )
-        self.assertEqual(
-            {
-                "name": "net2",
-                "object_type": "Network",
-                "primary_key": "Network|net2",
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-    def test_parse_manual_hostname_csv(self):
-        meta, output, runner = self.check_network_created(0)
-
-        self.assertEqual(2, len(output.declarations))
-        self.assertEqual(
-            {
-                "dns_zone": None,
-                "name": "example.com",
-                "network": Reference("Network|internet"),
-                "object_type": "Hostname",
-                "primary_key": "Hostname|internet|example.com",
-                "registered_domain": None,
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-        meta, output, runner = self.check_network_created(1)
-
-        self.assertEqual(2, len(output.declarations))
-        self.assertEqual(
-            {
-                "dns_zone": None,
-                "name": "example.net",
-                "network": Reference("Network|internet"),
-                "object_type": "Hostname",
-                "primary_key": "Hostname|internet|example.net",
-                "registered_domain": None,
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-    def test_parse_manual_ip_csv(self):
-        meta, output, runner = self.check_network_created(2)
-        self.assertEqual(6, len(output.declarations))
-        self.assertEqual(
-            {
-                "address": IPv4Address("1.1.1.1"),
-                "netblock": None,
-                "network": Reference("Network|internet"),
-                "object_type": "IPAddressV4",
-                "primary_key": "IPAddressV4|internet|1.1.1.1",
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-        meta, output, runner = self.check_network_created(3)
-        self.assertEqual(
-            {
-                "address": IPv6Address("fe80:cd00:0:cde:1257:0:211e:729c"),
-                "netblock": None,
-                "network": Reference("Network|internet"),
-                "object_type": "IPAddressV6",
-                "primary_key": "IPAddressV6|internet|fe80:cd00:0:cde:1257:0:211e:729c",
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-    def test_parse_url_csv(self):
-        meta, output, runner = self.check_network_created(4)
-        self.assertEqual(4, len(output.declarations))
-
-        self.assertEqual(
-            {
-                "network": Reference("Network|internet"),
-                "object_type": "URL",
-                "primary_key": "URL|internet|https://example.com/",
-                "raw": Url(
-                    "https://example.com/",
-                ),
-                "scan_profile": None,
-                "user_id": None,
-                "web_url": None,
-            },
-            output.declarations[1].ooi.model_dump(),
-        )
-
-        meta, output, runner = self.check_network_created(5)
-        self.assertEqual(2, len(output.declarations))
-        self.assertEqual(
-            {
-                "network": Reference("Network|internet"),
-                "object_type": "URL",
-                "primary_key": "URL|internet|https://example.com/",
-                "raw": Url(
-                    "https://example.com/",
-                ),
-                "scan_profile": None,
-                "user_id": None,
-                "web_url": None,
-            },
-            output.declarations[1].ooi.dict(),
-        )
-
-    def check_network_created(self, csv_idx: int) -> tuple[NormalizerMeta, NormalizerResults, LocalNormalizerJobRunner]:
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("manual-csv.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, self.CSV_EXAMPLES[csv_idx])
-
-        self.assertEqual(0, len(output.observations))
-        self.assertEqual(
-            {
-                "name": "internet",
-                "object_type": "Network",
-                "primary_key": "Network|internet",
-                "scan_profile": None,
-                "user_id": None,
-            },
-            output.declarations[0].ooi.dict(),
-        )
-        return meta, output, runner
diff --git a/boefjes/tests/test_nmap.py b/boefjes/tests/test_nmap.py
deleted file mode 100644
index 9d0de572fdf..00000000000
--- a/boefjes/tests/test_nmap.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from unittest import TestCase
-
-from boefjes.plugins.kat_nmap_tcp.normalize import run
-from octopoes.models.ooi.network import IPAddressV4, Network
-from tests.loading import get_dummy_data
-
-
-class NmapTest(TestCase):
-    def test_normalizer(self):
-        input_ooi = IPAddressV4(network=Network(name="internet").reference, address="134.209.85.72")
-        output = list(run(input_ooi.serialize(), get_dummy_data("raw/nmap_mispoes.xml")))
-        self.assertEqual(15, len(output))
-        for i, out in enumerate(output[:-1]):
-            if out.object_type == "IPPort" and output[i + 1].object_type == "Service":
-                if out.port == 80:
-                    self.assertEqual("http", output[i + 1].name)
-                elif out.port == 443:
-                    self.assertEqual("https", output[i + 1].name)
-                else:
-                    self.assertNotEqual("http", output[i + 1].name)
-                    self.assertNotEqual("https", output[i + 1].name)
diff --git a/boefjes/tests/test_scan_profiles.py b/boefjes/tests/test_scan_profiles.py
deleted file mode 100644
index e233a278cf5..00000000000
--- a/boefjes/tests/test_scan_profiles.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import json
-import os
-from pathlib import Path
-from unittest import TestCase, mock
-
-import pytest
-from pydantic import ValidationError
-
-from boefjes.config import Settings
-from boefjes.job_handler import NormalizerHandler
-from boefjes.job_models import NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from octopoes.models import DeclaredScanProfile
-from tests.loading import get_dummy_data
-
-RAW_DATA = json.dumps(
-    {"ip_addresses": [{"address": "127.0.0.1"}, {"address": "10.0.0.0"}], "domains": [{"name": "example.com"}]}
-)
-
-
-class ScanProfileTest(TestCase):
-    def test_normalizer_can_yield_scan_profiles(self):
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("external_db.json"))
-        output = runner.run(meta, bytes(RAW_DATA, "UTF-8"))
-
-        self.assertEqual(1, len(output.observations))
-        self.assertEqual(3, len(output.observations[0].results))
-        self.assertEqual(3, len(output.scan_profiles))
-
-        profile = output.scan_profiles[0]
-        self.assertIsInstance(profile, DeclaredScanProfile)
-        self.assertEqual("IPAddressV4|internet|127.0.0.1", profile.reference)
-        self.assertEqual(3, profile.level)
-
-        profile = output.scan_profiles[1]
-        self.assertIsInstance(profile, DeclaredScanProfile)
-        self.assertEqual("IPAddressV4|internet|10.0.0.0", profile.reference)
-        self.assertEqual(3, profile.level)
-
-        profile = output.scan_profiles[2]
-        self.assertIsInstance(profile, DeclaredScanProfile)
-        self.assertEqual("Hostname|internet|example.com", profile.reference)
-        self.assertEqual(3, profile.level)
-
-    def test_job_handler_respects_whitelist(self):
-        bytes_mock = mock.Mock()
-        bytes_mock.get_raw.return_value = RAW_DATA
-        octopoes = mock.Mock()
-
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-        runner = LocalNormalizerJobRunner(local_repository)
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("external_db.json"))
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": 5}'
-        with pytest.raises(ValidationError):
-            Settings()
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": -1}'
-        with pytest.raises(ValidationError):
-            Settings()
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"x": 3}'
-        NormalizerHandler(runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
-        assert octopoes.save_many_scan_profiles.call_count == 0
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 2}'
-        NormalizerHandler(runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
-        assert octopoes.save_many_scan_profiles.call_count == 1
-        assert octopoes.save_many_scan_profiles.call_args[0][0][0].level == 2
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 3}'
-        NormalizerHandler(runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
-        assert octopoes.save_many_scan_profiles.call_count == 2
-        assert octopoes.save_many_scan_profiles.call_args[0][0][0].level == 3
-
-        os.environ["BOEFJES_SCAN_PROFILE_WHITELIST"] = '{"kat_external_db_normalize": 4, "abc": 0}'
-        NormalizerHandler(runner, bytes_mock, Settings().scan_profile_whitelist, lambda x: octopoes).handle(meta)
-        assert octopoes.save_many_scan_profiles.call_count == 3
diff --git a/boefjes/tests/test_security_txt.py b/boefjes/tests/test_security_txt.py
deleted file mode 100644
index 8241c8656db..00000000000
--- a/boefjes/tests/test_security_txt.py
+++ /dev/null
@@ -1,97 +0,0 @@
-from unittest import TestCase
-
-from boefjes.plugins.kat_security_txt_downloader.normalize import run
-from octopoes.models import Reference
-from octopoes.models.ooi.dns.zone import Hostname
-from octopoes.models.ooi.network import IPAddressV4, IPPort, Network
-from octopoes.models.ooi.service import IPService, Service
-from octopoes.models.ooi.web import URL, SecurityTXT, Website
-from tests.loading import get_dummy_data
-
-input_ooi = {
-    "object_type": "Website",
-    "scan_profile": "scan_profile_type='declared' "
-    "reference=Reference('Website|internet|192.0.2.0|tcp|443|https|internet|example.com') level=<ScanLevel.L2: 2>",
-    "primary_key": "Website|internet|192.0.2.0|tcp|443|https|internet|example.com",
-    "ip_service": {
-        "ip_port": {
-            "address": {"network": {"name": "internet"}, "address": "192.0.2.0"},
-            "protocol": "tcp",
-            "port": "443",
-        },
-        "service": {"name": "https"},
-    },
-    "hostname": {"network": {"name": "internet"}, "name": "example.com"},
-    "certificate": "None",
-}
-
-
-class SecurityTXTTest(TestCase):
-    maxDiff = None
-
-    def test_security_txt_same_website(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/security_txt_result_same_website.json"),
-            )
-        )
-
-        expected = []
-        expected.append(
-            URL(raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference)
-        )
-        url = URL(raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference)
-        expected.append(url)
-        expected.append(
-            SecurityTXT(
-                website=Reference.from_str("Website|internet|192.0.2.0|tcp|443|https|internet|example.com"),
-                url=url.reference,
-                security_txt="This is the content",
-                redirects_to=None,
-            )
-        )
-
-        self.assertEqual(expected, oois)
-
-    def test_security_txt_different_website(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/security_txt_result_different_website.json"),
-            )
-        )
-
-        expected = []
-        url_original = URL(
-            raw="https://example.com/.well-known/security.txt", network=Network(name="internet").reference
-        )
-        expected.append(url_original)
-        url = URL(raw="https://www.example.com/.well-known/security.txt", network=Network(name="internet").reference)
-        expected.append(url)
-        expected.append(Hostname(name="www.example.com", network=Network(name="internet").reference))
-        ip = IPAddressV4(address="192.0.2.1", network=Network(name="internet").reference)
-        expected.append(ip)
-        expected.append(Service(name="https"))
-        port = IPPort(address=ip.reference, port=443, protocol="tcp")
-        expected.append(port)
-        ip_service = IPService(ip_port=port.reference, service=Service(name="https").reference)
-        expected.append(ip_service)
-        website = Website(
-            ip_service=ip_service.reference,
-            hostname=Hostname(name="www.example.com", network=Network(name="internet").reference).reference,
-        )
-        expected.append(website)
-        security_txt = SecurityTXT(
-            website=website.reference, url=url.reference, security_txt="This is the content", redirects_to=None
-        )
-        expected.append(security_txt)
-        expected.append(
-            SecurityTXT(
-                website=Reference.from_str("Website|internet|192.0.2.0|tcp|443|https|internet|example.com"),
-                url=url_original.reference,
-                security_txt=None,
-                redirects_to=security_txt.reference,
-            )
-        )
-        self.assertEqual(expected, oois)
diff --git a/boefjes/tests/test_snyk.py b/boefjes/tests/test_snyk.py
deleted file mode 100644
index 6de75179347..00000000000
--- a/boefjes/tests/test_snyk.py
+++ /dev/null
@@ -1,136 +0,0 @@
-import json
-from unittest import TestCase, mock
-
-from boefjes.job_models import BoefjeMeta
-from boefjes.plugins.kat_snyk.main import run as run_boefje
-from boefjes.plugins.kat_snyk.normalize import run
-from octopoes.models.ooi.findings import SnykFindingType
-from octopoes.models.types import CVEFindingType, Finding, Software
-from tests.loading import get_dummy_data
-
-input_ooi = {
-    "primary_key": "Software|lodash|1.1.0|",
-    "software": {
-        "name": "lodash",
-        "version": "1.1.0",
-    },
-}
-
-
-class SnykTest(TestCase):
-    maxDiff = None
-
-    def test_snyk_no_findings(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/snyk-result-no-findings.json"),
-            )
-        )
-
-        # noinspection PyTypeChecker
-        expected = ()
-
-        self.assertCountEqual(expected, oois)
-
-    def test_snyk_findings(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/snyk-result-findings.json"),
-            )
-        )
-
-        software = Software(name="lodash", version="1.1.0")
-
-        snyk_finding_data = [
-            ("SNYK-JS-LODASH-590103", "Prototype Pollution"),
-            ("SNYK-JS-LODASH-608086", "Prototype Pollution"),
-        ]
-        cve_finding_data = [
-            ("CVE-2018-16487", "Prototype Pollution"),
-            ("CVE-2018-3721", "Prototype Pollution"),
-            ("CVE-2019-1010266", "Regular Expression Denial of Service (ReDoS)"),
-            ("CVE-2019-10744", "Prototype Pollution"),
-            ("CVE-2020-28500", "Regular Expression Denial of Service (ReDoS)"),
-            ("CVE-2020-8203", "Prototype Pollution"),
-            ("CVE-2021-23337", "Command Injection"),
-        ]
-
-        snyk_findingtypes = []
-        snyk_findings = []
-        cve_findingtypes = []
-        cve_findings = []
-
-        for finding in snyk_finding_data:
-            snyk_ft = SnykFindingType(id=finding[0])
-            snyk_findingtypes.append(snyk_ft)
-            snyk_findings.append(
-                Finding(
-                    finding_type=snyk_ft.reference,
-                    ooi=software.reference,
-                    description=finding[1],
-                )
-            )
-
-        for finding in cve_finding_data:
-            cve_ft = CVEFindingType(id=finding[0])
-            cve_findingtypes.append(cve_ft)
-            cve_findings.append(
-                Finding(
-                    finding_type=cve_ft.reference,
-                    ooi=software.reference,
-                    description=finding[1],
-                )
-            )
-
-        # noinspection PyTypeChecker
-        expected = snyk_findingtypes + snyk_findings + cve_findingtypes + cve_findings
-
-        self.assertCountEqual(expected, oois)
-
-    @mock.patch("boefjes.plugins.kat_snyk.main.requests.get")
-    def test_snyk_html_parser(self, mock_get):
-        boefje_meta = BoefjeMeta.model_validate_json(get_dummy_data("snyk-job.json"))
-
-        # Mock the first GET request
-        mock_first_get = mock.Mock()
-        mock_first_get.content = get_dummy_data("snyk-vuln.html")
-
-        # Mock the next GET request
-        mock_second_get = mock.Mock()
-        mock_second_get.content = get_dummy_data("snyk-vuln2.html")
-
-        # Mock the next 7 GET requests
-        mock_third_get = mock.Mock()
-        mock_third_get.content = get_dummy_data("snyk-vuln3.html")
-
-        mock_get.side_effect = [mock_first_get] + [mock_second_get] + [mock_third_get] * 7
-
-        mime_types, result = run_boefje(boefje_meta)[0]
-
-        output = json.loads(result)
-
-        self.assertListEqual(output["table_versions"], [])
-        self.assertListEqual(
-            output["table_vulnerabilities"],
-            [
-                {
-                    "Vuln_href": "SNYK-JS-LODASH-1018905",
-                    "Vuln_text": "Regular Expression Denial of Service (ReDoS)",
-                    "Vuln_versions": "<4.17.21",
-                },
-                {"Vuln_href": "SNYK-JS-LODASH-608086", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.17"},
-                {"Vuln_href": "SNYK-JS-LODASH-450202", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.12"},
-                {
-                    "Vuln_href": "SNYK-JS-LODASH-73639",
-                    "Vuln_text": "Regular Expression Denial of Service (ReDoS)",
-                    "Vuln_versions": "<4.17.11",
-                },
-                {"Vuln_href": "SNYK-JS-LODASH-73638", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.11"},
-                {"Vuln_href": "npm:lodash:20180130", "Vuln_text": "Prototype Pollution", "Vuln_versions": "<4.17.5"},
-            ],
-        )
-        self.assertListEqual(
-            output["cve_vulnerabilities"], [{"cve_code": "CVE-2021-23337", "Vuln_text": "Command Injection"}]
-        )
diff --git a/boefjes/tests/test_tasks.py b/boefjes/tests/test_tasks.py
index f0cbf5fac56..763c89938bf 100644
--- a/boefjes/tests/test_tasks.py
+++ b/boefjes/tests/test_tasks.py
@@ -3,201 +3,199 @@
 import sys
 from datetime import datetime, timezone
 from pathlib import Path
-from unittest import TestCase, mock
+from unittest import mock
 from uuid import UUID
 
 import pytest
 
+from boefjes.dependencies.plugins import PluginService
 from boefjes.job_handler import BoefjeHandler
 from boefjes.job_models import BoefjeMeta, InvalidReturnValueNormalizer, NormalizerMeta
-from boefjes.local import LocalBoefjeJobRunner, LocalNormalizerJobRunner
+from boefjes.local import LocalBoefjeJobRunner
 from boefjes.local_repository import LocalPluginRepository
 from boefjes.models import Bit, Boefje, Normalizer, PluginType
 from boefjes.runtime_interfaces import JobRuntimeError
+from boefjes.sql.config_storage import create_config_storage
+from boefjes.sql.plugin_storage import create_plugin_storage
 from tests.loading import get_dummy_data
 
+boefjes = [
+    Boefje(
+        id="test-boefje-1",
+        name="test-boefje-1",
+        consumes={"SomeOOI"},
+        produces=["test-boef-1", "test/text"],
+    ),
+    Boefje(
+        id="test-boefje-2",
+        name="test-boefje-2",
+        consumes={"SomeOOI"},
+        produces=["test-boef-2", "test/text"],
+    ),
+    Boefje(
+        id="test-boefje-3",
+        name="test-boefje-3",
+        consumes={"SomeOOI"},
+        produces=["test-boef-3", "test/plain"],
+    ),
+    Boefje(
+        id="test-boefje-4",
+        name="test-boefje-4",
+        consumes={"SomeOOI"},
+        produces=["test-boef-4", "test/and-simple"],
+    ),
+]
+normalizers = [
+    Normalizer(
+        id="test-normalizer-1",
+        name="test-normalizer-1",
+        consumes=["test-boef-3", "test/text"],
+        produces=["SomeOOI", "OtherOOI"],
+    ),
+    Normalizer(
+        id="test-normalizer-2",
+        name="test-normalizer-2",
+        consumes=["test/text"],
+        produces=["SomeOtherOOI"],
+    ),
+]
+bits = [
+    Bit(
+        id="test-bit-1",
+        name="test-bit-1",
+        consumes="SomeOOI",
+        produces=["SomeOOI"],
+        parameters=[],
+    ),
+    Bit(
+        id="test-bit-2",
+        name="test-bit-2",
+        consumes="SomeOOI",
+        produces=["SomeOOI", "SomeOtherOOI"],
+        parameters=[],
+    ),
+]
+plugins: list[PluginType] = boefjes + normalizers + bits
+sys.path.append(str(Path(__file__).parent))
+
+
+def test_parse_normalizer_meta_to_json():
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("snyk-normalizer.json"))
+    meta.started_at = datetime(10, 10, 10, 10, tzinfo=timezone.utc)
+    meta.ended_at = datetime(10, 10, 10, 12, tzinfo=timezone.utc)
+
+    assert "0010-10-10T10:00:00Z" in meta.model_dump_json()
+    assert "0010-10-10T12:00:00Z" in meta.model_dump_json()
+
+
+def test_handle_boefje_with_exception(mocker):
+    mocker.patch("boefjes.job_handler.get_environment_settings", return_value={})
+    mock_bytes_api_client = mocker.patch("boefjes.job_handler.bytes_api_client")
+    mocker.patch("boefjes.job_handler.get_octopoes_api_connector")
+
+    meta = BoefjeMeta(
+        id="0dca59db-b339-47c4-bcc9-896fc18e2386",
+        boefje={"id": "dummy_boefje_runtime_exception"},
+        input_ooi="Network|internet",
+        arguments={},
+        organization="_dev",
+    )
+    local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
+
+    mock_session = mock.MagicMock()
+    mock_session.query.all.return_value = []
+
+    plugin_service = PluginService(
+        create_plugin_storage(mock_session),
+        create_config_storage(mock_session),
+        local_repository,
+    )
+
+    with pytest.raises(RuntimeError):  # Bytes still saves exceptions before they are reraised
+        BoefjeHandler(LocalBoefjeJobRunner(local_repository), plugin_service, mock_bytes_api_client).handle(meta)
+
+    mock_bytes_api_client.save_boefje_meta.assert_called_once_with(meta)
+    mock_bytes_api_client.save_raw.assert_called_once()
+    raw_call_args = mock_bytes_api_client.save_raw.call_args
+
+    assert raw_call_args[0][0] == UUID("0dca59db-b339-47c4-bcc9-896fc18e2386")
+    assert "Traceback (most recent call last)" in raw_call_args[0][1]
+    assert "JobRuntimeError: Boefje failed" in raw_call_args[0][1]
+    assert raw_call_args[0][2] == {
+        "error/boefje",
+        "boefje/dummy_boefje_runtime_exception",
+    }
+
+
+def test_exception_raised_unsupported_return_type_normalizer(mock_normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
+    meta.raw_data.boefje_meta.input_ooi = None
+    meta.normalizer.id = "dummy_bad_normalizer_return_type"
+
+    with pytest.raises(InvalidReturnValueNormalizer):
+        mock_normalizer_runner.run(meta, b"123")
+
+
+def test_exception_raised_invalid_return_value(mock_normalizer_runner):
+    meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
+    meta.raw_data.boefje_meta.input_ooi = None
+    meta.normalizer.id = "dummy_bad_normalizer_dict_structure"
+
+    with pytest.raises(InvalidReturnValueNormalizer):
+        mock_normalizer_runner.run(meta, b"123")
+
+
+def test_cleared_boefje_env(mock_boefje_runner) -> None:
+    """This test checks if un-containerized (local) boefjes can only access their explicitly set env vars"""
+
+    arguments = {"ARG1": "value1", "ARG2": "value2"}
+
+    meta = BoefjeMeta(
+        id="b49cd6f5-4d92-4a13-9d21-232993826cd9",
+        boefje={"id": "dummy_boefje_environment"},
+        input_ooi="Network|internet",
+        arguments=arguments,
+        organization="_dev",
+    )
+
+    current_env = os.environ.copy()
+    output = mock_boefje_runner.run(meta, arguments)
+    output_dict = ast.literal_eval(output[0][1].decode())
+
+    # Assert that there are no overlapping environment keys
+    assert not set(current_env.keys()) & set(output_dict.keys())
+
+    # Assert that the original environment has been restored correctly
+    assert current_env == os.environ
+
 
-class TaskTest(TestCase):
-    def setUp(self) -> None:
-        self.boefjes = [
-            Boefje(
-                id="test-boefje-1",
-                consumes={"SomeOOI"},
-                produces=["test-boef-1", "test/text"],
-            ),
-            Boefje(
-                id="test-boefje-2",
-                consumes={"SomeOOI"},
-                produces=["test-boef-2", "test/text"],
-            ),
-            Boefje(
-                id="test-boefje-3",
-                consumes={"SomeOOI"},
-                produces=["test-boef-3", "test/plain"],
-            ),
-            Boefje(
-                id="test-boefje-4",
-                consumes={"SomeOOI"},
-                produces=["test-boef-4", "test/and-simple"],
-            ),
-        ]
-        self.normalizers = [
-            Normalizer(
-                id="test-normalizer-1",
-                consumes=["test-boef-3", "test/text"],
-                produces=["SomeOOI", "OtherOOI"],
-            ),
-            Normalizer(
-                id="test-normalizer-2",
-                consumes=["test/text"],
-                produces=["SomeOtherOOI"],
-            ),
-        ]
-        self.bits = [
-            Bit(
-                id="test-bit-1",
-                consumes="SomeOOI",
-                produces=["SomeOOI"],
-                parameters=[],
-            ),
-            Bit(
-                id="test-bit-2",
-                consumes="SomeOOI",
-                produces=["SomeOOI", "SomeOtherOOI"],
-                parameters=[],
-            ),
-        ]
-        self.plugins: list[PluginType] = self.boefjes + self.normalizers + self.bits
-        sys.path.append(str(Path(__file__).parent))
-
-    def _get_boefje_meta(self):
-        return BoefjeMeta(
-            id="c188ef6b-b756-4cb0-9cb2-0db776e3cce3",
-            boefje={"id": "test-boefje-1", "version": "9"},
-            input_ooi="Hostname|internet|example.com",
-            arguments={},
-            organization="_dev",
-        ).copy()
-
-    def test_parse_normalizer_meta_to_json(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("snyk-normalizer.json"))
-        meta.started_at = datetime(10, 10, 10, 10, tzinfo=timezone.utc)
-        meta.ended_at = datetime(10, 10, 10, 12, tzinfo=timezone.utc)
-
-        assert "0010-10-10T10:00:00Z" in meta.model_dump_json()
-        assert "0010-10-10T12:00:00Z" in meta.model_dump_json()
-
-    @mock.patch("boefjes.job_handler.get_environment_settings", return_value={})
-    @mock.patch("boefjes.job_handler.bytes_api_client")
-    @mock.patch("boefjes.job_handler.get_octopoes_api_connector")
-    def test_handle_boefje_with_exception(self, mock_get_octopoes_api_connector, mock_bytes_api_client, mock_get_env):
-        meta = BoefjeMeta(
-            id="0dca59db-b339-47c4-bcc9-896fc18e2386",
-            boefje={"id": "dummy_boefje_runtime_exception"},
-            input_ooi="Network|internet",
-            arguments={},
-            organization="_dev",
-        )
-
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-
-        with pytest.raises(RuntimeError):  # Bytes still saves exceptions before they are reraised
-            BoefjeHandler(LocalBoefjeJobRunner(local_repository), local_repository, mock_bytes_api_client).handle(meta)
-
-        mock_bytes_api_client.save_boefje_meta.assert_called_once_with(meta)
-        mock_bytes_api_client.save_raw.assert_called_once()
-        raw_call_args = mock_bytes_api_client.save_raw.call_args
-
-        assert raw_call_args[0][0] == UUID("0dca59db-b339-47c4-bcc9-896fc18e2386")
-        assert "Traceback (most recent call last)" in raw_call_args[0][1]
-        assert "JobRuntimeError: Boefje failed" in raw_call_args[0][1]
-        assert raw_call_args[0][2] == {
-            "error/boefje",
-            "boefje/dummy_boefje_runtime_exception",
-        }
-
-    def test_exception_raised_unsupported_return_type_normalizer(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
-        meta.raw_data.boefje_meta.input_ooi = None
-        meta.normalizer.id = "dummy_bad_normalizer_return_type"
-
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-        runner = LocalNormalizerJobRunner(local_repository)
-
-        with self.assertRaises(InvalidReturnValueNormalizer):
-            runner.run(meta, b"123")
-
-    def test_exception_raised_invalid_return_value(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("dns-normalize.json"))
-        meta.raw_data.boefje_meta.input_ooi = None
-        meta.normalizer.id = "dummy_bad_normalizer_dict_structure"
-
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-        runner = LocalNormalizerJobRunner(local_repository)
-
-        with self.assertRaises(InvalidReturnValueNormalizer):
-            runner.run(meta, b"123")
-
-    def test_cleared_boefje_env(self) -> None:
-        """This test checks if un-containerized (local) boefjes can only access their explicitly set env vars"""
-
-        arguments = {"ARG1": "value1", "ARG2": "value2"}
-
-        meta = BoefjeMeta(
-            id="b49cd6f5-4d92-4a13-9d21-232993826cd9",
-            boefje={"id": "dummy_boefje_environment"},
-            input_ooi="Network|internet",
-            arguments=arguments,
-            organization="_dev",
-        )
-
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-
-        runner = LocalBoefjeJobRunner(local_repository)
-
-        current_env = os.environ.copy()
-
-        output = runner.run(meta, arguments)
-
-        output_dict = ast.literal_eval(output[0][1].decode())
-
-        # Assert that there are no overlapping environment keys
-        assert not set(current_env.keys()) & set(output_dict.keys())
-
-        # Assert that the original environment has been restored correctly
-        assert current_env == os.environ
-
-    def test_cannot_run_local_oci_boefje(self) -> None:
-        meta = BoefjeMeta(
-            id="b49cd6f5-4d92-4a13-9d21-232993826cd9",
-            boefje={"id": "dummy_oci_boefje_no_main"},
-            input_ooi="Network|internet",
-            organization="_dev",
-        )
+def test_cannot_run_local_oci_boefje(mock_boefje_runner) -> None:
+    meta = BoefjeMeta(
+        id="b49cd6f5-4d92-4a13-9d21-232993826cd9",
+        boefje={"id": "dummy_oci_boefje_no_main"},
+        input_ooi="Network|internet",
+        organization="_dev",
+    )
 
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-        runner = LocalBoefjeJobRunner(local_repository)
+    with pytest.raises(JobRuntimeError):
+        mock_boefje_runner.run(meta, {})
 
-        with self.assertRaises(JobRuntimeError):
-            runner.run(meta, {})
 
-    def test_correct_local_runner_hash(self) -> None:
-        """This test checks if calculating the hash of local boefjes returns the correct result"""
+def test_correct_local_runner_hash(mock_local_repository) -> None:
+    """This test checks if calculating the hash of local boefjes returns the correct result"""
+    boefje_resource_1 = mock_local_repository.by_id("dummy_boefje_environment")
+    boefje_resource_2 = mock_local_repository.by_id("dummy")
 
-        local_repository = LocalPluginRepository(Path(__file__).parent / "modules")
-        boefje_resource_1 = local_repository.by_id("dummy_boefje_environment")
-        boefje_resource_2 = local_repository.by_id("dummy")
+    # This boefje has a __pycache__ folder with *.pyc files, which should be ignored
+    boefje_resource_3 = mock_local_repository.by_id("dummy_boefje_environment_with_pycache")
 
-        # This boefje has a __pycache__ folder with *.pyc files, which should be ignored
-        boefje_resource_3 = local_repository.by_id("dummy_boefje_environment_with_pycache")
+    # Sanity check to make sure the .pyc files are actually there
+    path = Path(__file__).parent / "modules" / "dummy_boefje_environment_with_pycache"
+    assert Path(path / "some_subdir/cache.pyc").is_file()
+    assert Path(path / "some_subdir/__init__.py").is_file()
+    assert Path(path / "__pycache__/pytest__init__.cpython-311.pyc").is_file()
+    assert Path(path / "__pycache__/pytest_main.cpython-311.pyc").is_file()
 
-        # Sanity check to make sure the .pyc files are actually there
-        path = Path(__file__).parent / "modules" / "dummy_boefje_environment_with_pycache"
-        assert Path(path / "some_subdir/cache.pyc").is_file()
-        assert Path(path / "some_subdir/__init__.py").is_file()
-        assert Path(path / "__pycache__/pytest__init__.cpython-311.pyc").is_file()
-        assert Path(path / "__pycache__/pytest_main.cpython-311.pyc").is_file()
-
-        assert boefje_resource_1.runnable_hash == "4bae5e869bd17759bf750bf357fdee1eedff5768d407248b8ddcb63d0abdee19"
-        assert boefje_resource_2.runnable_hash == "e0c46fb915778b06f69cd5934b2157733cef84d67fc89c563c5bbd965ad52949"
-        assert boefje_resource_3.runnable_hash == "0185c90d3d1a4dc1490ec918374f84e8a480101f98db14d434638147dd82c626"
+    assert boefje_resource_1.runnable_hash == "7450ebc13f6856df925e90cd57f2769468a39723f18ba835749982b484564ec9"
+    assert boefje_resource_2.runnable_hash == "874e154b572a0315cfe4329bd3b756bf9cad77f6a87bb9b9b9bb6296f1d4b520"
+    assert boefje_resource_3.runnable_hash == "70c0b0ad3b2e70fd79e52dcf043096a50ed69db1359df0011499e66ab1510bbe"
diff --git a/boefjes/tests/test_testssl_sh.py b/boefjes/tests/test_testssl_sh.py
deleted file mode 100644
index 67debdb735d..00000000000
--- a/boefjes/tests/test_testssl_sh.py
+++ /dev/null
@@ -1,124 +0,0 @@
-from unittest import TestCase
-
-from boefjes.plugins.kat_testssl_sh_ciphers.normalize import run
-from tests.loading import get_dummy_data
-
-input_ooi = {
-    "object_type": "IPService",
-    "scan_profile": "scan_profile_type='declared' "
-    "reference=Reference('IPService|internet|134.209.85.72|tcp|80|http') level=<ScanLevel.L2: 2>",
-    "primary_key": "IPService|internet|134.209.85.72|tcp|80|http",
-    "ip_port": {
-        "address": {"network": {"name": "internet"}, "address": "134.209.85.72"},
-        "protocol": "tcp",
-        "port": "80",
-    },
-    "service": {"name": "http"},
-}
-
-
-class TestsslSh(TestCase):
-    maxDiff = None
-
-    def test_cipherless_service(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/testssl-sh-cipherless.json"),
-            )
-        )
-
-        # noinspection PyTypeChecker
-        expected = []
-
-        self.assertEqual(expected, oois)
-
-    def test_ciphered_service(self):
-        oois = list(
-            run(
-                input_ooi,
-                get_dummy_data("inputs/testssl-sh-ciphered.json"),
-            )
-        )
-
-        # noinspection PyTypeChecker
-        expected_suites = {
-            "TLSv1.3": [
-                {
-                    "cipher_suite_alias": "TLS_AES_256_GCM_SHA384",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "TLS_AES_256_GCM_SHA384",
-                    "key_size": 253,
-                    "bits": 256,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "x1302",
-                },
-                {
-                    "cipher_suite_alias": "TLS_CHACHA20_POLY1305_SHA256",
-                    "encryption_algorithm": "ChaCha20",
-                    "cipher_suite_name": "TLS_CHACHA20_POLY1305_SHA256",
-                    "key_size": 253,
-                    "bits": 256,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "x1303",
-                },
-                {
-                    "cipher_suite_alias": "TLS_AES_128_GCM_SHA256",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "TLS_AES_128_GCM_SHA256",
-                    "key_size": 253,
-                    "bits": 128,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "x1301",
-                },
-            ],
-            "TLSv1.2": [
-                {
-                    "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "ECDHE-RSA-AES256-GCM-SHA384",
-                    "key_size": 521,
-                    "bits": 256,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "xc030",
-                },
-                {
-                    "cipher_suite_alias": "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "DHE-RSA-AES256-GCM-SHA384",
-                    "key_size": 2048,
-                    "bits": 256,
-                    "key_exchange_algorithm": "DH",
-                    "cipher_suite_code": "x9f",
-                },
-                {
-                    "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
-                    "encryption_algorithm": "ChaCha20",
-                    "cipher_suite_name": "ECDHE-RSA-CHACHA20-POLY1305",
-                    "key_size": 521,
-                    "bits": 256,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "xcca8",
-                },
-                {
-                    "cipher_suite_alias": "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "ECDHE-RSA-AES128-GCM-SHA256",
-                    "key_size": 521,
-                    "bits": 128,
-                    "key_exchange_algorithm": "ECDH",
-                    "cipher_suite_code": "xc02f",
-                },
-                {
-                    "cipher_suite_alias": "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256",
-                    "encryption_algorithm": "AESGCM",
-                    "cipher_suite_name": "DHE-RSA-AES128-GCM-SHA256",
-                    "key_size": 2048,
-                    "bits": 128,
-                    "key_exchange_algorithm": "DH",
-                    "cipher_suite_code": "x9e",
-                },
-            ],
-        }
-        self.assertEqual(1, len(oois))
-        self.assertEqual(expected_suites, oois[0].suites)
diff --git a/boefjes/tests/test_wappalyzer_normalizer.py b/boefjes/tests/test_wappalyzer_normalizer.py
deleted file mode 100644
index cf70b60bd4d..00000000000
--- a/boefjes/tests/test_wappalyzer_normalizer.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from pathlib import Path
-from unittest import TestCase
-
-from boefjes.job_models import NormalizerMeta
-from boefjes.local import LocalNormalizerJobRunner
-from boefjes.local_repository import LocalPluginRepository
-from tests.loading import get_dummy_data
-
-
-class WappalyzerNormalizerTest(TestCase):
-    def test_page_analyzer_normalizer(self):
-        meta = NormalizerMeta.model_validate_json(get_dummy_data("body-page-analysis-normalize.json"))
-        local_repository = LocalPluginRepository(Path(__file__).parent.parent / "boefjes" / "plugins")
-
-        runner = LocalNormalizerJobRunner(local_repository)
-        output = runner.run(meta, get_dummy_data("download_page_analysis.raw"))
-
-        results = output.observations[0].results
-        self.assertEqual(6, len(results))
-        self.assertCountEqual(
-            ["Software|jQuery Migrate|1.0.0|", "Software|jQuery|3.6.0|", "Software|Bootstrap|3.3.7|"],
-            [o.primary_key for o in results if o.object_type == "Software"],
-        )
diff --git a/boefjes/tools/run_boefje.py b/boefjes/tools/run_boefje.py
index 2b578143383..73686f67437 100755
--- a/boefjes/tools/run_boefje.py
+++ b/boefjes/tools/run_boefje.py
@@ -8,6 +8,12 @@
 from pathlib import Path
 
 import click
+from sqlalchemy.orm import sessionmaker
+
+from boefjes.dependencies.plugins import PluginService
+from boefjes.sql.config_storage import create_config_storage
+from boefjes.sql.db import get_engine
+from boefjes.sql.plugin_storage import create_plugin_storage
 
 sys.path.append(str(Path(__file__).resolve().parent.parent))
 
@@ -31,7 +37,14 @@ def run_boefje(start_pdb, organization_code, boefje_id, input_ooi):
 
     local_repository = get_local_repository()
 
-    handler = BoefjeHandler(LocalBoefjeJobRunner(local_repository), local_repository, bytes_api_client)
+    session = sessionmaker(bind=get_engine())()
+    plugin_service = PluginService(
+        create_plugin_storage(session),
+        create_config_storage(session),
+        local_repository,
+    )
+
+    handler = BoefjeHandler(LocalBoefjeJobRunner(local_repository), plugin_service, bytes_api_client)
     try:
         handler.handle(meta)
     except Exception:
diff --git a/bytes/bytes/api/models.py b/bytes/bytes/api/models.py
index af77cb82fc6..8aa23017734 100644
--- a/bytes/bytes/api/models.py
+++ b/bytes/bytes/api/models.py
@@ -1,7 +1,17 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
 
 
 class RawResponse(BaseModel):
     status: str
     message: str
-    id: str | None = None
+    ids: list[str] | None = None
+
+
+class File(BaseModel):
+    name: str
+    content: str = Field(json_schema_extra={"contentEncoding": "base64"})
+    tags: list[str] = Field(default_factory=list)
+
+
+class BoefjeOutput(BaseModel):
+    files: list[File] = Field(default_factory=list)
diff --git a/bytes/bytes/api/router.py b/bytes/bytes/api/router.py
index e88efc6cc06..09f0c8e6e76 100644
--- a/bytes/bytes/api/router.py
+++ b/bytes/bytes/api/router.py
@@ -1,13 +1,14 @@
+from base64 import b64decode
 from uuid import UUID
 
 import structlog
-from asgiref.sync import async_to_sync
 from cachetools import TTLCache, cached
-from fastapi import APIRouter, Depends, HTTPException, Query, Request
+from fastapi import APIRouter, Depends, HTTPException, Query
 from fastapi.responses import Response
+from httpx import codes
 from starlette.responses import JSONResponse
 
-from bytes.api.models import RawResponse
+from bytes.api.models import BoefjeOutput
 from bytes.auth import authenticate_token
 from bytes.config import get_settings
 from bytes.database.sql_meta_repository import MetaIntegrityError, ObjectNotFoundException, create_meta_data_repository
@@ -34,10 +35,11 @@ def create_boefje_meta(
             meta_repository.save_boefje_meta(boefje_meta)
     except MetaIntegrityError:
         return JSONResponse(
-            {"status": "failed", "message": "Integrity error: object might already exist"}, status_code=400
+            {"status": "failed", "message": "Integrity error: object might already exist"},
+            status_code=codes.BAD_REQUEST,
         )
 
-    return JSONResponse({"status": "success"}, status_code=201)
+    return JSONResponse({"status": "success"}, status_code=codes.CREATED)
 
 
 @router.get("/boefje_meta/{boefje_meta_id}", response_model=BoefjeMeta, tags=[BOEFJE_META_TAG])
@@ -95,10 +97,11 @@ def create_normalizer_meta(
             meta_repository.save_normalizer_meta(normalizer_meta)
     except MetaIntegrityError:
         return JSONResponse(
-            {"status": "failed", "message": "Integrity error: object might already exist"}, status_code=400
+            {"status": "failed", "message": "Integrity error: object might already exist"},
+            status_code=codes.BAD_REQUEST,
         )
 
-    return JSONResponse({"status": "success"}, status_code=201)
+    return JSONResponse({"status": "success"}, status_code=codes.CREATED)
 
 
 @router.get("/normalizer_meta/{normalizer_meta_id}", response_model=NormalizerMeta, tags=[NORMALIZER_META_TAG])
@@ -109,7 +112,7 @@ def get_normalizer_meta_by_id(
     try:
         return meta_repository.get_normalizer_meta_by_id(normalizer_meta_id)
     except ObjectNotFoundException as error:
-        raise HTTPException(status_code=404, detail="Normalizer meta not found") from error
+        raise HTTPException(status_code=codes.NOT_FOUND, detail="Normalizer meta not found") from error
 
 
 @router.get("/normalizer_meta", response_model=list[NormalizerMeta], tags=[NORMALIZER_META_TAG])
@@ -148,42 +151,60 @@ def get_normalizer_meta(
 
 @router.post("/raw", tags=[RAW_TAG])
 def create_raw(
-    request: Request,
     boefje_meta_id: UUID,
-    mime_types: list[str] | None = Query(None),
+    boefje_output: BoefjeOutput,
     meta_repository: MetaDataRepository = Depends(create_meta_data_repository),
     event_manager: EventManager = Depends(create_event_manager),
-) -> RawResponse:
-    parsed_mime_types = [] if mime_types is None else [MimeType(value=mime_type) for mime_type in mime_types]
+) -> dict[str, UUID]:
+    """Parse all the raw files from the request and return the ids. The ids are ordered according to the order from the
+    request data, but we assume the `name` field is unique, and hence return a mapping of the file name to the id."""
 
-    try:
-        meta = meta_repository.get_boefje_meta_by_id(boefje_meta_id)
+    raw_ids = {}
+    mime_types_by_id = {
+        raw.id: set(raw.mime_types) for raw in meta_repository.get_raw(RawDataFilter(boefje_meta_id=boefje_meta_id))
+    }
+    all_parsed_mime_types = list(mime_types_by_id.values())
 
-        if meta_repository.has_raw(meta, parsed_mime_types):
-            return RawResponse(status="success", message="Raw data already present")
+    for raw in boefje_output.files:
+        parsed_mime_types = {MimeType(value=x) for x in raw.tags}
 
-        # FastAPI/starlette only has async versions of the Request methods, but
-        # all our code is sync, so we wrap it in async_to_sync.
-        data = async_to_sync(request.body)()
+        if parsed_mime_types in mime_types_by_id.values():
+            # Set the id for this file using the precomputed dict that maps existing primary keys to the mime-type set.
+            raw_ids[raw.name] = list(mime_types_by_id.keys())[list(mime_types_by_id.values()).index(parsed_mime_types)]
 
-        raw_data = RawData(value=data, boefje_meta=meta, mime_types=parsed_mime_types)
-        with meta_repository:
-            raw_id = meta_repository.save_raw(raw_data)
-
-        event = RawFileReceived(
-            organization=meta.organization,
-            raw_data=RawDataMeta(
-                id=raw_id,
-                boefje_meta=raw_data.boefje_meta,
-                mime_types=raw_data.mime_types,
-            ),
-        )
-        event_manager.publish(event)
-    except Exception as error:
-        logger.exception("Error saving raw data")
-        raise HTTPException(status_code=500, detail="Could not save raw data") from error
+            continue
+
+        if parsed_mime_types in all_parsed_mime_types:
+            raise HTTPException(
+                status_code=codes.BAD_REQUEST, detail="Content types do not define unique sets of mime types."
+            )
+
+        try:
+            meta = meta_repository.get_boefje_meta_by_id(boefje_meta_id)
+            raw_data = RawData(value=b64decode(raw.content.encode()), boefje_meta=meta, mime_types=parsed_mime_types)
+
+            with meta_repository:
+                raw_id = meta_repository.save_raw(raw_data)
+                raw_ids[raw.name] = raw_id
+
+            all_parsed_mime_types.append(parsed_mime_types)
+
+            event = RawFileReceived(
+                organization=meta.organization,
+                raw_data=RawDataMeta(
+                    id=raw_id,
+                    boefje_meta=raw_data.boefje_meta,
+                    mime_types=raw_data.mime_types,
+                ),
+            )
+            event_manager.publish(event)
+        except Exception as error:
+            logger.exception("Error saving raw data")
+            raise HTTPException(status_code=codes.INTERNAL_SERVER_ERROR, detail="Could not save raw data") from error
+
+        all_parsed_mime_types.append(parsed_mime_types)
 
-    return RawResponse(status="success", message="Raw data saved", id=raw_id)
+    return raw_ids
 
 
 @router.get("/raw/{raw_id}", tags=[RAW_TAG])
@@ -194,7 +215,7 @@ def get_raw_by_id(
     try:
         raw_data = meta_repository.get_raw_by_id(raw_id)
     except ObjectNotFoundException as error:
-        raise HTTPException(status_code=404, detail="No raw data found") from error
+        raise HTTPException(status_code=codes.NOT_FOUND, detail="No raw data found") from error
 
     return Response(raw_data.value, media_type="application/octet-stream")
 
@@ -207,7 +228,7 @@ def get_raw_meta_by_id(
     try:
         raw_meta = meta_repository.get_raw_meta_by_id(raw_id)
     except ObjectNotFoundException as error:
-        raise HTTPException(status_code=404, detail="No raw data found") from error
+        raise HTTPException(status_code=codes.NOT_FOUND, detail="No raw data found") from error
 
     return raw_meta
 
@@ -264,7 +285,7 @@ def get_raw_count_per_mime_type(
 
 def ignore_arguments_key(meta_repository: MetaDataRepository, query_filter: RawDataFilter):
     """Helper to not cache based on the stateful meta_repository, but only use the query parameters as a key."""
-    return query_filter.json()
+    return query_filter.model_dump_json()
 
 
 @cached(
diff --git a/bytes/bytes/config.py b/bytes/bytes/config.py
index 4f9b61f1c97..8a550663ffa 100644
--- a/bytes/bytes/config.py
+++ b/bytes/bytes/config.py
@@ -140,6 +140,10 @@ class Settings(BaseSettings):
 
     logging_format: Literal["text", "json"] = Field("text", description="Logging format")
 
+    s3_bucket_prefix: str | None = Field(None, validation_alias="S3_BUCKET_PREFIX")
+    s3_bucket_name: str | None = Field(None, validation_alias="S3_BUCKET")
+    bucket_per_org: bool = Field(True, validation_alias="BUCKET_PER_ORG")
+
     model_config = SettingsConfigDict(env_prefix="BYTES_")
 
     @classmethod
diff --git a/bytes/bytes/database/sql_meta_repository.py b/bytes/bytes/database/sql_meta_repository.py
index 2bdbacf2c37..fa124898eed 100644
--- a/bytes/bytes/database/sql_meta_repository.py
+++ b/bytes/bytes/database/sql_meta_repository.py
@@ -56,7 +56,7 @@ def get_boefje_meta_by_id(self, boefje_meta_id: uuid.UUID) -> BoefjeMeta:
         return to_boefje_meta(boefje_meta_in_db)
 
     def get_boefje_meta(self, query_filter: BoefjeMetaFilter) -> list[BoefjeMeta]:
-        logger.debug("Querying boefje meta: %s", query_filter.json())
+        logger.debug("Querying boefje meta: %s", query_filter.model_dump_json())
 
         query = self.session.query(BoefjeMetaInDB).filter(BoefjeMetaInDB.organization == query_filter.organization)
 
@@ -86,7 +86,7 @@ def get_normalizer_meta_by_id(self, normalizer_meta_id: uuid.UUID) -> Normalizer
         return to_normalizer_meta(normalizer_meta_in_db)
 
     def get_normalizer_meta(self, query_filter: NormalizerMetaFilter) -> list[NormalizerMeta]:
-        logger.debug("Querying normalizer meta: %s", query_filter.json())
+        logger.debug("Querying normalizer meta: %s", query_filter.model_dump_json())
 
         query = self.session.query(NormalizerMetaInDB)
 
@@ -134,7 +134,7 @@ def save_raw(self, raw: RawData) -> uuid.UUID:
         return raw_file_in_db.id
 
     def get_raw(self, query_filter: RawDataFilter) -> list[RawDataMeta]:
-        logger.debug("Querying raw data: %s", query_filter.json())
+        logger.debug("Querying raw data: %s", query_filter.model_dump_json())
         query = self.session.query(RawFileInDB)
         query = query_filter.apply(query)
 
@@ -177,7 +177,7 @@ def get_raw_file_count_per_organization(self) -> dict[str, int]:
         return {organization_id: count for organization_id, count in query}
 
     def get_raw_file_count_per_mime_type(self, query_filter: RawDataFilter) -> dict[str, int]:
-        logger.debug("Querying count raw data per mime type: %s", query_filter.json())
+        logger.debug("Querying count raw data per mime type: %s", query_filter.model_dump_json())
         query = self.session.query(func.unnest(RawFileInDB.mime_types), func.count()).group_by(
             func.unnest(RawFileInDB.mime_types)
         )
diff --git a/bytes/bytes/models.py b/bytes/bytes/models.py
index ce8cfcd08be..03ae39506aa 100644
--- a/bytes/bytes/models.py
+++ b/bytes/bytes/models.py
@@ -38,6 +38,12 @@ def _validate_timezone_aware_datetime(value: datetime) -> datetime:
 class MimeType(BaseModel):
     value: str
 
+    def __hash__(self):
+        return hash(self.value)
+
+    def __lt__(self, other: MimeType):
+        return self.value < other.value
+
 
 class Job(BaseModel):
     id: UUID
@@ -69,7 +75,7 @@ class RawDataMeta(BaseModel):
 
     id: UUID
     boefje_meta: BoefjeMeta
-    mime_types: list[MimeType] = Field(default_factory=list)
+    mime_types: set[MimeType] = Field(default_factory=set)
 
     # These are set once the raw is saved
     secure_hash: SecureHash | None = None
@@ -80,7 +86,7 @@ class RawDataMeta(BaseModel):
 class RawData(BaseModel):
     value: bytes
     boefje_meta: BoefjeMeta
-    mime_types: list[MimeType] = Field(default_factory=list)
+    mime_types: set[MimeType] = Field(default_factory=set)
 
     # These are set once the raw is saved
     secure_hash: SecureHash | None = None
diff --git a/bytes/bytes/raw/file_raw_repository.py b/bytes/bytes/raw/file_raw_repository.py
index b8192d02988..26fd997eeaa 100644
--- a/bytes/bytes/raw/file_raw_repository.py
+++ b/bytes/bytes/raw/file_raw_repository.py
@@ -1,7 +1,10 @@
+import logging
 from pathlib import Path
 from uuid import UUID
 
 import structlog
+from boto3 import set_stream_logger as set_boto3_stream_logger
+from boto3.session import Session as BotoSession
 
 from bytes.config import Settings
 from bytes.models import BoefjeMeta, RawData
@@ -12,12 +15,20 @@
 
 
 def create_raw_repository(settings: Settings) -> RawRepository:
-    return FileRawRepository(
-        settings.data_dir,
-        make_middleware(),
-        folder_permissions=int(settings.folder_permission, 8),
-        file_permissions=int(settings.file_permission, 8),
-    )
+    if settings.s3_bucket_name or settings.s3_bucket_prefix:
+        return S3RawRepository(
+            make_middleware(),
+            settings.bucket_per_org,
+            settings.s3_bucket_prefix or "OpenKAT-",
+            settings.s3_bucket_name or "OpenKAT",
+        )
+    else:
+        return FileRawRepository(
+            settings.data_dir,
+            make_middleware(),
+            folder_permissions=int(settings.folder_permission, 8),
+            file_permissions=int(settings.file_permission, 8),
+        )
 
 
 class FileRawRepository(RawRepository):
@@ -62,3 +73,59 @@ def _raw_file_path(self, raw_id: UUID, boefje_meta: BoefjeMeta) -> Path:
 
     def _index(self, raw_id: UUID) -> str:
         return str(raw_id)[: self.UUID_INDEX]
+
+
+class S3RawRepository(RawRepository):
+    def __init__(
+        self,
+        file_middleware: FileMiddleware,
+        bucket_per_org: bool,
+        s3_bucket_prefix: str,
+        s3_bucket_name: str,
+    ) -> None:
+        self._file_middleware = file_middleware
+        self.bucket_per_org = bucket_per_org
+        self.s3_bucket_prefix = s3_bucket_prefix
+        self.s3_bucket_name = s3_bucket_name
+
+        set_boto3_stream_logger("", logging.WARNING)
+        self._s3resource = BotoSession().resource("s3")
+
+    def get_or_create_bucket(self, organization: str):
+        # Create a bucket, and if it exists already return that instead
+        bucket_name = f"{self.s3_bucket_prefix}{organization}" if self.bucket_per_org else self.s3_bucket_name
+
+        try:
+            bucket = self._s3resource.create_bucket(Bucket=bucket_name)
+            bucket.wait_until_exists()
+            return bucket
+        except bucket.meta.client.exceptions.ClientError as error:
+            logger.error("Something went wrong with creating/getting bucket %s: %s", bucket_name, error)
+            raise error
+
+    def save_raw(self, raw_id: UUID, raw: RawData) -> None:
+        object_name = self._raw_file_name(raw_id, raw.boefje_meta)
+        contents = self._file_middleware.encode(raw.value)
+
+        logger.info("Writing raw data with id %s to s3", raw_id)
+        bucket = self.get_or_create_bucket(raw.boefje_meta.organization)
+        bucket.Object(object_name).put(Body=contents)
+
+    def get_raw(self, raw_id: UUID, boefje_meta: BoefjeMeta) -> RawData:
+        object_name = self._raw_file_name(raw_id, boefje_meta)
+        bucket = self.get_or_create_bucket(boefje_meta.organization)
+
+        try:
+            contents = bucket.Object(object_name).get()["Body"].read()
+        except self._s3resource.meta.client.exceptions.ClientError as error:
+            if error.response["Error"]["Code"] == "404":
+                raise BytesFileNotFoundException(error)
+            logger.error("Could not get file from s3: %s/%s due to %s", bucket.name, object_name, error)
+            raise error
+
+        return RawData(value=self._file_middleware.decode(contents), boefje_meta=boefje_meta)
+
+    def _raw_file_name(self, raw_id: UUID, boefje_meta: BoefjeMeta) -> str:
+        if self.bucket_per_org:
+            return str(raw_id)
+        return f"{boefje_meta.organization}/{raw_id}"
diff --git a/bytes/dev.logging.conf b/bytes/dev.logging.conf
index 017ab3dada0..e12f194f92a 100644
--- a/bytes/dev.logging.conf
+++ b/bytes/dev.logging.conf
@@ -24,5 +24,4 @@ formatter=genericFormatter
 kwargs={"stream": sys.stdout}
 
 [formatter_genericFormatter]
-format=%(asctime)s [%(process)d] [%(levelname)s] [%(module)s] %(message)s
-datefmt=[%Y-%m-%d %H:%M:%S %z]
+format=%(message)s
diff --git a/bytes/logging.conf b/bytes/logging.conf
index 7235f0b5a5f..8713346d5df 100644
--- a/bytes/logging.conf
+++ b/bytes/logging.conf
@@ -31,5 +31,4 @@ formatter=genericFormatter
 kwargs={"stream": sys.stdout}
 
 [formatter_genericFormatter]
-format=%(asctime)s [%(process)d] [%(levelname)s] [%(module)s] %(message)s
-datefmt=[%Y-%m-%d %H:%M:%S %z]
+format=%(message)s
diff --git a/bytes/poetry.lock b/bytes/poetry.lock
index 6d8ae4f7714..5e59cc14086 100644
--- a/bytes/poetry.lock
+++ b/bytes/poetry.lock
@@ -2,13 +2,13 @@
 
 [[package]]
 name = "alembic"
-version = "1.13.1"
+version = "1.13.3"
 description = "A database migration tool for SQLAlchemy."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "alembic-1.13.1-py3-none-any.whl", hash = "sha256:2edcc97bed0bd3272611ce3a98d98279e9c209e7186e43e75bbb1b2bdfdbcc43"},
-    {file = "alembic-1.13.1.tar.gz", hash = "sha256:4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595"},
+    {file = "alembic-1.13.3-py3-none-any.whl", hash = "sha256:908e905976d15235fae59c9ac42c4c5b75cfcefe3d27c0fbf7ae15a37715d80e"},
+    {file = "alembic-1.13.3.tar.gz", hash = "sha256:203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2"},
 ]
 
 [package.dependencies]
@@ -32,13 +32,13 @@ files = [
 
 [[package]]
 name = "anyio"
-version = "4.3.0"
+version = "4.6.0"
 description = "High level compatibility layer for multiple asynchronous event loop implementations"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 files = [
-    {file = "anyio-4.3.0-py3-none-any.whl", hash = "sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8"},
-    {file = "anyio-4.3.0.tar.gz", hash = "sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6"},
+    {file = "anyio-4.6.0-py3-none-any.whl", hash = "sha256:c7d2e9d63e31599eeb636c8c5c03a7e108d73b345f064f1c19fdc87b79036a9a"},
+    {file = "anyio-4.6.0.tar.gz", hash = "sha256:137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb"},
 ]
 
 [package.dependencies]
@@ -48,9 +48,9 @@ sniffio = ">=1.1"
 typing-extensions = {version = ">=4.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
-test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"]
-trio = ["trio (>=0.23)"]
+doc = ["Sphinx (>=7.4,<8.0)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme"]
+test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.21.0b1)"]
+trio = ["trio (>=0.26.1)"]
 
 [[package]]
 name = "asgiref"
@@ -71,125 +71,178 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 
 [[package]]
 name = "bcrypt"
-version = "4.1.2"
+version = "4.2.0"
 description = "Modern password hashing for your software and your servers"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "bcrypt-4.1.2-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e"},
-    {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1"},
-    {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57fa9442758da926ed33a91644649d3e340a71e2d0a5a8de064fb621fd5a3326"},
-    {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:eb3bd3321517916696233b5e0c67fd7d6281f0ef48e66812db35fc963a422a1c"},
-    {file = "bcrypt-4.1.2-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6cad43d8c63f34b26aef462b6f5e44fdcf9860b723d2453b5d391258c4c8e966"},
-    {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:44290ccc827d3a24604f2c8bcd00d0da349e336e6503656cb8192133e27335e2"},
-    {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:732b3920a08eacf12f93e6b04ea276c489f1c8fb49344f564cca2adb663b3e4c"},
-    {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:1c28973decf4e0e69cee78c68e30a523be441972c826703bb93099868a8ff5b5"},
-    {file = "bcrypt-4.1.2-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b8df79979c5bae07f1db22dcc49cc5bccf08a0380ca5c6f391cbb5790355c0b0"},
-    {file = "bcrypt-4.1.2-cp37-abi3-win32.whl", hash = "sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369"},
-    {file = "bcrypt-4.1.2-cp37-abi3-win_amd64.whl", hash = "sha256:9800ae5bd5077b13725e2e3934aa3c9c37e49d3ea3d06318010aa40f54c63551"},
-    {file = "bcrypt-4.1.2-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:71b8be82bc46cedd61a9f4ccb6c1a493211d031415a34adde3669ee1b0afbb63"},
-    {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e3c6642077b0c8092580c819c1684161262b2e30c4f45deb000c38947bf483"},
-    {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:387e7e1af9a4dd636b9505a465032f2f5cb8e61ba1120e79a0e1cd0b512f3dfc"},
-    {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7"},
-    {file = "bcrypt-4.1.2-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:2a298db2a8ab20056120b45e86c00a0a5eb50ec4075b6142db35f593b97cb3fb"},
-    {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:ba55e40de38a24e2d78d34c2d36d6e864f93e0d79d0b6ce915e4335aa81d01b1"},
-    {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:3566a88234e8de2ccae31968127b0ecccbb4cddb629da744165db72b58d88ca4"},
-    {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:b90e216dc36864ae7132cb151ffe95155a37a14e0de3a8f64b49655dd959ff9c"},
-    {file = "bcrypt-4.1.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:69057b9fc5093ea1ab00dd24ede891f3e5e65bee040395fb1e66ee196f9c9b4a"},
-    {file = "bcrypt-4.1.2-cp39-abi3-win32.whl", hash = "sha256:02d9ef8915f72dd6daaef40e0baeef8a017ce624369f09754baf32bb32dba25f"},
-    {file = "bcrypt-4.1.2-cp39-abi3-win_amd64.whl", hash = "sha256:be3ab1071662f6065899fe08428e45c16aa36e28bc42921c4901a191fda6ee42"},
-    {file = "bcrypt-4.1.2-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:d75fc8cd0ba23f97bae88a6ec04e9e5351ff3c6ad06f38fe32ba50cbd0d11946"},
-    {file = "bcrypt-4.1.2-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:a97e07e83e3262599434816f631cc4c7ca2aa8e9c072c1b1a7fec2ae809a1d2d"},
-    {file = "bcrypt-4.1.2-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:e51c42750b7585cee7892c2614be0d14107fad9581d1738d954a262556dd1aab"},
-    {file = "bcrypt-4.1.2-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:ba4e4cc26610581a6329b3937e02d319f5ad4b85b074846bf4fef8a8cf51e7bb"},
-    {file = "bcrypt-4.1.2.tar.gz", hash = "sha256:33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258"},
+    {file = "bcrypt-4.2.0-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:096a15d26ed6ce37a14c1ac1e48119660f21b24cba457f160a4b830f3fe6b5cb"},
+    {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c02d944ca89d9b1922ceb8a46460dd17df1ba37ab66feac4870f6862a1533c00"},
+    {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1d84cf6d877918620b687b8fd1bf7781d11e8a0998f576c7aa939776b512b98d"},
+    {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:1bb429fedbe0249465cdd85a58e8376f31bb315e484f16e68ca4c786dcc04291"},
+    {file = "bcrypt-4.2.0-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:655ea221910bcac76ea08aaa76df427ef8625f92e55a8ee44fbf7753dbabb328"},
+    {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:1ee38e858bf5d0287c39b7a1fc59eec64bbf880c7d504d3a06a96c16e14058e7"},
+    {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:0da52759f7f30e83f1e30a888d9163a81353ef224d82dc58eb5bb52efcabc399"},
+    {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:3698393a1b1f1fd5714524193849d0c6d524d33523acca37cd28f02899285060"},
+    {file = "bcrypt-4.2.0-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:762a2c5fb35f89606a9fde5e51392dad0cd1ab7ae64149a8b935fe8d79dd5ed7"},
+    {file = "bcrypt-4.2.0-cp37-abi3-win32.whl", hash = "sha256:5a1e8aa9b28ae28020a3ac4b053117fb51c57a010b9f969603ed885f23841458"},
+    {file = "bcrypt-4.2.0-cp37-abi3-win_amd64.whl", hash = "sha256:8f6ede91359e5df88d1f5c1ef47428a4420136f3ce97763e31b86dd8280fbdf5"},
+    {file = "bcrypt-4.2.0-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:c52aac18ea1f4a4f65963ea4f9530c306b56ccd0c6f8c8da0c06976e34a6e841"},
+    {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3bbbfb2734f0e4f37c5136130405332640a1e46e6b23e000eeff2ba8d005da68"},
+    {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3413bd60460f76097ee2e0a493ccebe4a7601918219c02f503984f0a7ee0aebe"},
+    {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:8d7bb9c42801035e61c109c345a28ed7e84426ae4865511eb82e913df18f58c2"},
+    {file = "bcrypt-4.2.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:3d3a6d28cb2305b43feac298774b997e372e56c7c7afd90a12b3dc49b189151c"},
+    {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:9c1c4ad86351339c5f320ca372dfba6cb6beb25e8efc659bedd918d921956bae"},
+    {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:27fe0f57bb5573104b5a6de5e4153c60814c711b29364c10a75a54bb6d7ff48d"},
+    {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:8ac68872c82f1add6a20bd489870c71b00ebacd2e9134a8aa3f98a0052ab4b0e"},
+    {file = "bcrypt-4.2.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:cb2a8ec2bc07d3553ccebf0746bbf3d19426d1c6d1adbd4fa48925f66af7b9e8"},
+    {file = "bcrypt-4.2.0-cp39-abi3-win32.whl", hash = "sha256:77800b7147c9dc905db1cba26abe31e504d8247ac73580b4aa179f98e6608f34"},
+    {file = "bcrypt-4.2.0-cp39-abi3-win_amd64.whl", hash = "sha256:61ed14326ee023917ecd093ee6ef422a72f3aec6f07e21ea5f10622b735538a9"},
+    {file = "bcrypt-4.2.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:39e1d30c7233cfc54f5c3f2c825156fe044efdd3e0b9d309512cc514a263ec2a"},
+    {file = "bcrypt-4.2.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f4f4acf526fcd1c34e7ce851147deedd4e26e6402369304220250598b26448db"},
+    {file = "bcrypt-4.2.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:1ff39b78a52cf03fdf902635e4c81e544714861ba3f0efc56558979dd4f09170"},
+    {file = "bcrypt-4.2.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:373db9abe198e8e2c70d12b479464e0d5092cc122b20ec504097b5f2297ed184"},
+    {file = "bcrypt-4.2.0.tar.gz", hash = "sha256:cf69eaf5185fd58f268f805b505ce31f9b9fc2d64b376642164e9244540c1221"},
 ]
 
 [package.extras]
 tests = ["pytest (>=3.2.1,!=3.3.0)"]
 typecheck = ["mypy"]
 
+[[package]]
+name = "boto3"
+version = "1.35.31"
+description = "The AWS SDK for Python"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "boto3-1.35.31-py3-none-any.whl", hash = "sha256:2e9af74d10d8af7610a8d8468d2914961f116912a024fce17351825260385a52"},
+    {file = "boto3-1.35.31.tar.gz", hash = "sha256:8c593af260c4ea3eb6f079c09908f94494ca2222aa4e40a7ff490fab1cee8b39"},
+]
+
+[package.dependencies]
+botocore = ">=1.35.31,<1.36.0"
+jmespath = ">=0.7.1,<2.0.0"
+s3transfer = ">=0.10.0,<0.11.0"
+
+[package.extras]
+crt = ["botocore[crt] (>=1.21.0,<2.0a0)"]
+
+[[package]]
+name = "botocore"
+version = "1.35.31"
+description = "Low-level, data-driven core of boto 3."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "botocore-1.35.31-py3-none-any.whl", hash = "sha256:4cee814875bc78656aef4011d3d6b2231e96f53ea3661ee428201afb579d5c31"},
+    {file = "botocore-1.35.31.tar.gz", hash = "sha256:f7bfa910cf2cbcc8c2307c1cf7b93495d614c2d699883417893e0a337fe4eb63"},
+]
+
+[package.dependencies]
+jmespath = ">=0.7.1,<2.0.0"
+python-dateutil = ">=2.1,<3.0.0"
+urllib3 = {version = ">=1.25.4,<2.2.0 || >2.2.0,<3", markers = "python_version >= \"3.10\""}
+
+[package.extras]
+crt = ["awscrt (==0.21.5)"]
+
 [[package]]
 name = "cachetools"
-version = "5.3.3"
+version = "5.5.0"
 description = "Extensible memoizing collections and decorators"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cachetools-5.3.3-py3-none-any.whl", hash = "sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945"},
-    {file = "cachetools-5.3.3.tar.gz", hash = "sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105"},
+    {file = "cachetools-5.5.0-py3-none-any.whl", hash = "sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292"},
+    {file = "cachetools-5.5.0.tar.gz", hash = "sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a"},
 ]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
 name = "cffi"
-version = "1.16.0"
+version = "1.17.1"
 description = "Foreign Function Interface for Python calling C code."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "cffi-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088"},
-    {file = "cffi-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9"},
-    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673"},
-    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896"},
-    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684"},
-    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7"},
-    {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614"},
-    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743"},
-    {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d"},
-    {file = "cffi-1.16.0-cp310-cp310-win32.whl", hash = "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a"},
-    {file = "cffi-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1"},
-    {file = "cffi-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404"},
-    {file = "cffi-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417"},
-    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627"},
-    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936"},
-    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d"},
-    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56"},
-    {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e"},
-    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc"},
-    {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"},
-    {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"},
-    {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"},
-    {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"},
-    {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"},
-    {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"},
-    {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"},
-    {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"},
-    {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"},
-    {file = "cffi-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc"},
-    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0"},
-    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b"},
-    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c"},
-    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b"},
-    {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324"},
-    {file = "cffi-1.16.0-cp38-cp38-win32.whl", hash = "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a"},
-    {file = "cffi-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36"},
-    {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"},
-    {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"},
-    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"},
-    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8"},
-    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f"},
-    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4"},
-    {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098"},
-    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000"},
-    {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe"},
-    {file = "cffi-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4"},
-    {file = "cffi-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8"},
-    {file = "cffi-1.16.0.tar.gz", hash = "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"},
+    {file = "cffi-1.17.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14"},
+    {file = "cffi-1.17.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6"},
+    {file = "cffi-1.17.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e"},
+    {file = "cffi-1.17.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be"},
+    {file = "cffi-1.17.1-cp310-cp310-win32.whl", hash = "sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c"},
+    {file = "cffi-1.17.1-cp310-cp310-win_amd64.whl", hash = "sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15"},
+    {file = "cffi-1.17.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401"},
+    {file = "cffi-1.17.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6"},
+    {file = "cffi-1.17.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f"},
+    {file = "cffi-1.17.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"},
+    {file = "cffi-1.17.1-cp311-cp311-win32.whl", hash = "sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655"},
+    {file = "cffi-1.17.1-cp311-cp311-win_amd64.whl", hash = "sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0"},
+    {file = "cffi-1.17.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4"},
+    {file = "cffi-1.17.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99"},
+    {file = "cffi-1.17.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93"},
+    {file = "cffi-1.17.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3"},
+    {file = "cffi-1.17.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8"},
+    {file = "cffi-1.17.1-cp312-cp312-win32.whl", hash = "sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65"},
+    {file = "cffi-1.17.1-cp312-cp312-win_amd64.whl", hash = "sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903"},
+    {file = "cffi-1.17.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e"},
+    {file = "cffi-1.17.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4"},
+    {file = "cffi-1.17.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd"},
+    {file = "cffi-1.17.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed"},
+    {file = "cffi-1.17.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9"},
+    {file = "cffi-1.17.1-cp313-cp313-win32.whl", hash = "sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d"},
+    {file = "cffi-1.17.1-cp313-cp313-win_amd64.whl", hash = "sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a"},
+    {file = "cffi-1.17.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c"},
+    {file = "cffi-1.17.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1"},
+    {file = "cffi-1.17.1-cp38-cp38-win32.whl", hash = "sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8"},
+    {file = "cffi-1.17.1-cp38-cp38-win_amd64.whl", hash = "sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1"},
+    {file = "cffi-1.17.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16"},
+    {file = "cffi-1.17.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0"},
+    {file = "cffi-1.17.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a"},
+    {file = "cffi-1.17.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e"},
+    {file = "cffi-1.17.1-cp39-cp39-win32.whl", hash = "sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7"},
+    {file = "cffi-1.17.1-cp39-cp39-win_amd64.whl", hash = "sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662"},
+    {file = "cffi-1.17.1.tar.gz", hash = "sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824"},
 ]
 
 [package.dependencies]
@@ -319,132 +372,40 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
-[[package]]
-name = "coverage"
-version = "7.6.1"
-description = "Code coverage measurement for Python"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "coverage-7.6.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16"},
-    {file = "coverage-7.6.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36"},
-    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02"},
-    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc"},
-    {file = "coverage-7.6.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23"},
-    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34"},
-    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c"},
-    {file = "coverage-7.6.1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959"},
-    {file = "coverage-7.6.1-cp310-cp310-win32.whl", hash = "sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232"},
-    {file = "coverage-7.6.1-cp310-cp310-win_amd64.whl", hash = "sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0"},
-    {file = "coverage-7.6.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93"},
-    {file = "coverage-7.6.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3"},
-    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff"},
-    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d"},
-    {file = "coverage-7.6.1-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6"},
-    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56"},
-    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234"},
-    {file = "coverage-7.6.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133"},
-    {file = "coverage-7.6.1-cp311-cp311-win32.whl", hash = "sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c"},
-    {file = "coverage-7.6.1-cp311-cp311-win_amd64.whl", hash = "sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6"},
-    {file = "coverage-7.6.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778"},
-    {file = "coverage-7.6.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391"},
-    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8"},
-    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d"},
-    {file = "coverage-7.6.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca"},
-    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163"},
-    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a"},
-    {file = "coverage-7.6.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d"},
-    {file = "coverage-7.6.1-cp312-cp312-win32.whl", hash = "sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5"},
-    {file = "coverage-7.6.1-cp312-cp312-win_amd64.whl", hash = "sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb"},
-    {file = "coverage-7.6.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106"},
-    {file = "coverage-7.6.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9"},
-    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c"},
-    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a"},
-    {file = "coverage-7.6.1-cp313-cp313-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060"},
-    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862"},
-    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388"},
-    {file = "coverage-7.6.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155"},
-    {file = "coverage-7.6.1-cp313-cp313-win32.whl", hash = "sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a"},
-    {file = "coverage-7.6.1-cp313-cp313-win_amd64.whl", hash = "sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129"},
-    {file = "coverage-7.6.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e"},
-    {file = "coverage-7.6.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962"},
-    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb"},
-    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704"},
-    {file = "coverage-7.6.1-cp313-cp313t-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b"},
-    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f"},
-    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223"},
-    {file = "coverage-7.6.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3"},
-    {file = "coverage-7.6.1-cp313-cp313t-win32.whl", hash = "sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f"},
-    {file = "coverage-7.6.1-cp313-cp313t-win_amd64.whl", hash = "sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657"},
-    {file = "coverage-7.6.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0"},
-    {file = "coverage-7.6.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a"},
-    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b"},
-    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3"},
-    {file = "coverage-7.6.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de"},
-    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6"},
-    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569"},
-    {file = "coverage-7.6.1-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989"},
-    {file = "coverage-7.6.1-cp38-cp38-win32.whl", hash = "sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7"},
-    {file = "coverage-7.6.1-cp38-cp38-win_amd64.whl", hash = "sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8"},
-    {file = "coverage-7.6.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255"},
-    {file = "coverage-7.6.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8"},
-    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2"},
-    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a"},
-    {file = "coverage-7.6.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc"},
-    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004"},
-    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb"},
-    {file = "coverage-7.6.1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36"},
-    {file = "coverage-7.6.1-cp39-cp39-win32.whl", hash = "sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c"},
-    {file = "coverage-7.6.1-cp39-cp39-win_amd64.whl", hash = "sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca"},
-    {file = "coverage-7.6.1-pp38.pp39.pp310-none-any.whl", hash = "sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df"},
-    {file = "coverage-7.6.1.tar.gz", hash = "sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d"},
-]
-
-[package.dependencies]
-tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
-
-[package.extras]
-toml = ["tomli"]
-
 [[package]]
 name = "cryptography"
-version = "42.0.8"
+version = "43.0.1"
 description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_universal2.whl", hash = "sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e"},
-    {file = "cryptography-42.0.8-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949"},
-    {file = "cryptography-42.0.8-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b"},
-    {file = "cryptography-42.0.8-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7"},
-    {file = "cryptography-42.0.8-cp37-abi3-win32.whl", hash = "sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2"},
-    {file = "cryptography-42.0.8-cp37-abi3-win_amd64.whl", hash = "sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba"},
-    {file = "cryptography-42.0.8-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c"},
-    {file = "cryptography-42.0.8-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1"},
-    {file = "cryptography-42.0.8-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14"},
-    {file = "cryptography-42.0.8-cp39-abi3-win32.whl", hash = "sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c"},
-    {file = "cryptography-42.0.8-cp39-abi3-win_amd64.whl", hash = "sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71"},
-    {file = "cryptography-42.0.8-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648"},
-    {file = "cryptography-42.0.8-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad"},
-    {file = "cryptography-42.0.8.tar.gz", hash = "sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2"},
+    {file = "cryptography-43.0.1-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277"},
+    {file = "cryptography-43.0.1-cp37-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a"},
+    {file = "cryptography-43.0.1-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042"},
+    {file = "cryptography-43.0.1-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494"},
+    {file = "cryptography-43.0.1-cp37-abi3-win32.whl", hash = "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2"},
+    {file = "cryptography-43.0.1-cp37-abi3-win_amd64.whl", hash = "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d"},
+    {file = "cryptography-43.0.1-cp39-abi3-macosx_10_9_universal2.whl", hash = "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c"},
+    {file = "cryptography-43.0.1-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1"},
+    {file = "cryptography-43.0.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa"},
+    {file = "cryptography-43.0.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4"},
+    {file = "cryptography-43.0.1-cp39-abi3-win32.whl", hash = "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47"},
+    {file = "cryptography-43.0.1-cp39-abi3-win_amd64.whl", hash = "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289"},
+    {file = "cryptography-43.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172"},
+    {file = "cryptography-43.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2"},
+    {file = "cryptography-43.0.1.tar.gz", hash = "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d"},
 ]
 
 [package.dependencies]
@@ -457,7 +418,7 @@ nox = ["nox"]
 pep8test = ["check-sdist", "click", "mypy", "ruff"]
 sdist = ["build"]
 ssh = ["bcrypt (>=3.1.5)"]
-test = ["certifi", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
+test = ["certifi", "cryptography-vectors (==43.0.1)", "pretend", "pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-xdist"]
 test-randomorder = ["pytest-randomly"]
 
 [[package]]
@@ -479,13 +440,13 @@ dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"]
 
 [[package]]
 name = "exceptiongroup"
-version = "1.2.0"
+version = "1.2.2"
 description = "Backport of PEP 654 (exception groups)"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"},
-    {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"},
+    {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
+    {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
 ]
 
 [package.extras]
@@ -513,86 +474,101 @@ standard = ["email_validator (>=2.0.0)", "fastapi-cli (>=0.0.2)", "httpx (>=0.23
 
 [[package]]
 name = "googleapis-common-protos"
-version = "1.62.0"
+version = "1.65.0"
 description = "Common protobufs used in Google APIs"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "googleapis-common-protos-1.62.0.tar.gz", hash = "sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277"},
-    {file = "googleapis_common_protos-1.62.0-py2.py3-none-any.whl", hash = "sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07"},
+    {file = "googleapis_common_protos-1.65.0-py2.py3-none-any.whl", hash = "sha256:2972e6c496f435b92590fd54045060867f3fe9be2c82ab148fc8885035479a63"},
+    {file = "googleapis_common_protos-1.65.0.tar.gz", hash = "sha256:334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0"},
 ]
 
 [package.dependencies]
-protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<5.0.0.dev0"
+protobuf = ">=3.20.2,<4.21.1 || >4.21.1,<4.21.2 || >4.21.2,<4.21.3 || >4.21.3,<4.21.4 || >4.21.4,<4.21.5 || >4.21.5,<6.0.0.dev0"
 
 [package.extras]
 grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"]
 
 [[package]]
 name = "greenlet"
-version = "3.0.3"
+version = "3.1.1"
 description = "Lightweight in-process concurrent programming"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "greenlet-3.0.3-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:9da2bd29ed9e4f15955dd1595ad7bc9320308a3b766ef7f837e23ad4b4aac31a"},
-    {file = "greenlet-3.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d353cadd6083fdb056bb46ed07e4340b0869c305c8ca54ef9da3421acbdf6881"},
-    {file = "greenlet-3.0.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dca1e2f3ca00b84a396bc1bce13dd21f680f035314d2379c4160c98153b2059b"},
-    {file = "greenlet-3.0.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3ed7fb269f15dc662787f4119ec300ad0702fa1b19d2135a37c2c4de6fadfd4a"},
-    {file = "greenlet-3.0.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd4f49ae60e10adbc94b45c0b5e6a179acc1736cf7a90160b404076ee283cf83"},
-    {file = "greenlet-3.0.3-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:73a411ef564e0e097dbe7e866bb2dda0f027e072b04da387282b02c308807405"},
-    {file = "greenlet-3.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7f362975f2d179f9e26928c5b517524e89dd48530a0202570d55ad6ca5d8a56f"},
-    {file = "greenlet-3.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:649dde7de1a5eceb258f9cb00bdf50e978c9db1b996964cd80703614c86495eb"},
-    {file = "greenlet-3.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:68834da854554926fbedd38c76e60c4a2e3198c6fbed520b106a8986445caaf9"},
-    {file = "greenlet-3.0.3-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:b1b5667cced97081bf57b8fa1d6bfca67814b0afd38208d52538316e9422fc61"},
-    {file = "greenlet-3.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:52f59dd9c96ad2fc0d5724107444f76eb20aaccb675bf825df6435acb7703559"},
-    {file = "greenlet-3.0.3-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:afaff6cf5200befd5cec055b07d1c0a5a06c040fe5ad148abcd11ba6ab9b114e"},
-    {file = "greenlet-3.0.3-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33"},
-    {file = "greenlet-3.0.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2797aa5aedac23af156bbb5a6aa2cd3427ada2972c828244eb7d1b9255846379"},
-    {file = "greenlet-3.0.3-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b7f009caad047246ed379e1c4dbcb8b020f0a390667ea74d2387be2998f58a22"},
-    {file = "greenlet-3.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:c5e1536de2aad7bf62e27baf79225d0d64360d4168cf2e6becb91baf1ed074f3"},
-    {file = "greenlet-3.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:894393ce10ceac937e56ec00bb71c4c2f8209ad516e96033e4b3b1de270e200d"},
-    {file = "greenlet-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:1ea188d4f49089fc6fb283845ab18a2518d279c7cd9da1065d7a84e991748728"},
-    {file = "greenlet-3.0.3-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:70fb482fdf2c707765ab5f0b6655e9cfcf3780d8d87355a063547b41177599be"},
-    {file = "greenlet-3.0.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4d1ac74f5c0c0524e4a24335350edad7e5f03b9532da7ea4d3c54d527784f2e"},
-    {file = "greenlet-3.0.3-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:149e94a2dd82d19838fe4b2259f1b6b9957d5ba1b25640d2380bea9c5df37676"},
-    {file = "greenlet-3.0.3-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:15d79dd26056573940fcb8c7413d84118086f2ec1a8acdfa854631084393efcc"},
-    {file = "greenlet-3.0.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230"},
-    {file = "greenlet-3.0.3-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf"},
-    {file = "greenlet-3.0.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1f672519db1796ca0d8753f9e78ec02355e862d0998193038c7073045899f305"},
-    {file = "greenlet-3.0.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2516a9957eed41dd8f1ec0c604f1cdc86758b587d964668b5b196a9db5bfcde6"},
-    {file = "greenlet-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:bba5387a6975598857d86de9eac14210a49d554a77eb8261cc68b7d082f78ce2"},
-    {file = "greenlet-3.0.3-cp37-cp37m-macosx_11_0_universal2.whl", hash = "sha256:5b51e85cb5ceda94e79d019ed36b35386e8c37d22f07d6a751cb659b180d5274"},
-    {file = "greenlet-3.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:daf3cb43b7cf2ba96d614252ce1684c1bccee6b2183a01328c98d36fcd7d5cb0"},
-    {file = "greenlet-3.0.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:99bf650dc5d69546e076f413a87481ee1d2d09aaaaaca058c9251b6d8c14783f"},
-    {file = "greenlet-3.0.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dd6e660effd852586b6a8478a1d244b8dc90ab5b1321751d2ea15deb49ed414"},
-    {file = "greenlet-3.0.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3391d1e16e2a5a1507d83e4a8b100f4ee626e8eca43cf2cadb543de69827c4c"},
-    {file = "greenlet-3.0.3-cp37-cp37m-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e1f145462f1fa6e4a4ae3c0f782e580ce44d57c8f2c7aae1b6fa88c0b2efdb41"},
-    {file = "greenlet-3.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1a7191e42732df52cb5f39d3527217e7ab73cae2cb3694d241e18f53d84ea9a7"},
-    {file = "greenlet-3.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0448abc479fab28b00cb472d278828b3ccca164531daab4e970a0458786055d6"},
-    {file = "greenlet-3.0.3-cp37-cp37m-win32.whl", hash = "sha256:b542be2440edc2d48547b5923c408cbe0fc94afb9f18741faa6ae970dbcb9b6d"},
-    {file = "greenlet-3.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:01bc7ea167cf943b4c802068e178bbf70ae2e8c080467070d01bfa02f337ee67"},
-    {file = "greenlet-3.0.3-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:1996cb9306c8595335bb157d133daf5cf9f693ef413e7673cb07e3e5871379ca"},
-    {file = "greenlet-3.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ddc0f794e6ad661e321caa8d2f0a55ce01213c74722587256fb6566049a8b04"},
-    {file = "greenlet-3.0.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c9db1c18f0eaad2f804728c67d6c610778456e3e1cc4ab4bbd5eeb8e6053c6fc"},
-    {file = "greenlet-3.0.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7170375bcc99f1a2fbd9c306f5be8764eaf3ac6b5cb968862cad4c7057756506"},
-    {file = "greenlet-3.0.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b66c9c1e7ccabad3a7d037b2bcb740122a7b17a53734b7d72a344ce39882a1b"},
-    {file = "greenlet-3.0.3-cp38-cp38-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:098d86f528c855ead3479afe84b49242e174ed262456c342d70fc7f972bc13c4"},
-    {file = "greenlet-3.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:81bb9c6d52e8321f09c3d165b2a78c680506d9af285bfccbad9fb7ad5a5da3e5"},
-    {file = "greenlet-3.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da"},
-    {file = "greenlet-3.0.3-cp38-cp38-win32.whl", hash = "sha256:d46677c85c5ba00a9cb6f7a00b2bfa6f812192d2c9f7d9c4f6a55b60216712f3"},
-    {file = "greenlet-3.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:419b386f84949bf0e7c73e6032e3457b82a787c1ab4a0e43732898a761cc9dbf"},
-    {file = "greenlet-3.0.3-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:da70d4d51c8b306bb7a031d5cff6cc25ad253affe89b70352af5f1cb68e74b53"},
-    {file = "greenlet-3.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:086152f8fbc5955df88382e8a75984e2bb1c892ad2e3c80a2508954e52295257"},
-    {file = "greenlet-3.0.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d73a9fe764d77f87f8ec26a0c85144d6a951a6c438dfe50487df5595c6373eac"},
-    {file = "greenlet-3.0.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7dcbe92cc99f08c8dd11f930de4d99ef756c3591a5377d1d9cd7dd5e896da71"},
-    {file = "greenlet-3.0.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1551a8195c0d4a68fac7a4325efac0d541b48def35feb49d803674ac32582f61"},
-    {file = "greenlet-3.0.3-cp39-cp39-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:64d7675ad83578e3fc149b617a444fab8efdafc9385471f868eb5ff83e446b8b"},
-    {file = "greenlet-3.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b37eef18ea55f2ffd8f00ff8fe7c8d3818abd3e25fb73fae2ca3b672e333a7a6"},
-    {file = "greenlet-3.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:77457465d89b8263bca14759d7c1684df840b6811b2499838cc5b040a8b5b113"},
-    {file = "greenlet-3.0.3-cp39-cp39-win32.whl", hash = "sha256:57e8974f23e47dac22b83436bdcf23080ade568ce77df33159e019d161ce1d1e"},
-    {file = "greenlet-3.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:c5ee858cfe08f34712f548c3c363e807e7186f03ad7a5039ebadb29e8c6be067"},
-    {file = "greenlet-3.0.3.tar.gz", hash = "sha256:43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491"},
+    {file = "greenlet-3.1.1-cp310-cp310-macosx_11_0_universal2.whl", hash = "sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563"},
+    {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83"},
+    {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0"},
+    {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120"},
+    {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc"},
+    {file = "greenlet-3.1.1-cp310-cp310-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617"},
+    {file = "greenlet-3.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7"},
+    {file = "greenlet-3.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6"},
+    {file = "greenlet-3.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80"},
+    {file = "greenlet-3.1.1-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70"},
+    {file = "greenlet-3.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159"},
+    {file = "greenlet-3.1.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e"},
+    {file = "greenlet-3.1.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1"},
+    {file = "greenlet-3.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383"},
+    {file = "greenlet-3.1.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a"},
+    {file = "greenlet-3.1.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511"},
+    {file = "greenlet-3.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395"},
+    {file = "greenlet-3.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39"},
+    {file = "greenlet-3.1.1-cp312-cp312-macosx_11_0_universal2.whl", hash = "sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d"},
+    {file = "greenlet-3.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79"},
+    {file = "greenlet-3.1.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa"},
+    {file = "greenlet-3.1.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441"},
+    {file = "greenlet-3.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36"},
+    {file = "greenlet-3.1.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9"},
+    {file = "greenlet-3.1.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0"},
+    {file = "greenlet-3.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942"},
+    {file = "greenlet-3.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01"},
+    {file = "greenlet-3.1.1-cp313-cp313-macosx_11_0_universal2.whl", hash = "sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1"},
+    {file = "greenlet-3.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff"},
+    {file = "greenlet-3.1.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a"},
+    {file = "greenlet-3.1.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e"},
+    {file = "greenlet-3.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4"},
+    {file = "greenlet-3.1.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e"},
+    {file = "greenlet-3.1.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1"},
+    {file = "greenlet-3.1.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c"},
+    {file = "greenlet-3.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761"},
+    {file = "greenlet-3.1.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011"},
+    {file = "greenlet-3.1.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13"},
+    {file = "greenlet-3.1.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475"},
+    {file = "greenlet-3.1.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b"},
+    {file = "greenlet-3.1.1-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822"},
+    {file = "greenlet-3.1.1-cp313-cp313t-musllinux_1_1_aarch64.whl", hash = "sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01"},
+    {file = "greenlet-3.1.1-cp313-cp313t-musllinux_1_1_x86_64.whl", hash = "sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6"},
+    {file = "greenlet-3.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291"},
+    {file = "greenlet-3.1.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981"},
+    {file = "greenlet-3.1.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803"},
+    {file = "greenlet-3.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc"},
+    {file = "greenlet-3.1.1-cp37-cp37m-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de"},
+    {file = "greenlet-3.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa"},
+    {file = "greenlet-3.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af"},
+    {file = "greenlet-3.1.1-cp37-cp37m-win32.whl", hash = "sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798"},
+    {file = "greenlet-3.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef"},
+    {file = "greenlet-3.1.1-cp38-cp38-macosx_11_0_universal2.whl", hash = "sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9"},
+    {file = "greenlet-3.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111"},
+    {file = "greenlet-3.1.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81"},
+    {file = "greenlet-3.1.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba"},
+    {file = "greenlet-3.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8"},
+    {file = "greenlet-3.1.1-cp38-cp38-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1"},
+    {file = "greenlet-3.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd"},
+    {file = "greenlet-3.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7"},
+    {file = "greenlet-3.1.1-cp38-cp38-win32.whl", hash = "sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef"},
+    {file = "greenlet-3.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d"},
+    {file = "greenlet-3.1.1-cp39-cp39-macosx_11_0_universal2.whl", hash = "sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3"},
+    {file = "greenlet-3.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42"},
+    {file = "greenlet-3.1.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"},
+    {file = "greenlet-3.1.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437"},
+    {file = "greenlet-3.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145"},
+    {file = "greenlet-3.1.1-cp39-cp39-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c"},
+    {file = "greenlet-3.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e"},
+    {file = "greenlet-3.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e"},
+    {file = "greenlet-3.1.1-cp39-cp39-win32.whl", hash = "sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c"},
+    {file = "greenlet-3.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22"},
+    {file = "greenlet-3.1.1.tar.gz", hash = "sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467"},
 ]
 
 [package.extras]
@@ -601,61 +577,70 @@ test = ["objgraph", "psutil"]
 
 [[package]]
 name = "grpcio"
-version = "1.65.4"
+version = "1.66.2"
 description = "HTTP/2-based RPC framework"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "grpcio-1.65.4-cp310-cp310-linux_armv7l.whl", hash = "sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c"},
-    {file = "grpcio-1.65.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d"},
-    {file = "grpcio-1.65.4-cp310-cp310-win32.whl", hash = "sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1"},
-    {file = "grpcio-1.65.4-cp310-cp310-win_amd64.whl", hash = "sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec"},
-    {file = "grpcio-1.65.4-cp311-cp311-linux_armv7l.whl", hash = "sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef"},
-    {file = "grpcio-1.65.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5"},
-    {file = "grpcio-1.65.4-cp311-cp311-win32.whl", hash = "sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b"},
-    {file = "grpcio-1.65.4-cp311-cp311-win_amd64.whl", hash = "sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558"},
-    {file = "grpcio-1.65.4-cp312-cp312-linux_armv7l.whl", hash = "sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56"},
-    {file = "grpcio-1.65.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28"},
-    {file = "grpcio-1.65.4-cp312-cp312-win32.whl", hash = "sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0"},
-    {file = "grpcio-1.65.4-cp312-cp312-win_amd64.whl", hash = "sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416"},
-    {file = "grpcio-1.65.4-cp38-cp38-linux_armv7l.whl", hash = "sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021"},
-    {file = "grpcio-1.65.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7"},
-    {file = "grpcio-1.65.4-cp38-cp38-win32.whl", hash = "sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a"},
-    {file = "grpcio-1.65.4-cp38-cp38-win_amd64.whl", hash = "sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f"},
-    {file = "grpcio-1.65.4-cp39-cp39-linux_armv7l.whl", hash = "sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733"},
-    {file = "grpcio-1.65.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257"},
-    {file = "grpcio-1.65.4-cp39-cp39-win32.whl", hash = "sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d"},
-    {file = "grpcio-1.65.4-cp39-cp39-win_amd64.whl", hash = "sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9"},
-    {file = "grpcio-1.65.4.tar.gz", hash = "sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39"},
+    {file = "grpcio-1.66.2-cp310-cp310-linux_armv7l.whl", hash = "sha256:fe96281713168a3270878255983d2cb1a97e034325c8c2c25169a69289d3ecfa"},
+    {file = "grpcio-1.66.2-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:73fc8f8b9b5c4a03e802b3cd0c18b2b06b410d3c1dcbef989fdeb943bd44aff7"},
+    {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:03b0b307ba26fae695e067b94cbb014e27390f8bc5ac7a3a39b7723fed085604"},
+    {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d69ce1f324dc2d71e40c9261d3fdbe7d4c9d60f332069ff9b2a4d8a257c7b2b"},
+    {file = "grpcio-1.66.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05bc2ceadc2529ab0b227b1310d249d95d9001cd106aa4d31e8871ad3c428d73"},
+    {file = "grpcio-1.66.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8ac475e8da31484efa25abb774674d837b343afb78bb3bcdef10f81a93e3d6bf"},
+    {file = "grpcio-1.66.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0be4e0490c28da5377283861bed2941d1d20ec017ca397a5df4394d1c31a9b50"},
+    {file = "grpcio-1.66.2-cp310-cp310-win32.whl", hash = "sha256:4e504572433f4e72b12394977679161d495c4c9581ba34a88d843eaf0f2fbd39"},
+    {file = "grpcio-1.66.2-cp310-cp310-win_amd64.whl", hash = "sha256:2018b053aa15782db2541ca01a7edb56a0bf18c77efed975392583725974b249"},
+    {file = "grpcio-1.66.2-cp311-cp311-linux_armv7l.whl", hash = "sha256:2335c58560a9e92ac58ff2bc5649952f9b37d0735608242973c7a8b94a6437d8"},
+    {file = "grpcio-1.66.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:45a3d462826f4868b442a6b8fdbe8b87b45eb4f5b5308168c156b21eca43f61c"},
+    {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a9539f01cb04950fd4b5ab458e64a15f84c2acc273670072abe49a3f29bbad54"},
+    {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce89f5876662f146d4c1f695dda29d4433a5d01c8681fbd2539afff535da14d4"},
+    {file = "grpcio-1.66.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d25a14af966438cddf498b2e338f88d1c9706f3493b1d73b93f695c99c5f0e2a"},
+    {file = "grpcio-1.66.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6001e575b8bbd89eee11960bb640b6da6ae110cf08113a075f1e2051cc596cae"},
+    {file = "grpcio-1.66.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4ea1d062c9230278793820146c95d038dc0f468cbdd172eec3363e42ff1c7d01"},
+    {file = "grpcio-1.66.2-cp311-cp311-win32.whl", hash = "sha256:38b68498ff579a3b1ee8f93a05eb48dc2595795f2f62716e797dc24774c1aaa8"},
+    {file = "grpcio-1.66.2-cp311-cp311-win_amd64.whl", hash = "sha256:6851de821249340bdb100df5eacfecfc4e6075fa85c6df7ee0eb213170ec8e5d"},
+    {file = "grpcio-1.66.2-cp312-cp312-linux_armv7l.whl", hash = "sha256:802d84fd3d50614170649853d121baaaa305de7b65b3e01759247e768d691ddf"},
+    {file = "grpcio-1.66.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:80fd702ba7e432994df208f27514280b4b5c6843e12a48759c9255679ad38db8"},
+    {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:12fda97ffae55e6526825daf25ad0fa37483685952b5d0f910d6405c87e3adb6"},
+    {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:950da58d7d80abd0ea68757769c9db0a95b31163e53e5bb60438d263f4bed7b7"},
+    {file = "grpcio-1.66.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e636ce23273683b00410f1971d209bf3689238cf5538d960adc3cdfe80dd0dbd"},
+    {file = "grpcio-1.66.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a917d26e0fe980b0ac7bfcc1a3c4ad6a9a4612c911d33efb55ed7833c749b0ee"},
+    {file = "grpcio-1.66.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:49f0ca7ae850f59f828a723a9064cadbed90f1ece179d375966546499b8a2c9c"},
+    {file = "grpcio-1.66.2-cp312-cp312-win32.whl", hash = "sha256:31fd163105464797a72d901a06472860845ac157389e10f12631025b3e4d0453"},
+    {file = "grpcio-1.66.2-cp312-cp312-win_amd64.whl", hash = "sha256:ff1f7882e56c40b0d33c4922c15dfa30612f05fb785074a012f7cda74d1c3679"},
+    {file = "grpcio-1.66.2-cp313-cp313-linux_armv7l.whl", hash = "sha256:3b00efc473b20d8bf83e0e1ae661b98951ca56111feb9b9611df8efc4fe5d55d"},
+    {file = "grpcio-1.66.2-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:1caa38fb22a8578ab8393da99d4b8641e3a80abc8fd52646f1ecc92bcb8dee34"},
+    {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_aarch64.whl", hash = "sha256:c408f5ef75cfffa113cacd8b0c0e3611cbfd47701ca3cdc090594109b9fcbaed"},
+    {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c806852deaedee9ce8280fe98955c9103f62912a5b2d5ee7e3eaa284a6d8d8e7"},
+    {file = "grpcio-1.66.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f145cc21836c332c67baa6fc81099d1d27e266401565bf481948010d6ea32d46"},
+    {file = "grpcio-1.66.2-cp313-cp313-musllinux_1_1_i686.whl", hash = "sha256:73e3b425c1e155730273f73e419de3074aa5c5e936771ee0e4af0814631fb30a"},
+    {file = "grpcio-1.66.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:9c509a4f78114cbc5f0740eb3d7a74985fd2eff022971bc9bc31f8bc93e66a3b"},
+    {file = "grpcio-1.66.2-cp313-cp313-win32.whl", hash = "sha256:20657d6b8cfed7db5e11b62ff7dfe2e12064ea78e93f1434d61888834bc86d75"},
+    {file = "grpcio-1.66.2-cp313-cp313-win_amd64.whl", hash = "sha256:fb70487c95786e345af5e854ffec8cb8cc781bcc5df7930c4fbb7feaa72e1cdf"},
+    {file = "grpcio-1.66.2-cp38-cp38-linux_armv7l.whl", hash = "sha256:a18e20d8321c6400185b4263e27982488cb5cdd62da69147087a76a24ef4e7e3"},
+    {file = "grpcio-1.66.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:02697eb4a5cbe5a9639f57323b4c37bcb3ab2d48cec5da3dc2f13334d72790dd"},
+    {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:99a641995a6bc4287a6315989ee591ff58507aa1cbe4c2e70d88411c4dcc0839"},
+    {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ed71e81782966ffead60268bbda31ea3f725ebf8aa73634d5dda44f2cf3fb9c"},
+    {file = "grpcio-1.66.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bbd27c24a4cc5e195a7f56cfd9312e366d5d61b86e36d46bbe538457ea6eb8dd"},
+    {file = "grpcio-1.66.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:d9a9724a156c8ec6a379869b23ba3323b7ea3600851c91489b871e375f710bc8"},
+    {file = "grpcio-1.66.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d8d4732cc5052e92cea2f78b233c2e2a52998ac40cd651f40e398893ad0d06ec"},
+    {file = "grpcio-1.66.2-cp38-cp38-win32.whl", hash = "sha256:7b2c86457145ce14c38e5bf6bdc19ef88e66c5fee2c3d83285c5aef026ba93b3"},
+    {file = "grpcio-1.66.2-cp38-cp38-win_amd64.whl", hash = "sha256:e88264caad6d8d00e7913996030bac8ad5f26b7411495848cc218bd3a9040b6c"},
+    {file = "grpcio-1.66.2-cp39-cp39-linux_armv7l.whl", hash = "sha256:c400ba5675b67025c8a9f48aa846f12a39cf0c44df5cd060e23fda5b30e9359d"},
+    {file = "grpcio-1.66.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:66a0cd8ba6512b401d7ed46bb03f4ee455839957f28b8d61e7708056a806ba6a"},
+    {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:06de8ec0bd71be123eec15b0e0d457474931c2c407869b6c349bd9bed4adbac3"},
+    {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fb57870449dfcfac428afbb5a877829fcb0d6db9d9baa1148705739e9083880e"},
+    {file = "grpcio-1.66.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b672abf90a964bfde2d0ecbce30f2329a47498ba75ce6f4da35a2f4532b7acbc"},
+    {file = "grpcio-1.66.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ad2efdbe90c73b0434cbe64ed372e12414ad03c06262279b104a029d1889d13e"},
+    {file = "grpcio-1.66.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c3a99c519f4638e700e9e3f83952e27e2ea10873eecd7935823dab0c1c9250e"},
+    {file = "grpcio-1.66.2-cp39-cp39-win32.whl", hash = "sha256:78fa51ebc2d9242c0fc5db0feecc57a9943303b46664ad89921f5079e2e4ada7"},
+    {file = "grpcio-1.66.2-cp39-cp39-win_amd64.whl", hash = "sha256:728bdf36a186e7f51da73be7f8d09457a03061be848718d0edf000e709418987"},
+    {file = "grpcio-1.66.2.tar.gz", hash = "sha256:563588c587b75c34b928bc428548e5b00ea38c46972181a4d8b75ba7e3f24231"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.65.4)"]
+protobuf = ["grpcio-tools (>=1.66.2)"]
 
 [[package]]
 name = "h11"
@@ -670,13 +655,13 @@ files = [
 
 [[package]]
 name = "httpcore"
-version = "1.0.5"
+version = "1.0.6"
 description = "A minimal low-level HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"},
-    {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"},
+    {file = "httpcore-1.0.6-py3-none-any.whl", hash = "sha256:27b59625743b85577a8c0e10e55b50b5368a4f2cfe8cc7bcfa9cf00829c2682f"},
+    {file = "httpcore-1.0.6.tar.gz", hash = "sha256:73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f"},
 ]
 
 [package.dependencies]
@@ -687,17 +672,17 @@ h11 = ">=0.13,<0.15"
 asyncio = ["anyio (>=4.0,<5.0)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
-trio = ["trio (>=0.22.0,<0.26.0)"]
+trio = ["trio (>=0.22.0,<1.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -712,36 +697,40 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
-version = "3.7"
+version = "3.10"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
 files = [
-    {file = "idna-3.7-py3-none-any.whl", hash = "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0"},
-    {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"},
+    {file = "idna-3.10-py3-none-any.whl", hash = "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3"},
+    {file = "idna-3.10.tar.gz", hash = "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9"},
 ]
 
+[package.extras]
+all = ["flake8 (>=7.1.1)", "mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"]
+
 [[package]]
 name = "importlib-metadata"
-version = "6.11.0"
+version = "8.0.0"
 description = "Read metadata from Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "importlib_metadata-6.11.0-py3-none-any.whl", hash = "sha256:f0afba6205ad8f8947c7d338b5342d5db2afbfd82f9cbef7879a9539cc12eb9b"},
-    {file = "importlib_metadata-6.11.0.tar.gz", hash = "sha256:1231cf92d825c9e03cfc4da076a16de6422c863558229ea0b22b675657463443"},
+    {file = "importlib_metadata-8.0.0-py3-none-any.whl", hash = "sha256:15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f"},
+    {file = "importlib_metadata-8.0.0.tar.gz", hash = "sha256:188bd24e4c346d3f0a933f275c2fec67050326a856b9a359881d7c2a697e8812"},
 ]
 
 [package.dependencies]
 zipp = ">=0.5"
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
+doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
 perf = ["ipython"]
-testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"]
+test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"]
 
 [[package]]
 name = "iniconfig"
@@ -754,15 +743,26 @@ files = [
     {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
 ]
 
+[[package]]
+name = "jmespath"
+version = "1.0.1"
+description = "JSON Matching Expressions"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "jmespath-1.0.1-py3-none-any.whl", hash = "sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980"},
+    {file = "jmespath-1.0.1.tar.gz", hash = "sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe"},
+]
+
 [[package]]
 name = "mako"
-version = "1.3.2"
+version = "1.3.5"
 description = "A super-fast templating language that borrows the best ideas from the existing templating languages."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "Mako-1.3.2-py3-none-any.whl", hash = "sha256:32a99d70754dfce237019d17ffe4a282d2d3351b9c476e90d8a60e63f133b80c"},
-    {file = "Mako-1.3.2.tar.gz", hash = "sha256:2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e"},
+    {file = "Mako-1.3.5-py3-none-any.whl", hash = "sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a"},
+    {file = "Mako-1.3.5.tar.gz", hash = "sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc"},
 ]
 
 [package.dependencies]
@@ -1063,13 +1063,13 @@ files = [
 
 [[package]]
 name = "packaging"
-version = "23.2"
+version = "24.1"
 description = "Core utilities for Python packages"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
-    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+    {file = "packaging-24.1-py3-none-any.whl", hash = "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124"},
+    {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"},
 ]
 
 [[package]]
@@ -1139,22 +1139,22 @@ twisted = ["twisted"]
 
 [[package]]
 name = "protobuf"
-version = "4.25.3"
+version = "4.25.5"
 description = ""
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "protobuf-4.25.3-cp310-abi3-win32.whl", hash = "sha256:d4198877797a83cbfe9bffa3803602bbe1625dc30d8a097365dbc762e5790faa"},
-    {file = "protobuf-4.25.3-cp310-abi3-win_amd64.whl", hash = "sha256:209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8"},
-    {file = "protobuf-4.25.3-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c"},
-    {file = "protobuf-4.25.3-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:e7cb0ae90dd83727f0c0718634ed56837bfeeee29a5f82a7514c03ee1364c019"},
-    {file = "protobuf-4.25.3-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:7c8daa26095f82482307bc717364e7c13f4f1c99659be82890dcfc215194554d"},
-    {file = "protobuf-4.25.3-cp38-cp38-win32.whl", hash = "sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2"},
-    {file = "protobuf-4.25.3-cp38-cp38-win_amd64.whl", hash = "sha256:c053062984e61144385022e53678fbded7aea14ebb3e0305ae3592fb219ccfa4"},
-    {file = "protobuf-4.25.3-cp39-cp39-win32.whl", hash = "sha256:19b270aeaa0099f16d3ca02628546b8baefe2955bbe23224aaf856134eccf1e4"},
-    {file = "protobuf-4.25.3-cp39-cp39-win_amd64.whl", hash = "sha256:e3c97a1555fd6388f857770ff8b9703083de6bf1f9274a002a332d65fbb56c8c"},
-    {file = "protobuf-4.25.3-py3-none-any.whl", hash = "sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9"},
-    {file = "protobuf-4.25.3.tar.gz", hash = "sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c"},
+    {file = "protobuf-4.25.5-cp310-abi3-win32.whl", hash = "sha256:5e61fd921603f58d2f5acb2806a929b4675f8874ff5f330b7d6f7e2e784bbcd8"},
+    {file = "protobuf-4.25.5-cp310-abi3-win_amd64.whl", hash = "sha256:4be0571adcbe712b282a330c6e89eae24281344429ae95c6d85e79e84780f5ea"},
+    {file = "protobuf-4.25.5-cp37-abi3-macosx_10_9_universal2.whl", hash = "sha256:b2fde3d805354df675ea4c7c6338c1aecd254dfc9925e88c6d31a2bcb97eb173"},
+    {file = "protobuf-4.25.5-cp37-abi3-manylinux2014_aarch64.whl", hash = "sha256:919ad92d9b0310070f8356c24b855c98df2b8bd207ebc1c0c6fcc9ab1e007f3d"},
+    {file = "protobuf-4.25.5-cp37-abi3-manylinux2014_x86_64.whl", hash = "sha256:fe14e16c22be926d3abfcb500e60cab068baf10b542b8c858fa27e098123e331"},
+    {file = "protobuf-4.25.5-cp38-cp38-win32.whl", hash = "sha256:98d8d8aa50de6a2747efd9cceba361c9034050ecce3e09136f90de37ddba66e1"},
+    {file = "protobuf-4.25.5-cp38-cp38-win_amd64.whl", hash = "sha256:b0234dd5a03049e4ddd94b93400b67803c823cfc405689688f59b34e0742381a"},
+    {file = "protobuf-4.25.5-cp39-cp39-win32.whl", hash = "sha256:abe32aad8561aa7cc94fc7ba4fdef646e576983edb94a73381b03c53728a626f"},
+    {file = "protobuf-4.25.5-cp39-cp39-win_amd64.whl", hash = "sha256:7a183f592dc80aa7c8da7ad9e55091c4ffc9497b3054452d629bb85fa27c2a45"},
+    {file = "protobuf-4.25.5-py3-none-any.whl", hash = "sha256:0aebecb809cae990f8129ada5ca273d9d670b76d9bfc9b1809f0a9c02b7dbf41"},
+    {file = "protobuf-4.25.5.tar.gz", hash = "sha256:7f8249476b4a9473645db7f8ab42b02fe1488cbe5fb72fddd445e0665afd8584"},
 ]
 
 [[package]]
@@ -1181,54 +1181,52 @@ files = [
 
 [[package]]
 name = "pyasn1"
-version = "0.5.1"
+version = "0.6.1"
 description = "Pure-Python implementation of ASN.1 types and DER/BER/CER codecs (X.208)"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pyasn1-0.5.1-py2.py3-none-any.whl", hash = "sha256:4439847c58d40b1d0a573d07e3856e95333f1976294494c325775aeca506eb58"},
-    {file = "pyasn1-0.5.1.tar.gz", hash = "sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c"},
+    {file = "pyasn1-0.6.1.tar.gz", hash = "sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034"},
 ]
 
 [[package]]
 name = "pyasn1-modules"
-version = "0.3.0"
+version = "0.4.1"
 description = "A collection of ASN.1-based protocols modules"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pyasn1_modules-0.3.0-py2.py3-none-any.whl", hash = "sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d"},
-    {file = "pyasn1_modules-0.3.0.tar.gz", hash = "sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c"},
+    {file = "pyasn1_modules-0.4.1.tar.gz", hash = "sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c"},
 ]
 
 [package.dependencies]
-pyasn1 = ">=0.4.6,<0.6.0"
+pyasn1 = ">=0.4.6,<0.7.0"
 
 [[package]]
 name = "pycparser"
-version = "2.21"
+version = "2.22"
 description = "C parser in Python"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+python-versions = ">=3.8"
 files = [
-    {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
-    {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
+    {file = "pycparser-2.22-py3-none-any.whl", hash = "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc"},
+    {file = "pycparser-2.22.tar.gz", hash = "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6"},
 ]
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -1236,103 +1234,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -1340,13 +1339,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.3.4"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -1354,24 +1353,25 @@ pydantic = ">=2.7.0"
 python-dotenv = ">=0.21.0"
 
 [package.extras]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
 [[package]]
 name = "pyjwt"
-version = "2.8.0"
+version = "2.9.0"
 description = "JSON Web Token implementation in Python"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "PyJWT-2.8.0-py3-none-any.whl", hash = "sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320"},
-    {file = "PyJWT-2.8.0.tar.gz", hash = "sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de"},
+    {file = "PyJWT-2.9.0-py3-none-any.whl", hash = "sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850"},
+    {file = "pyjwt-2.9.0.tar.gz", hash = "sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c"},
 ]
 
 [package.extras]
 crypto = ["cryptography (>=3.4.0)"]
-dev = ["coverage[toml] (==5.0.4)", "cryptography (>=3.4.0)", "pre-commit", "pytest (>=6.0.0,<7.0.0)", "sphinx (>=4.5.0,<5.0.0)", "sphinx-rtd-theme", "zope.interface"]
-docs = ["sphinx (>=4.5.0,<5.0.0)", "sphinx-rtd-theme", "zope.interface"]
+dev = ["coverage[toml] (==5.0.4)", "cryptography (>=3.4.0)", "pre-commit", "pytest (>=6.0.0,<7.0.0)", "sphinx", "sphinx-rtd-theme", "zope.interface"]
+docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"]
 tests = ["coverage[toml] (==5.0.4)", "pytest (>=6.0.0,<7.0.0)"]
 
 [[package]]
@@ -1402,13 +1402,13 @@ tests = ["hypothesis (>=3.27.0)", "pytest (>=3.2.1,!=3.3.0)"]
 
 [[package]]
 name = "pytest"
-version = "8.2.1"
+version = "8.3.3"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest-8.2.1-py3-none-any.whl", hash = "sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1"},
-    {file = "pytest-8.2.1.tar.gz", hash = "sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd"},
+    {file = "pytest-8.3.3-py3-none-any.whl", hash = "sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2"},
+    {file = "pytest-8.3.3.tar.gz", hash = "sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181"},
 ]
 
 [package.dependencies]
@@ -1416,57 +1416,39 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""}
 exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
 iniconfig = "*"
 packaging = "*"
-pluggy = ">=1.5,<2.0"
+pluggy = ">=1.5,<2"
 tomli = {version = ">=1", markers = "python_version < \"3.11\""}
 
 [package.extras]
 dev = ["argcomplete", "attrs (>=19.2)", "hypothesis (>=3.56)", "mock", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
 
-[[package]]
-name = "pytest-cov"
-version = "5.0.0"
-description = "Pytest plugin for measuring coverage."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pytest-cov-5.0.0.tar.gz", hash = "sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857"},
-    {file = "pytest_cov-5.0.0-py3-none-any.whl", hash = "sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652"},
-]
-
-[package.dependencies]
-coverage = {version = ">=5.2.1", extras = ["toml"]}
-pytest = ">=4.6"
-
-[package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "virtualenv"]
-
 [[package]]
 name = "pytest-env"
-version = "1.1.3"
+version = "1.1.5"
 description = "pytest plugin that allows you to add environment variables."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pytest_env-1.1.3-py3-none-any.whl", hash = "sha256:aada77e6d09fcfb04540a6e462c58533c37df35fa853da78707b17ec04d17dfc"},
-    {file = "pytest_env-1.1.3.tar.gz", hash = "sha256:fcd7dc23bb71efd3d35632bde1bbe5ee8c8dc4489d6617fb010674880d96216b"},
+    {file = "pytest_env-1.1.5-py3-none-any.whl", hash = "sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30"},
+    {file = "pytest_env-1.1.5.tar.gz", hash = "sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf"},
 ]
 
 [package.dependencies]
-pytest = ">=7.4.3"
+pytest = ">=8.3.3"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-test = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "pytest-mock (>=3.12)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.6.1)", "pytest-mock (>=3.14)"]
 
 [[package]]
 name = "python-dateutil"
-version = "2.9.0"
+version = "2.9.0.post0"
 description = "Extensions to the standard Python datetime module"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 files = [
-    {file = "python-dateutil-2.9.0.tar.gz", hash = "sha256:78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709"},
-    {file = "python_dateutil-2.9.0-py2.py3-none-any.whl", hash = "sha256:cbf2f1da5e6083ac2fbfd4da39a25f34312230110440f424a14c7558bb85d82e"},
+    {file = "python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3"},
+    {file = "python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427"},
 ]
 
 [package.dependencies]
@@ -1539,21 +1521,42 @@ pyasn1-modules = "*"
 python-dateutil = "*"
 requests = "*"
 
+[[package]]
+name = "s3transfer"
+version = "0.10.2"
+description = "An Amazon S3 Transfer Manager"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "s3transfer-0.10.2-py3-none-any.whl", hash = "sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69"},
+    {file = "s3transfer-0.10.2.tar.gz", hash = "sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6"},
+]
+
+[package.dependencies]
+botocore = ">=1.33.2,<2.0a.0"
+
+[package.extras]
+crt = ["botocore[crt] (>=1.33.2,<2.0a.0)"]
+
 [[package]]
 name = "setuptools"
-version = "71.0.3"
+version = "75.1.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-71.0.3-py3-none-any.whl", hash = "sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207"},
-    {file = "setuptools-71.0.3.tar.gz", hash = "sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d"},
+    {file = "setuptools-75.1.0-py3-none-any.whl", hash = "sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2"},
+    {file = "setuptools-75.1.0.tar.gz", hash = "sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538"},
 ]
 
 [package.extras]
-core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.text (>=3.7)", "more-itertools (>=8.8)", "ordered-set (>=3.1.1)", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
-doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (<7.4)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.10.0)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (<0.4)", "pytest-ruff (>=0.2.1)", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)", "ruff (>=0.5.2)"]
+core = ["importlib-metadata (>=6)", "importlib-resources (>=5.10.2)", "jaraco.collections", "jaraco.functools", "jaraco.text (>=3.7)", "more-itertools", "more-itertools (>=8.8)", "packaging", "packaging (>=24)", "platformdirs (>=2.6.2)", "tomli (>=2.0.1)", "wheel (>=0.43.0)"]
+cover = ["pytest-cov"]
+doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier", "towncrier (<24.7)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.*)", "pytest-home (>=0.5)", "pytest-perf", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel (>=0.44.0)"]
+type = ["importlib-metadata (>=7.0.2)", "jaraco.develop (>=7.21)", "mypy (==1.11.*)", "pytest-mypy"]
 
 [[package]]
 name = "six"
@@ -1579,36 +1582,55 @@ files = [
 
 [[package]]
 name = "sqlalchemy"
-version = "1.4.51"
+version = "1.4.54"
 description = "Database Abstraction Library"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7"
 files = [
-    {file = "SQLAlchemy-1.4.51-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2be4e6294c53f2ec8ea36486b56390e3bcaa052bf3a9a47005687ccf376745d1"},
-    {file = "SQLAlchemy-1.4.51-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8ca484ca11c65e05639ffe80f20d45e6be81fbec7683d6c9a15cd421e6e8b340"},
-    {file = "SQLAlchemy-1.4.51-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0535d5b57d014d06ceeaeffd816bb3a6e2dddeb670222570b8c4953e2d2ea678"},
-    {file = "SQLAlchemy-1.4.51-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af55cc207865d641a57f7044e98b08b09220da3d1b13a46f26487cc2f898a072"},
-    {file = "SQLAlchemy-1.4.51-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7deeae5071930abb3669b5185abb6c33ddfd2398f87660fafdb9e6a5fb0f3f2f"},
-    {file = "SQLAlchemy-1.4.51-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0892e7ac8bc76da499ad3ee8de8da4d7905a3110b952e2a35a940dab1ffa550e"},
-    {file = "SQLAlchemy-1.4.51-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6cacc0b2dd7d22a918a9642fc89840a5d3cee18a0e1fe41080b1141b23b10916"},
-    {file = "SQLAlchemy-1.4.51-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:245c67c88e63f1523e9216cad6ba3107dea2d3ee19adc359597a628afcabfbcb"},
-    {file = "SQLAlchemy-1.4.51-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3ec7a0ed9b32afdf337172678a4a0e6419775ba4e649b66f49415615fa47efbd"},
-    {file = "SQLAlchemy-1.4.51-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:352df882088a55293f621328ec33b6ffca936ad7f23013b22520542e1ab6ad1b"},
-    {file = "SQLAlchemy-1.4.51-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:86a22143a4001f53bf58027b044da1fb10d67b62a785fc1390b5c7f089d9838c"},
-    {file = "SQLAlchemy-1.4.51-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c37bc677690fd33932182b85d37433845de612962ed080c3e4d92f758d1bd894"},
-    {file = "SQLAlchemy-1.4.51-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2c55040d8ea65414de7c47f1a23823cd9f3fad0dc93e6b6b728fee81230f817b"},
-    {file = "SQLAlchemy-1.4.51-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:38ef80328e3fee2be0a1abe3fe9445d3a2e52a1282ba342d0dab6edf1fef4707"},
-    {file = "SQLAlchemy-1.4.51-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f8cafa6f885a0ff5e39efa9325195217bb47d5929ab0051636610d24aef45ade"},
-    {file = "SQLAlchemy-1.4.51-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8f2df79a46e130235bc5e1bbef4de0583fb19d481eaa0bffa76e8347ea45ec6"},
-    {file = "SQLAlchemy-1.4.51-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb18549b770351b54e1ab5da37d22bc530b8bfe2ee31e22b9ebe650640d2ef12"},
-    {file = "SQLAlchemy-1.4.51-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:55e699466106d09f028ab78d3c2e1f621b5ef2c8694598242259e4515715da7c"},
-    {file = "SQLAlchemy-1.4.51-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2ad16880ccd971ac8e570550fbdef1385e094b022d6fc85ef3ce7df400dddad3"},
-    {file = "SQLAlchemy-1.4.51-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b97fd5bb6b7c1a64b7ac0632f7ce389b8ab362e7bd5f60654c2a418496be5d7f"},
-    {file = "SQLAlchemy-1.4.51-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e646b19f47d655261b22df9976e572f588185279970efba3d45c377127d35349"},
-    {file = "SQLAlchemy-1.4.51-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3cf56cc36d42908495760b223ca9c2c0f9f0002b4eddc994b24db5fcb86a9e4"},
-    {file = "SQLAlchemy-1.4.51-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0d661cff58c91726c601cc0ee626bf167b20cc4d7941c93c5f3ac28dc34ddbea"},
-    {file = "SQLAlchemy-1.4.51-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3823dda635988e6744d4417e13f2e2b5fe76c4bf29dd67e95f98717e1b094cad"},
-    {file = "SQLAlchemy-1.4.51.tar.gz", hash = "sha256:e7908c2025eb18394e32d65dd02d2e37e17d733cdbe7d78231c2b6d7eb20cdb9"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:af00236fe21c4d4f4c227b6ccc19b44c594160cc3ff28d104cdce85855369277"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-manylinux1_x86_64.manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_5_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1183599e25fa38a1a322294b949da02b4f0da13dbc2688ef9dbe746df573f8a6"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1990d5a6a5dc358a0894c8ca02043fb9a5ad9538422001fb2826e91c50f1d539"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:14b3f4783275339170984cadda66e3ec011cce87b405968dc8d51cf0f9997b0d"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b24364150738ce488333b3fb48bfa14c189a66de41cd632796fbcacb26b4585"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-win32.whl", hash = "sha256:a8a72259a1652f192c68377be7011eac3c463e9892ef2948828c7d58e4829988"},
+    {file = "SQLAlchemy-1.4.54-cp310-cp310-win_amd64.whl", hash = "sha256:b67589f7955924865344e6eacfdcf70675e64f36800a576aa5e961f0008cde2a"},
+    {file = "SQLAlchemy-1.4.54-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:b05e0626ec1c391432eabb47a8abd3bf199fb74bfde7cc44a26d2b1b352c2c6e"},
+    {file = "SQLAlchemy-1.4.54-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:13e91d6892b5fcb94a36ba061fb7a1f03d0185ed9d8a77c84ba389e5bb05e936"},
+    {file = "SQLAlchemy-1.4.54-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fb59a11689ff3c58e7652260127f9e34f7f45478a2f3ef831ab6db7bcd72108f"},
+    {file = "SQLAlchemy-1.4.54-cp311-cp311-win32.whl", hash = "sha256:1390ca2d301a2708fd4425c6d75528d22f26b8f5cbc9faba1ddca136671432bc"},
+    {file = "SQLAlchemy-1.4.54-cp311-cp311-win_amd64.whl", hash = "sha256:2b37931eac4b837c45e2522066bda221ac6d80e78922fb77c75eb12e4dbcdee5"},
+    {file = "SQLAlchemy-1.4.54-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:3f01c2629a7d6b30d8afe0326b8c649b74825a0e1ebdcb01e8ffd1c920deb07d"},
+    {file = "SQLAlchemy-1.4.54-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c24dd161c06992ed16c5e528a75878edbaeced5660c3db88c820f1f0d3fe1f4"},
+    {file = "SQLAlchemy-1.4.54-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5e0d47d619c739bdc636bbe007da4519fc953393304a5943e0b5aec96c9877c"},
+    {file = "SQLAlchemy-1.4.54-cp312-cp312-win32.whl", hash = "sha256:12bc0141b245918b80d9d17eca94663dbd3f5266ac77a0be60750f36102bbb0f"},
+    {file = "SQLAlchemy-1.4.54-cp312-cp312-win_amd64.whl", hash = "sha256:f941aaf15f47f316123e1933f9ea91a6efda73a161a6ab6046d1cde37be62c88"},
+    {file = "SQLAlchemy-1.4.54-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:a41611835010ed4ea4c7aed1da5b58aac78ee7e70932a91ed2705a7b38e40f52"},
+    {file = "SQLAlchemy-1.4.54-cp36-cp36m-manylinux1_x86_64.manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_5_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e8c1b9ecaf9f2590337d5622189aeb2f0dbc54ba0232fa0856cf390957584a9"},
+    {file = "SQLAlchemy-1.4.54-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0de620f978ca273ce027769dc8db7e6ee72631796187adc8471b3c76091b809e"},
+    {file = "SQLAlchemy-1.4.54-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c5a2530400a6e7e68fd1552a55515de6a4559122e495f73554a51cedafc11669"},
+    {file = "SQLAlchemy-1.4.54-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d0cf7076c8578b3de4e43a046cc7a1af8466e1c3f5e64167189fe8958a4f9c02"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-macosx_11_0_x86_64.whl", hash = "sha256:f1e1b92ee4ee9ffc68624ace218b89ca5ca667607ccee4541a90cc44999b9aea"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-manylinux1_x86_64.manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_5_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41cffc63c7c83dfc30c4cab5b4308ba74440a9633c4509c51a0c52431fb0f8ab"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b5933c45d11cbd9694b1540aa9076816cc7406964c7b16a380fd84d3a5fe3241"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cafe0ba3a96d0845121433cffa2b9232844a2609fce694fcc02f3f31214ece28"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a19f816f4702d7b1951d7576026c7124b9bfb64a9543e571774cf517b7a50b29"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-win32.whl", hash = "sha256:76c2ba7b5a09863d0a8166fbc753af96d561818c572dbaf697c52095938e7be4"},
+    {file = "SQLAlchemy-1.4.54-cp37-cp37m-win_amd64.whl", hash = "sha256:a86b0e4be775902a5496af4fb1b60d8a2a457d78f531458d294360b8637bb014"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:a49730afb716f3f675755afec109895cab95bc9875db7ffe2e42c1b1c6279482"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-manylinux1_x86_64.manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_5_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26e78444bc77d089e62874dc74df05a5c71f01ac598010a327881a48408d0064"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:02d2ecb9508f16ab9c5af466dfe5a88e26adf2e1a8d1c56eb616396ccae2c186"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:394b0135900b62dbf63e4809cdc8ac923182af2816d06ea61cd6763943c2cc05"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ed3576675c187e3baa80b02c4c9d0edfab78eff4e89dd9da736b921333a2432"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-win32.whl", hash = "sha256:fc9ffd9a38e21fad3e8c5a88926d57f94a32546e937e0be46142b2702003eba7"},
+    {file = "SQLAlchemy-1.4.54-cp38-cp38-win_amd64.whl", hash = "sha256:a01bc25eb7a5688656c8770f931d5cb4a44c7de1b3cec69b84cc9745d1e4cc10"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-macosx_12_0_x86_64.whl", hash = "sha256:0b76bbb1cbae618d10679be8966f6d66c94f301cfc15cb49e2f2382563fb6efb"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-manylinux1_x86_64.manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_5_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb2886c0be2c6c54d0651d5a61c29ef347e8eec81fd83afebbf7b59b80b7393"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:954816850777ac234a4e32b8c88ac1f7847088a6e90cfb8f0e127a1bf3feddff"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1d83cd1cc03c22d922ec94d0d5f7b7c96b1332f5e122e81b1a61fb22da77879a"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1576fba3616f79496e2f067262200dbf4aab1bb727cd7e4e006076686413c80c"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-win32.whl", hash = "sha256:3112de9e11ff1957148c6de1df2bc5cc1440ee36783412e5eedc6f53638a577d"},
+    {file = "SQLAlchemy-1.4.54-cp39-cp39-win_amd64.whl", hash = "sha256:6da60fb24577f989535b8fc8b2ddc4212204aaf02e53c4c7ac94ac364150ed08"},
+    {file = "sqlalchemy-1.4.54.tar.gz", hash = "sha256:4470fbed088c35dc20b78a39aaf4ae54fe81790c783b3264872a0224f437c31a"},
 ]
 
 [package.dependencies]
@@ -1619,17 +1641,17 @@ aiomysql = ["aiomysql (>=0.2.0)", "greenlet (!=0.4.17)"]
 aiosqlite = ["aiosqlite", "greenlet (!=0.4.17)", "typing_extensions (!=3.10.0.1)"]
 asyncio = ["greenlet (!=0.4.17)"]
 asyncmy = ["asyncmy (>=0.2.3,!=0.2.4)", "greenlet (!=0.4.17)"]
-mariadb-connector = ["mariadb (>=1.0.1,!=1.1.2)"]
+mariadb-connector = ["mariadb (>=1.0.1,!=1.1.2)", "mariadb (>=1.0.1,!=1.1.2)"]
 mssql = ["pyodbc"]
-mssql-pymssql = ["pymssql"]
-mssql-pyodbc = ["pyodbc"]
+mssql-pymssql = ["pymssql", "pymssql"]
+mssql-pyodbc = ["pyodbc", "pyodbc"]
 mypy = ["mypy (>=0.910)", "sqlalchemy2-stubs"]
 mysql = ["mysqlclient (>=1.4.0)", "mysqlclient (>=1.4.0,<2)"]
-mysql-connector = ["mysql-connector-python"]
+mysql-connector = ["mysql-connector-python", "mysql-connector-python"]
 oracle = ["cx_oracle (>=7)", "cx_oracle (>=7,<8)"]
 postgresql = ["psycopg2 (>=2.7)"]
-postgresql-asyncpg = ["asyncpg", "greenlet (!=0.4.17)"]
-postgresql-pg8000 = ["pg8000 (>=1.16.6,!=1.29.0)"]
+postgresql-asyncpg = ["asyncpg", "asyncpg", "greenlet (!=0.4.17)", "greenlet (!=0.4.17)"]
+postgresql-pg8000 = ["pg8000 (>=1.16.6,!=1.29.0)", "pg8000 (>=1.16.6,!=1.29.0)"]
 postgresql-psycopg2binary = ["psycopg2-binary"]
 postgresql-psycopg2cffi = ["psycopg2cffi"]
 pymysql = ["pymysql", "pymysql (<1)"]
@@ -1671,13 +1693,13 @@ typing = ["mypy (>=1.4)", "rich", "twisted"]
 
 [[package]]
 name = "tomli"
-version = "2.0.1"
+version = "2.0.2"
 description = "A lil' TOML parser"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+    {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"},
+    {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"},
 ]
 
 [[package]]
@@ -1693,13 +1715,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.2"
+version = "2.2.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
-    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
+    {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
+    {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 ]
 
 [package.extras]
@@ -1808,20 +1830,24 @@ files = [
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "b3531a5fc03de63ab645c3f4479781a4d035cf6d47c95f0eadc69fc50c7ba2ed"
+content-hash = "6ef5eca64296674494cf13618836c80be59676974abd9a38182f3a77dff75baf"
diff --git a/bytes/pyproject.toml b/bytes/pyproject.toml
index b0c4fc2f4b0..9bbb81f2cf4 100644
--- a/bytes/pyproject.toml
+++ b/bytes/pyproject.toml
@@ -18,7 +18,6 @@ pynacl = "^1.5.0"
 rfc3161ng = "^2.1.3"
 sqlalchemy = "^1.4.48"
 uvicorn = "^0.29.0"
-asgiref = "^3.8.1"
 
 # OpenTelemetry
 opentelemetry-sdk = "^1.26.0"
@@ -40,6 +39,8 @@ opentelemetry-util-http = "^0.47b0"
 pyjwt = "^2.8.0"
 fastapi-slim = "^0.111.0"
 structlog = "^24.2.0"
+cryptography = "^43.0.1"
+boto3 = "^1.35.15"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.0"
diff --git a/bytes/requirements-dev.txt b/bytes/requirements-dev.txt
index ffda66ff3eb..f881676cc58 100644
--- a/bytes/requirements-dev.txt
+++ b/bytes/requirements-dev.txt
@@ -1,102 +1,123 @@
-alembic==1.13.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:2edcc97bed0bd3272611ce3a98d98279e9c209e7186e43e75bbb1b2bdfdbcc43 \
-    --hash=sha256:4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595
+alembic==1.13.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2 \
+    --hash=sha256:908e905976d15235fae59c9ac42c4c5b75cfcefe3d27c0fbf7ae15a37715d80e
 annotated-types==0.7.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
-anyio==4.3.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \
-    --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6
+anyio==4.6.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb \
+    --hash=sha256:c7d2e9d63e31599eeb636c8c5c03a7e108d73b345f064f1c19fdc87b79036a9a
 asgiref==3.8.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
-bcrypt==4.1.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:02d9ef8915f72dd6daaef40e0baeef8a017ce624369f09754baf32bb32dba25f \
-    --hash=sha256:1c28973decf4e0e69cee78c68e30a523be441972c826703bb93099868a8ff5b5 \
-    --hash=sha256:2a298db2a8ab20056120b45e86c00a0a5eb50ec4075b6142db35f593b97cb3fb \
-    --hash=sha256:33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258 \
-    --hash=sha256:3566a88234e8de2ccae31968127b0ecccbb4cddb629da744165db72b58d88ca4 \
-    --hash=sha256:387e7e1af9a4dd636b9505a465032f2f5cb8e61ba1120e79a0e1cd0b512f3dfc \
-    --hash=sha256:44290ccc827d3a24604f2c8bcd00d0da349e336e6503656cb8192133e27335e2 \
-    --hash=sha256:57fa9442758da926ed33a91644649d3e340a71e2d0a5a8de064fb621fd5a3326 \
-    --hash=sha256:68e3c6642077b0c8092580c819c1684161262b2e30c4f45deb000c38947bf483 \
-    --hash=sha256:69057b9fc5093ea1ab00dd24ede891f3e5e65bee040395fb1e66ee196f9c9b4a \
-    --hash=sha256:6cad43d8c63f34b26aef462b6f5e44fdcf9860b723d2453b5d391258c4c8e966 \
-    --hash=sha256:71b8be82bc46cedd61a9f4ccb6c1a493211d031415a34adde3669ee1b0afbb63 \
-    --hash=sha256:732b3920a08eacf12f93e6b04ea276c489f1c8fb49344f564cca2adb663b3e4c \
-    --hash=sha256:9800ae5bd5077b13725e2e3934aa3c9c37e49d3ea3d06318010aa40f54c63551 \
-    --hash=sha256:a97e07e83e3262599434816f631cc4c7ca2aa8e9c072c1b1a7fec2ae809a1d2d \
-    --hash=sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e \
-    --hash=sha256:b8df79979c5bae07f1db22dcc49cc5bccf08a0380ca5c6f391cbb5790355c0b0 \
-    --hash=sha256:b90e216dc36864ae7132cb151ffe95155a37a14e0de3a8f64b49655dd959ff9c \
-    --hash=sha256:ba4e4cc26610581a6329b3937e02d319f5ad4b85b074846bf4fef8a8cf51e7bb \
-    --hash=sha256:ba55e40de38a24e2d78d34c2d36d6e864f93e0d79d0b6ce915e4335aa81d01b1 \
-    --hash=sha256:be3ab1071662f6065899fe08428e45c16aa36e28bc42921c4901a191fda6ee42 \
-    --hash=sha256:d75fc8cd0ba23f97bae88a6ec04e9e5351ff3c6ad06f38fe32ba50cbd0d11946 \
-    --hash=sha256:e51c42750b7585cee7892c2614be0d14107fad9581d1738d954a262556dd1aab \
-    --hash=sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1 \
-    --hash=sha256:eb3bd3321517916696233b5e0c67fd7d6281f0ef48e66812db35fc963a422a1c \
-    --hash=sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7 \
-    --hash=sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369
-cachetools==5.3.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945 \
-    --hash=sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
-cffi==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
-    --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
-    --hash=sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417 \
-    --hash=sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab \
-    --hash=sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520 \
-    --hash=sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36 \
-    --hash=sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743 \
-    --hash=sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8 \
-    --hash=sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed \
-    --hash=sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684 \
-    --hash=sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56 \
-    --hash=sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324 \
-    --hash=sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d \
-    --hash=sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235 \
-    --hash=sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e \
-    --hash=sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088 \
-    --hash=sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000 \
-    --hash=sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7 \
-    --hash=sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e \
-    --hash=sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673 \
-    --hash=sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c \
-    --hash=sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe \
-    --hash=sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2 \
-    --hash=sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098 \
-    --hash=sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8 \
-    --hash=sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a \
-    --hash=sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0 \
-    --hash=sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b \
-    --hash=sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896 \
-    --hash=sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e \
-    --hash=sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9 \
-    --hash=sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2 \
-    --hash=sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b \
-    --hash=sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6 \
-    --hash=sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404 \
-    --hash=sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f \
-    --hash=sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 \
-    --hash=sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4 \
-    --hash=sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc \
-    --hash=sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936 \
-    --hash=sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba \
-    --hash=sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872 \
-    --hash=sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb \
-    --hash=sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614 \
-    --hash=sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1 \
-    --hash=sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d \
-    --hash=sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969 \
-    --hash=sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b \
-    --hash=sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4 \
-    --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \
-    --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \
-    --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357
+bcrypt==4.2.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:096a15d26ed6ce37a14c1ac1e48119660f21b24cba457f160a4b830f3fe6b5cb \
+    --hash=sha256:0da52759f7f30e83f1e30a888d9163a81353ef224d82dc58eb5bb52efcabc399 \
+    --hash=sha256:1bb429fedbe0249465cdd85a58e8376f31bb315e484f16e68ca4c786dcc04291 \
+    --hash=sha256:1d84cf6d877918620b687b8fd1bf7781d11e8a0998f576c7aa939776b512b98d \
+    --hash=sha256:1ee38e858bf5d0287c39b7a1fc59eec64bbf880c7d504d3a06a96c16e14058e7 \
+    --hash=sha256:1ff39b78a52cf03fdf902635e4c81e544714861ba3f0efc56558979dd4f09170 \
+    --hash=sha256:27fe0f57bb5573104b5a6de5e4153c60814c711b29364c10a75a54bb6d7ff48d \
+    --hash=sha256:3413bd60460f76097ee2e0a493ccebe4a7601918219c02f503984f0a7ee0aebe \
+    --hash=sha256:3698393a1b1f1fd5714524193849d0c6d524d33523acca37cd28f02899285060 \
+    --hash=sha256:373db9abe198e8e2c70d12b479464e0d5092cc122b20ec504097b5f2297ed184 \
+    --hash=sha256:39e1d30c7233cfc54f5c3f2c825156fe044efdd3e0b9d309512cc514a263ec2a \
+    --hash=sha256:3bbbfb2734f0e4f37c5136130405332640a1e46e6b23e000eeff2ba8d005da68 \
+    --hash=sha256:3d3a6d28cb2305b43feac298774b997e372e56c7c7afd90a12b3dc49b189151c \
+    --hash=sha256:5a1e8aa9b28ae28020a3ac4b053117fb51c57a010b9f969603ed885f23841458 \
+    --hash=sha256:61ed14326ee023917ecd093ee6ef422a72f3aec6f07e21ea5f10622b735538a9 \
+    --hash=sha256:655ea221910bcac76ea08aaa76df427ef8625f92e55a8ee44fbf7753dbabb328 \
+    --hash=sha256:762a2c5fb35f89606a9fde5e51392dad0cd1ab7ae64149a8b935fe8d79dd5ed7 \
+    --hash=sha256:77800b7147c9dc905db1cba26abe31e504d8247ac73580b4aa179f98e6608f34 \
+    --hash=sha256:8ac68872c82f1add6a20bd489870c71b00ebacd2e9134a8aa3f98a0052ab4b0e \
+    --hash=sha256:8d7bb9c42801035e61c109c345a28ed7e84426ae4865511eb82e913df18f58c2 \
+    --hash=sha256:8f6ede91359e5df88d1f5c1ef47428a4420136f3ce97763e31b86dd8280fbdf5 \
+    --hash=sha256:9c1c4ad86351339c5f320ca372dfba6cb6beb25e8efc659bedd918d921956bae \
+    --hash=sha256:c02d944ca89d9b1922ceb8a46460dd17df1ba37ab66feac4870f6862a1533c00 \
+    --hash=sha256:c52aac18ea1f4a4f65963ea4f9530c306b56ccd0c6f8c8da0c06976e34a6e841 \
+    --hash=sha256:cb2a8ec2bc07d3553ccebf0746bbf3d19426d1c6d1adbd4fa48925f66af7b9e8 \
+    --hash=sha256:cf69eaf5185fd58f268f805b505ce31f9b9fc2d64b376642164e9244540c1221 \
+    --hash=sha256:f4f4acf526fcd1c34e7ce851147deedd4e26e6402369304220250598b26448db
+boto3==1.35.31 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2e9af74d10d8af7610a8d8468d2914961f116912a024fce17351825260385a52 \
+    --hash=sha256:8c593af260c4ea3eb6f079c09908f94494ca2222aa4e40a7ff490fab1cee8b39
+botocore==1.35.31 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:4cee814875bc78656aef4011d3d6b2231e96f53ea3661ee428201afb579d5c31 \
+    --hash=sha256:f7bfa910cf2cbcc8c2307c1cf7b93495d614c2d699883417893e0a337fe4eb63
+cachetools==5.5.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \
+    --hash=sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
+cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8 \
+    --hash=sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2 \
+    --hash=sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1 \
+    --hash=sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15 \
+    --hash=sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36 \
+    --hash=sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 \
+    --hash=sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8 \
+    --hash=sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36 \
+    --hash=sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17 \
+    --hash=sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf \
+    --hash=sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc \
+    --hash=sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3 \
+    --hash=sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed \
+    --hash=sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702 \
+    --hash=sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1 \
+    --hash=sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8 \
+    --hash=sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903 \
+    --hash=sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6 \
+    --hash=sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d \
+    --hash=sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b \
+    --hash=sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e \
+    --hash=sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be \
+    --hash=sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c \
+    --hash=sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683 \
+    --hash=sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9 \
+    --hash=sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c \
+    --hash=sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8 \
+    --hash=sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1 \
+    --hash=sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4 \
+    --hash=sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655 \
+    --hash=sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67 \
+    --hash=sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595 \
+    --hash=sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0 \
+    --hash=sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65 \
+    --hash=sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41 \
+    --hash=sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6 \
+    --hash=sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401 \
+    --hash=sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6 \
+    --hash=sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3 \
+    --hash=sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16 \
+    --hash=sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93 \
+    --hash=sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e \
+    --hash=sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4 \
+    --hash=sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964 \
+    --hash=sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c \
+    --hash=sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576 \
+    --hash=sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0 \
+    --hash=sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3 \
+    --hash=sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662 \
+    --hash=sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3 \
+    --hash=sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff \
+    --hash=sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5 \
+    --hash=sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd \
+    --hash=sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f \
+    --hash=sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5 \
+    --hash=sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14 \
+    --hash=sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d \
+    --hash=sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9 \
+    --hash=sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7 \
+    --hash=sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382 \
+    --hash=sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a \
+    --hash=sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e \
+    --hash=sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a \
+    --hash=sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4 \
+    --hash=sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99 \
+    --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
+    --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -194,251 +215,200 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and (sys_platform == "win32" or platform_system == "Windows") \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-coverage[toml]==7.6.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:06a737c882bd26d0d6ee7269b20b12f14a8704807a01056c80bb881a4b2ce6ca \
-    --hash=sha256:07e2ca0ad381b91350c0ed49d52699b625aab2b44b65e1b4e02fa9df0e92ad2d \
-    --hash=sha256:0c0420b573964c760df9e9e86d1a9a622d0d27f417e1a949a8a66dd7bcee7bc6 \
-    --hash=sha256:0dbde0f4aa9a16fa4d754356a8f2e36296ff4d83994b2c9d8398aa32f222f989 \
-    --hash=sha256:1125ca0e5fd475cbbba3bb67ae20bd2c23a98fac4e32412883f9bcbaa81c314c \
-    --hash=sha256:13b0a73a0896988f053e4fbb7de6d93388e6dd292b0d87ee51d106f2c11b465b \
-    --hash=sha256:166811d20dfea725e2e4baa71fffd6c968a958577848d2131f39b60043400223 \
-    --hash=sha256:170d444ab405852903b7d04ea9ae9b98f98ab6d7e63e1115e82620807519797f \
-    --hash=sha256:1f4aa8219db826ce6be7099d559f8ec311549bfc4046f7f9fe9b5cea5c581c56 \
-    --hash=sha256:225667980479a17db1048cb2bf8bfb39b8e5be8f164b8f6628b64f78a72cf9d3 \
-    --hash=sha256:260933720fdcd75340e7dbe9060655aff3af1f0c5d20f46b57f262ab6c86a5e8 \
-    --hash=sha256:2bdb062ea438f22d99cba0d7829c2ef0af1d768d1e4a4f528087224c90b132cb \
-    --hash=sha256:2c09f4ce52cb99dd7505cd0fc8e0e37c77b87f46bc9c1eb03fe3bc9991085388 \
-    --hash=sha256:3115a95daa9bdba70aea750db7b96b37259a81a709223c8448fa97727d546fe0 \
-    --hash=sha256:3e0cadcf6733c09154b461f1ca72d5416635e5e4ec4e536192180d34ec160f8a \
-    --hash=sha256:3f1156e3e8f2872197af3840d8ad307a9dd18e615dc64d9ee41696f287c57ad8 \
-    --hash=sha256:4421712dbfc5562150f7554f13dde997a2e932a6b5f352edcce948a815efee6f \
-    --hash=sha256:44df346d5215a8c0e360307d46ffaabe0f5d3502c8a1cefd700b34baf31d411a \
-    --hash=sha256:502753043567491d3ff6d08629270127e0c31d4184c4c8d98f92c26f65019962 \
-    --hash=sha256:547f45fa1a93154bd82050a7f3cddbc1a7a4dd2a9bf5cb7d06f4ae29fe94eaf8 \
-    --hash=sha256:5621a9175cf9d0b0c84c2ef2b12e9f5f5071357c4d2ea6ca1cf01814f45d2391 \
-    --hash=sha256:609b06f178fe8e9f89ef676532760ec0b4deea15e9969bf754b37f7c40326dbc \
-    --hash=sha256:645786266c8f18a931b65bfcefdbf6952dd0dea98feee39bd188607a9d307ed2 \
-    --hash=sha256:6878ef48d4227aace338d88c48738a4258213cd7b74fd9a3d4d7582bb1d8a155 \
-    --hash=sha256:6a89ecca80709d4076b95f89f308544ec8f7b4727e8a547913a35f16717856cb \
-    --hash=sha256:6db04803b6c7291985a761004e9060b2bca08da6d04f26a7f2294b8623a0c1a0 \
-    --hash=sha256:6e2cd258d7d927d09493c8df1ce9174ad01b381d4729a9d8d4e38670ca24774c \
-    --hash=sha256:6e81d7a3e58882450ec4186ca59a3f20a5d4440f25b1cff6f0902ad890e6748a \
-    --hash=sha256:702855feff378050ae4f741045e19a32d57d19f3e0676d589df0575008ea5004 \
-    --hash=sha256:78b260de9790fd81e69401c2dc8b17da47c8038176a79092a89cb2b7d945d060 \
-    --hash=sha256:7bb65125fcbef8d989fa1dd0e8a060999497629ca5b0efbca209588a73356232 \
-    --hash=sha256:7dea0889685db8550f839fa202744652e87c60015029ce3f60e006f8c4462c93 \
-    --hash=sha256:8284cf8c0dd272a247bc154eb6c95548722dce90d098c17a883ed36e67cdb129 \
-    --hash=sha256:877abb17e6339d96bf08e7a622d05095e72b71f8afd8a9fefc82cf30ed944163 \
-    --hash=sha256:8929543a7192c13d177b770008bc4e8119f2e1f881d563fc6b6305d2d0ebe9de \
-    --hash=sha256:8ae539519c4c040c5ffd0632784e21b2f03fc1340752af711f33e5be83a9d6c6 \
-    --hash=sha256:8f59d57baca39b32db42b83b2a7ba6f47ad9c394ec2076b084c3f029b7afca23 \
-    --hash=sha256:9054a0754de38d9dbd01a46621636689124d666bad1936d76c0341f7d71bf569 \
-    --hash=sha256:953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d \
-    --hash=sha256:95cae0efeb032af8458fc27d191f85d1717b1d4e49f7cb226cf526ff28179778 \
-    --hash=sha256:9bc572be474cafb617672c43fe989d6e48d3c83af02ce8de73fff1c6bb3c198d \
-    --hash=sha256:9c56863d44bd1c4fe2abb8a4d6f5371d197f1ac0ebdee542f07f35895fc07f36 \
-    --hash=sha256:9e0b2df163b8ed01d515807af24f63de04bebcecbd6c3bfeff88385789fdf75a \
-    --hash=sha256:a09ece4a69cf399510c8ab25e0950d9cf2b42f7b3cb0374f95d2e2ff594478a6 \
-    --hash=sha256:a1ac0ae2b8bd743b88ed0502544847c3053d7171a3cff9228af618a068ed9c34 \
-    --hash=sha256:a318d68e92e80af8b00fa99609796fdbcdfef3629c77c6283566c6f02c6d6704 \
-    --hash=sha256:a4acd025ecc06185ba2b801f2de85546e0b8ac787cf9d3b06e7e2a69f925b106 \
-    --hash=sha256:a6d3adcf24b624a7b778533480e32434a39ad8fa30c315208f6d3e5542aeb6e9 \
-    --hash=sha256:a78d169acd38300060b28d600344a803628c3fd585c912cacc9ea8790fe96862 \
-    --hash=sha256:a95324a9de9650a729239daea117df21f4b9868ce32e63f8b650ebe6cef5595b \
-    --hash=sha256:abd5fd0db5f4dc9289408aaf34908072f805ff7792632250dcb36dc591d24255 \
-    --hash=sha256:b06079abebbc0e89e6163b8e8f0e16270124c154dc6e4a47b413dd538859af16 \
-    --hash=sha256:b43c03669dc4618ec25270b06ecd3ee4fa94c7f9b3c14bae6571ca00ef98b0d3 \
-    --hash=sha256:b48f312cca9621272ae49008c7f613337c53fadca647d6384cc129d2996d1133 \
-    --hash=sha256:b5d7b556859dd85f3a541db6a4e0167b86e7273e1cdc973e5b175166bb634fdb \
-    --hash=sha256:b9f222de8cded79c49bf184bdbc06630d4c58eec9459b939b4a690c82ed05657 \
-    --hash=sha256:c3c02d12f837d9683e5ab2f3d9844dc57655b92c74e286c262e0fc54213c216d \
-    --hash=sha256:c44fee9975f04b33331cb8eb272827111efc8930cfd582e0320613263ca849ca \
-    --hash=sha256:cf4b19715bccd7ee27b6b120e7e9dd56037b9c0681dcc1adc9ba9db3d417fa36 \
-    --hash=sha256:d0c212c49b6c10e6951362f7c6df3329f04c2b1c28499563d4035d964ab8e08c \
-    --hash=sha256:d3296782ca4eab572a1a4eca686d8bfb00226300dcefdf43faa25b5242ab8a3e \
-    --hash=sha256:d85f5e9a5f8b73e2350097c3756ef7e785f55bd71205defa0bfdaf96c31616ff \
-    --hash=sha256:da511e6ad4f7323ee5702e6633085fb76c2f893aaf8ce4c51a0ba4fc07580ea7 \
-    --hash=sha256:e05882b70b87a18d937ca6768ff33cc3f72847cbc4de4491c8e73880766718e5 \
-    --hash=sha256:e61c0abb4c85b095a784ef23fdd4aede7a2628478e7baba7c5e3deba61070a02 \
-    --hash=sha256:e6a08c0be454c3b3beb105c0596ebdc2371fab6bb90c0c0297f4e58fd7e1012c \
-    --hash=sha256:e9a6e0eb86070e8ccaedfbd9d38fec54864f3125ab95419970575b42af7541df \
-    --hash=sha256:ed37bd3c3b063412f7620464a9ac1314d33100329f39799255fb8d3027da50d3 \
-    --hash=sha256:f1adfc8ac319e1a348af294106bc6a8458a0f1633cc62a1446aebc30c5fa186a \
-    --hash=sha256:f5796e664fe802da4f57a168c85359a8fbf3eab5e55cd4e4569fbacecc903959 \
-    --hash=sha256:fc5a77d0c516700ebad189b587de289a20a78324bc54baee03dd486f0855d234 \
-    --hash=sha256:fd21f6ae3f08b41004dfb433fa895d858f3f5979e7762d052b12aef444e29afc
-cryptography==42.0.8 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad \
-    --hash=sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583 \
-    --hash=sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b \
-    --hash=sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c \
-    --hash=sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1 \
-    --hash=sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648 \
-    --hash=sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949 \
-    --hash=sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba \
-    --hash=sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c \
-    --hash=sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9 \
-    --hash=sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d \
-    --hash=sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c \
-    --hash=sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e \
-    --hash=sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2 \
-    --hash=sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d \
-    --hash=sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7 \
-    --hash=sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70 \
-    --hash=sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2 \
-    --hash=sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7 \
-    --hash=sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14 \
-    --hash=sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe \
-    --hash=sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e \
-    --hash=sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71 \
-    --hash=sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961 \
-    --hash=sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7 \
-    --hash=sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c \
-    --hash=sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28 \
-    --hash=sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842 \
-    --hash=sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902 \
-    --hash=sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801 \
-    --hash=sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a \
-    --hash=sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e
+cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
+    --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \
+    --hash=sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d \
+    --hash=sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062 \
+    --hash=sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2 \
+    --hash=sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4 \
+    --hash=sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1 \
+    --hash=sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85 \
+    --hash=sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84 \
+    --hash=sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042 \
+    --hash=sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d \
+    --hash=sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962 \
+    --hash=sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2 \
+    --hash=sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa \
+    --hash=sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d \
+    --hash=sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365 \
+    --hash=sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96 \
+    --hash=sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47 \
+    --hash=sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d \
+    --hash=sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d \
+    --hash=sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c \
+    --hash=sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb \
+    --hash=sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277 \
+    --hash=sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172 \
+    --hash=sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034 \
+    --hash=sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a \
+    --hash=sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289
 deprecated==1.2.14 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c \
     --hash=sha256:e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3
-exceptiongroup==1.2.0 ; python_version >= "3.10" and python_version < "3.11" \
-    --hash=sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14 \
-    --hash=sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68
+exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11" \
+    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
+    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
 fastapi-slim==0.111.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:ac29948dcbf84cc78d68ed2c4df4e695ac265cf53c339e5794008476e9befbbb \
     --hash=sha256:f799a60658f56c49fe3842eb534730fabe1168731c0b407b98a042c8d57be39d
-googleapis-common-protos==1.62.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07 \
-    --hash=sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277
-greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" \
-    --hash=sha256:01bc7ea167cf943b4c802068e178bbf70ae2e8c080467070d01bfa02f337ee67 \
-    --hash=sha256:0448abc479fab28b00cb472d278828b3ccca164531daab4e970a0458786055d6 \
-    --hash=sha256:086152f8fbc5955df88382e8a75984e2bb1c892ad2e3c80a2508954e52295257 \
-    --hash=sha256:098d86f528c855ead3479afe84b49242e174ed262456c342d70fc7f972bc13c4 \
-    --hash=sha256:149e94a2dd82d19838fe4b2259f1b6b9957d5ba1b25640d2380bea9c5df37676 \
-    --hash=sha256:1551a8195c0d4a68fac7a4325efac0d541b48def35feb49d803674ac32582f61 \
-    --hash=sha256:15d79dd26056573940fcb8c7413d84118086f2ec1a8acdfa854631084393efcc \
-    --hash=sha256:1996cb9306c8595335bb157d133daf5cf9f693ef413e7673cb07e3e5871379ca \
-    --hash=sha256:1a7191e42732df52cb5f39d3527217e7ab73cae2cb3694d241e18f53d84ea9a7 \
-    --hash=sha256:1ea188d4f49089fc6fb283845ab18a2518d279c7cd9da1065d7a84e991748728 \
-    --hash=sha256:1f672519db1796ca0d8753f9e78ec02355e862d0998193038c7073045899f305 \
-    --hash=sha256:2516a9957eed41dd8f1ec0c604f1cdc86758b587d964668b5b196a9db5bfcde6 \
-    --hash=sha256:2797aa5aedac23af156bbb5a6aa2cd3427ada2972c828244eb7d1b9255846379 \
-    --hash=sha256:2dd6e660effd852586b6a8478a1d244b8dc90ab5b1321751d2ea15deb49ed414 \
-    --hash=sha256:3ddc0f794e6ad661e321caa8d2f0a55ce01213c74722587256fb6566049a8b04 \
-    --hash=sha256:3ed7fb269f15dc662787f4119ec300ad0702fa1b19d2135a37c2c4de6fadfd4a \
-    --hash=sha256:419b386f84949bf0e7c73e6032e3457b82a787c1ab4a0e43732898a761cc9dbf \
-    --hash=sha256:43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 \
-    --hash=sha256:52f59dd9c96ad2fc0d5724107444f76eb20aaccb675bf825df6435acb7703559 \
-    --hash=sha256:57e8974f23e47dac22b83436bdcf23080ade568ce77df33159e019d161ce1d1e \
-    --hash=sha256:5b51e85cb5ceda94e79d019ed36b35386e8c37d22f07d6a751cb659b180d5274 \
-    --hash=sha256:649dde7de1a5eceb258f9cb00bdf50e978c9db1b996964cd80703614c86495eb \
-    --hash=sha256:64d7675ad83578e3fc149b617a444fab8efdafc9385471f868eb5ff83e446b8b \
-    --hash=sha256:68834da854554926fbedd38c76e60c4a2e3198c6fbed520b106a8986445caaf9 \
-    --hash=sha256:6b66c9c1e7ccabad3a7d037b2bcb740122a7b17a53734b7d72a344ce39882a1b \
-    --hash=sha256:70fb482fdf2c707765ab5f0b6655e9cfcf3780d8d87355a063547b41177599be \
-    --hash=sha256:7170375bcc99f1a2fbd9c306f5be8764eaf3ac6b5cb968862cad4c7057756506 \
-    --hash=sha256:73a411ef564e0e097dbe7e866bb2dda0f027e072b04da387282b02c308807405 \
-    --hash=sha256:77457465d89b8263bca14759d7c1684df840b6811b2499838cc5b040a8b5b113 \
-    --hash=sha256:7f362975f2d179f9e26928c5b517524e89dd48530a0202570d55ad6ca5d8a56f \
-    --hash=sha256:81bb9c6d52e8321f09c3d165b2a78c680506d9af285bfccbad9fb7ad5a5da3e5 \
-    --hash=sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230 \
-    --hash=sha256:894393ce10ceac937e56ec00bb71c4c2f8209ad516e96033e4b3b1de270e200d \
-    --hash=sha256:99bf650dc5d69546e076f413a87481ee1d2d09aaaaaca058c9251b6d8c14783f \
-    --hash=sha256:9da2bd29ed9e4f15955dd1595ad7bc9320308a3b766ef7f837e23ad4b4aac31a \
-    --hash=sha256:afaff6cf5200befd5cec055b07d1c0a5a06c040fe5ad148abcd11ba6ab9b114e \
-    --hash=sha256:b1b5667cced97081bf57b8fa1d6bfca67814b0afd38208d52538316e9422fc61 \
-    --hash=sha256:b37eef18ea55f2ffd8f00ff8fe7c8d3818abd3e25fb73fae2ca3b672e333a7a6 \
-    --hash=sha256:b542be2440edc2d48547b5923c408cbe0fc94afb9f18741faa6ae970dbcb9b6d \
-    --hash=sha256:b7dcbe92cc99f08c8dd11f930de4d99ef756c3591a5377d1d9cd7dd5e896da71 \
-    --hash=sha256:b7f009caad047246ed379e1c4dbcb8b020f0a390667ea74d2387be2998f58a22 \
-    --hash=sha256:bba5387a6975598857d86de9eac14210a49d554a77eb8261cc68b7d082f78ce2 \
-    --hash=sha256:c5e1536de2aad7bf62e27baf79225d0d64360d4168cf2e6becb91baf1ed074f3 \
-    --hash=sha256:c5ee858cfe08f34712f548c3c363e807e7186f03ad7a5039ebadb29e8c6be067 \
-    --hash=sha256:c9db1c18f0eaad2f804728c67d6c610778456e3e1cc4ab4bbd5eeb8e6053c6fc \
-    --hash=sha256:d353cadd6083fdb056bb46ed07e4340b0869c305c8ca54ef9da3421acbdf6881 \
-    --hash=sha256:d46677c85c5ba00a9cb6f7a00b2bfa6f812192d2c9f7d9c4f6a55b60216712f3 \
-    --hash=sha256:d4d1ac74f5c0c0524e4a24335350edad7e5f03b9532da7ea4d3c54d527784f2e \
-    --hash=sha256:d73a9fe764d77f87f8ec26a0c85144d6a951a6c438dfe50487df5595c6373eac \
-    --hash=sha256:da70d4d51c8b306bb7a031d5cff6cc25ad253affe89b70352af5f1cb68e74b53 \
-    --hash=sha256:daf3cb43b7cf2ba96d614252ce1684c1bccee6b2183a01328c98d36fcd7d5cb0 \
-    --hash=sha256:dca1e2f3ca00b84a396bc1bce13dd21f680f035314d2379c4160c98153b2059b \
-    --hash=sha256:dd4f49ae60e10adbc94b45c0b5e6a179acc1736cf7a90160b404076ee283cf83 \
-    --hash=sha256:e1f145462f1fa6e4a4ae3c0f782e580ce44d57c8f2c7aae1b6fa88c0b2efdb41 \
-    --hash=sha256:e3391d1e16e2a5a1507d83e4a8b100f4ee626e8eca43cf2cadb543de69827c4c \
-    --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
-    --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
-    --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+googleapis-common-protos==1.65.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2972e6c496f435b92590fd54045060867f3fe9be2c82ab148fc8885035479a63 \
+    --hash=sha256:334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0
+greenlet==3.1.1 ; python_version >= "3.10" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" \
+    --hash=sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e \
+    --hash=sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7 \
+    --hash=sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01 \
+    --hash=sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1 \
+    --hash=sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159 \
+    --hash=sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563 \
+    --hash=sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83 \
+    --hash=sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9 \
+    --hash=sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395 \
+    --hash=sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa \
+    --hash=sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942 \
+    --hash=sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1 \
+    --hash=sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441 \
+    --hash=sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22 \
+    --hash=sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9 \
+    --hash=sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0 \
+    --hash=sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba \
+    --hash=sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3 \
+    --hash=sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1 \
+    --hash=sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6 \
+    --hash=sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291 \
+    --hash=sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39 \
+    --hash=sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d \
+    --hash=sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 \
+    --hash=sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475 \
+    --hash=sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef \
+    --hash=sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c \
+    --hash=sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511 \
+    --hash=sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c \
+    --hash=sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822 \
+    --hash=sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a \
+    --hash=sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8 \
+    --hash=sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d \
+    --hash=sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01 \
+    --hash=sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145 \
+    --hash=sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80 \
+    --hash=sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13 \
+    --hash=sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e \
+    --hash=sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b \
+    --hash=sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1 \
+    --hash=sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef \
+    --hash=sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc \
+    --hash=sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff \
+    --hash=sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120 \
+    --hash=sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437 \
+    --hash=sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd \
+    --hash=sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981 \
+    --hash=sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36 \
+    --hash=sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a \
+    --hash=sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798 \
+    --hash=sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7 \
+    --hash=sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761 \
+    --hash=sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0 \
+    --hash=sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e \
+    --hash=sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af \
+    --hash=sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa \
+    --hash=sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c \
+    --hash=sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42 \
+    --hash=sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e \
+    --hash=sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81 \
+    --hash=sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e \
+    --hash=sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617 \
+    --hash=sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc \
+    --hash=sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de \
+    --hash=sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111 \
+    --hash=sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383 \
+    --hash=sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70 \
+    --hash=sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6 \
+    --hash=sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4 \
+    --hash=sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011 \
+    --hash=sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803 \
+    --hash=sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79 \
+    --hash=sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f
+grpcio==1.66.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02697eb4a5cbe5a9639f57323b4c37bcb3ab2d48cec5da3dc2f13334d72790dd \
+    --hash=sha256:03b0b307ba26fae695e067b94cbb014e27390f8bc5ac7a3a39b7723fed085604 \
+    --hash=sha256:05bc2ceadc2529ab0b227b1310d249d95d9001cd106aa4d31e8871ad3c428d73 \
+    --hash=sha256:06de8ec0bd71be123eec15b0e0d457474931c2c407869b6c349bd9bed4adbac3 \
+    --hash=sha256:0be4e0490c28da5377283861bed2941d1d20ec017ca397a5df4394d1c31a9b50 \
+    --hash=sha256:12fda97ffae55e6526825daf25ad0fa37483685952b5d0f910d6405c87e3adb6 \
+    --hash=sha256:1caa38fb22a8578ab8393da99d4b8641e3a80abc8fd52646f1ecc92bcb8dee34 \
+    --hash=sha256:2018b053aa15782db2541ca01a7edb56a0bf18c77efed975392583725974b249 \
+    --hash=sha256:20657d6b8cfed7db5e11b62ff7dfe2e12064ea78e93f1434d61888834bc86d75 \
+    --hash=sha256:2335c58560a9e92ac58ff2bc5649952f9b37d0735608242973c7a8b94a6437d8 \
+    --hash=sha256:31fd163105464797a72d901a06472860845ac157389e10f12631025b3e4d0453 \
+    --hash=sha256:38b68498ff579a3b1ee8f93a05eb48dc2595795f2f62716e797dc24774c1aaa8 \
+    --hash=sha256:3b00efc473b20d8bf83e0e1ae661b98951ca56111feb9b9611df8efc4fe5d55d \
+    --hash=sha256:3ed71e81782966ffead60268bbda31ea3f725ebf8aa73634d5dda44f2cf3fb9c \
+    --hash=sha256:45a3d462826f4868b442a6b8fdbe8b87b45eb4f5b5308168c156b21eca43f61c \
+    --hash=sha256:49f0ca7ae850f59f828a723a9064cadbed90f1ece179d375966546499b8a2c9c \
+    --hash=sha256:4e504572433f4e72b12394977679161d495c4c9581ba34a88d843eaf0f2fbd39 \
+    --hash=sha256:4ea1d062c9230278793820146c95d038dc0f468cbdd172eec3363e42ff1c7d01 \
+    --hash=sha256:563588c587b75c34b928bc428548e5b00ea38c46972181a4d8b75ba7e3f24231 \
+    --hash=sha256:6001e575b8bbd89eee11960bb640b6da6ae110cf08113a075f1e2051cc596cae \
+    --hash=sha256:66a0cd8ba6512b401d7ed46bb03f4ee455839957f28b8d61e7708056a806ba6a \
+    --hash=sha256:6851de821249340bdb100df5eacfecfc4e6075fa85c6df7ee0eb213170ec8e5d \
+    --hash=sha256:728bdf36a186e7f51da73be7f8d09457a03061be848718d0edf000e709418987 \
+    --hash=sha256:73e3b425c1e155730273f73e419de3074aa5c5e936771ee0e4af0814631fb30a \
+    --hash=sha256:73fc8f8b9b5c4a03e802b3cd0c18b2b06b410d3c1dcbef989fdeb943bd44aff7 \
+    --hash=sha256:78fa51ebc2d9242c0fc5db0feecc57a9943303b46664ad89921f5079e2e4ada7 \
+    --hash=sha256:7b2c86457145ce14c38e5bf6bdc19ef88e66c5fee2c3d83285c5aef026ba93b3 \
+    --hash=sha256:7d69ce1f324dc2d71e40c9261d3fdbe7d4c9d60f332069ff9b2a4d8a257c7b2b \
+    --hash=sha256:802d84fd3d50614170649853d121baaaa305de7b65b3e01759247e768d691ddf \
+    --hash=sha256:80fd702ba7e432994df208f27514280b4b5c6843e12a48759c9255679ad38db8 \
+    --hash=sha256:8ac475e8da31484efa25abb774674d837b343afb78bb3bcdef10f81a93e3d6bf \
+    --hash=sha256:950da58d7d80abd0ea68757769c9db0a95b31163e53e5bb60438d263f4bed7b7 \
+    --hash=sha256:99a641995a6bc4287a6315989ee591ff58507aa1cbe4c2e70d88411c4dcc0839 \
+    --hash=sha256:9c3a99c519f4638e700e9e3f83952e27e2ea10873eecd7935823dab0c1c9250e \
+    --hash=sha256:9c509a4f78114cbc5f0740eb3d7a74985fd2eff022971bc9bc31f8bc93e66a3b \
+    --hash=sha256:a18e20d8321c6400185b4263e27982488cb5cdd62da69147087a76a24ef4e7e3 \
+    --hash=sha256:a917d26e0fe980b0ac7bfcc1a3c4ad6a9a4612c911d33efb55ed7833c749b0ee \
+    --hash=sha256:a9539f01cb04950fd4b5ab458e64a15f84c2acc273670072abe49a3f29bbad54 \
+    --hash=sha256:ad2efdbe90c73b0434cbe64ed372e12414ad03c06262279b104a029d1889d13e \
+    --hash=sha256:b672abf90a964bfde2d0ecbce30f2329a47498ba75ce6f4da35a2f4532b7acbc \
+    --hash=sha256:bbd27c24a4cc5e195a7f56cfd9312e366d5d61b86e36d46bbe538457ea6eb8dd \
+    --hash=sha256:c400ba5675b67025c8a9f48aa846f12a39cf0c44df5cd060e23fda5b30e9359d \
+    --hash=sha256:c408f5ef75cfffa113cacd8b0c0e3611cbfd47701ca3cdc090594109b9fcbaed \
+    --hash=sha256:c806852deaedee9ce8280fe98955c9103f62912a5b2d5ee7e3eaa284a6d8d8e7 \
+    --hash=sha256:ce89f5876662f146d4c1f695dda29d4433a5d01c8681fbd2539afff535da14d4 \
+    --hash=sha256:d25a14af966438cddf498b2e338f88d1c9706f3493b1d73b93f695c99c5f0e2a \
+    --hash=sha256:d8d4732cc5052e92cea2f78b233c2e2a52998ac40cd651f40e398893ad0d06ec \
+    --hash=sha256:d9a9724a156c8ec6a379869b23ba3323b7ea3600851c91489b871e375f710bc8 \
+    --hash=sha256:e636ce23273683b00410f1971d209bf3689238cf5538d960adc3cdfe80dd0dbd \
+    --hash=sha256:e88264caad6d8d00e7913996030bac8ad5f26b7411495848cc218bd3a9040b6c \
+    --hash=sha256:f145cc21836c332c67baa6fc81099d1d27e266401565bf481948010d6ea32d46 \
+    --hash=sha256:fb57870449dfcfac428afbb5a877829fcb0d6db9d9baa1148705739e9083880e \
+    --hash=sha256:fb70487c95786e345af5e854ffec8cb8cc781bcc5df7930c4fbb7feaa72e1cdf \
+    --hash=sha256:fe96281713168a3270878255983d2cb1a97e034325c8c2c25169a69289d3ecfa \
+    --hash=sha256:ff1f7882e56c40b0d33c4922c15dfa30612f05fb785074a012f7cda74d1c3679
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
-httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
-    --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
-idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
-    --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
-importlib-metadata==6.11.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:1231cf92d825c9e03cfc4da076a16de6422c863558229ea0b22b675657463443 \
-    --hash=sha256:f0afba6205ad8f8947c7d338b5342d5db2afbfd82f9cbef7879a9539cc12eb9b
+httpcore==1.0.6 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:27b59625743b85577a8c0e10e55b50b5368a4f2cfe8cc7bcfa9cf00829c2682f \
+    --hash=sha256:73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
+idna==3.10 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
+    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+importlib-metadata==8.0.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f \
+    --hash=sha256:188bd24e4c346d3f0a933f275c2fec67050326a856b9a359881d7c2a697e8812
 iniconfig==2.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3 \
     --hash=sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374
-mako==1.3.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e \
-    --hash=sha256:32a99d70754dfce237019d17ffe4a282d2d3351b9c476e90d8a60e63f133b80c
+jmespath==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
+    --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
+mako==1.3.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a \
+    --hash=sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc
 markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \
     --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \
@@ -539,9 +509,9 @@ opentelemetry-semantic-conventions==0.47b0 ; python_version >= "3.10" and python
 opentelemetry-util-http==0.47b0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:352a07664c18eef827eb8ddcbd64c64a7284a39dd1655e2f16f577eb046ccb32 \
     --hash=sha256:3d3215e09c4a723b12da6d0233a31395aeb2bb33a64d7b15a1500690ba250f19
-packaging==23.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5 \
-    --hash=sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7
+packaging==24.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
+    --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
 passlib[bcrypt]==1.7.4 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:aa6bca462b8d8bda89c70b382f0c298a20b5560af6cbfa2dce410c0a2fb669f1 \
     --hash=sha256:defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04
@@ -554,18 +524,18 @@ pluggy==1.5.0 ; python_version >= "3.10" and python_version < "4.0" \
 prometheus-client==0.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0836af6eb2c8f4fed712b2f279f6c0a8bbab29f9f4aa15276b91c7cb0d1616ab \
     --hash=sha256:a03e35b359f14dd1630898543e2120addfdeacd1a6069c1367ae90fd93ad3f48
-protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:19b270aeaa0099f16d3ca02628546b8baefe2955bbe23224aaf856134eccf1e4 \
-    --hash=sha256:209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8 \
-    --hash=sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c \
-    --hash=sha256:7c8daa26095f82482307bc717364e7c13f4f1c99659be82890dcfc215194554d \
-    --hash=sha256:c053062984e61144385022e53678fbded7aea14ebb3e0305ae3592fb219ccfa4 \
-    --hash=sha256:d4198877797a83cbfe9bffa3803602bbe1625dc30d8a097365dbc762e5790faa \
-    --hash=sha256:e3c97a1555fd6388f857770ff8b9703083de6bf1f9274a002a332d65fbb56c8c \
-    --hash=sha256:e7cb0ae90dd83727f0c0718634ed56837bfeeee29a5f82a7514c03ee1364c019 \
-    --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
-    --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
-    --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
+protobuf==4.25.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0aebecb809cae990f8129ada5ca273d9d670b76d9bfc9b1809f0a9c02b7dbf41 \
+    --hash=sha256:4be0571adcbe712b282a330c6e89eae24281344429ae95c6d85e79e84780f5ea \
+    --hash=sha256:5e61fd921603f58d2f5acb2806a929b4675f8874ff5f330b7d6f7e2e784bbcd8 \
+    --hash=sha256:7a183f592dc80aa7c8da7ad9e55091c4ffc9497b3054452d629bb85fa27c2a45 \
+    --hash=sha256:7f8249476b4a9473645db7f8ab42b02fe1488cbe5fb72fddd445e0665afd8584 \
+    --hash=sha256:919ad92d9b0310070f8356c24b855c98df2b8bd207ebc1c0c6fcc9ab1e007f3d \
+    --hash=sha256:98d8d8aa50de6a2747efd9cceba361c9034050ecce3e09136f90de37ddba66e1 \
+    --hash=sha256:abe32aad8561aa7cc94fc7ba4fdef646e576983edb94a73381b03c53728a626f \
+    --hash=sha256:b0234dd5a03049e4ddd94b93400b67803c823cfc405689688f59b34e0742381a \
+    --hash=sha256:b2fde3d805354df675ea4c7c6338c1aecd254dfc9925e88c6d31a2bcb97eb173 \
+    --hash=sha256:fe14e16c22be926d3abfcb500e60cab068baf10b542b8c858fa27e098123e331
 psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981 \
     --hash=sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516 \
@@ -580,114 +550,112 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024 \
     --hash=sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913 \
     --hash=sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c
-pyasn1-modules==0.3.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \
-    --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d
-pyasn1==0.5.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:4439847c58d40b1d0a573d07e3856e95333f1976294494c325775aeca506eb58 \
-    --hash=sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c
-pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
-    --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
-pyjwt==2.8.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \
-    --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320
+pyasn1-modules==0.4.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c
+pyasn1==0.6.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034
+pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
+    --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
+pyjwt==2.9.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850 \
+    --hash=sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c
 pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858 \
     --hash=sha256:0c84947a22519e013607c9be43706dd42513f9e6ae5d39d3613ca1e142fba44d \
@@ -699,18 +667,15 @@ pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394 \
     --hash=sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b \
     --hash=sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543
-pytest-cov==5.0.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652 \
-    --hash=sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857
-pytest-env==1.1.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:aada77e6d09fcfb04540a6e462c58533c37df35fa853da78707b17ec04d17dfc \
-    --hash=sha256:fcd7dc23bb71efd3d35632bde1bbe5ee8c8dc4489d6617fb010674880d96216b
-pytest==8.2.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5046e5b46d8e4cac199c373041f26be56fdb81eb4e67dc11d4e10811fc3408fd \
-    --hash=sha256:faccc5d332b8c3719f40283d0d44aa5cf101cec36f88cde9ed8f2bc0538612b1
-python-dateutil==2.9.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709 \
-    --hash=sha256:cbf2f1da5e6083ac2fbfd4da39a25f34312230110440f424a14c7558bb85d82e
+pytest-env==1.1.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf \
+    --hash=sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30
+pytest==8.3.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:70b98107bd648308a7952b06e6ca9a50bc660be218d53c257cc1fc94fda10181 \
+    --hash=sha256:a6853c7375b2663155079443d2e45de913a911a11d669df02a50814944db57b2
+python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
+    --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
 python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \
     --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a
@@ -723,56 +688,78 @@ requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0" \
 rfc3161ng==2.1.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1e88614da61b22abd591577f9dd39d3a030335f9e8a12d8bc001149c17d0a01e \
     --hash=sha256:81fe7e4488f523c758b1206bf5e72ba2066b78f2812107b1b7bb16a7596e524b
-setuptools==71.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d \
-    --hash=sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207
+s3transfer==0.10.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6 \
+    --hash=sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69
+setuptools==75.1.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2 \
+    --hash=sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538
 six==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
 sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \
     --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc
-sqlalchemy==1.4.51 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0535d5b57d014d06ceeaeffd816bb3a6e2dddeb670222570b8c4953e2d2ea678 \
-    --hash=sha256:0892e7ac8bc76da499ad3ee8de8da4d7905a3110b952e2a35a940dab1ffa550e \
-    --hash=sha256:0d661cff58c91726c601cc0ee626bf167b20cc4d7941c93c5f3ac28dc34ddbea \
-    --hash=sha256:245c67c88e63f1523e9216cad6ba3107dea2d3ee19adc359597a628afcabfbcb \
-    --hash=sha256:2ad16880ccd971ac8e570550fbdef1385e094b022d6fc85ef3ce7df400dddad3 \
-    --hash=sha256:2be4e6294c53f2ec8ea36486b56390e3bcaa052bf3a9a47005687ccf376745d1 \
-    --hash=sha256:2c55040d8ea65414de7c47f1a23823cd9f3fad0dc93e6b6b728fee81230f817b \
-    --hash=sha256:352df882088a55293f621328ec33b6ffca936ad7f23013b22520542e1ab6ad1b \
-    --hash=sha256:3823dda635988e6744d4417e13f2e2b5fe76c4bf29dd67e95f98717e1b094cad \
-    --hash=sha256:38ef80328e3fee2be0a1abe3fe9445d3a2e52a1282ba342d0dab6edf1fef4707 \
-    --hash=sha256:3ec7a0ed9b32afdf337172678a4a0e6419775ba4e649b66f49415615fa47efbd \
-    --hash=sha256:55e699466106d09f028ab78d3c2e1f621b5ef2c8694598242259e4515715da7c \
-    --hash=sha256:6cacc0b2dd7d22a918a9642fc89840a5d3cee18a0e1fe41080b1141b23b10916 \
-    --hash=sha256:7deeae5071930abb3669b5185abb6c33ddfd2398f87660fafdb9e6a5fb0f3f2f \
-    --hash=sha256:86a22143a4001f53bf58027b044da1fb10d67b62a785fc1390b5c7f089d9838c \
-    --hash=sha256:8ca484ca11c65e05639ffe80f20d45e6be81fbec7683d6c9a15cd421e6e8b340 \
-    --hash=sha256:af55cc207865d641a57f7044e98b08b09220da3d1b13a46f26487cc2f898a072 \
-    --hash=sha256:b97fd5bb6b7c1a64b7ac0632f7ce389b8ab362e7bd5f60654c2a418496be5d7f \
-    --hash=sha256:c37bc677690fd33932182b85d37433845de612962ed080c3e4d92f758d1bd894 \
-    --hash=sha256:d3cf56cc36d42908495760b223ca9c2c0f9f0002b4eddc994b24db5fcb86a9e4 \
-    --hash=sha256:e646b19f47d655261b22df9976e572f588185279970efba3d45c377127d35349 \
-    --hash=sha256:e7908c2025eb18394e32d65dd02d2e37e17d733cdbe7d78231c2b6d7eb20cdb9 \
-    --hash=sha256:e8f2df79a46e130235bc5e1bbef4de0583fb19d481eaa0bffa76e8347ea45ec6 \
-    --hash=sha256:eb18549b770351b54e1ab5da37d22bc530b8bfe2ee31e22b9ebe650640d2ef12 \
-    --hash=sha256:f8cafa6f885a0ff5e39efa9325195217bb47d5929ab0051636610d24aef45ade
+sqlalchemy==1.4.54 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02d2ecb9508f16ab9c5af466dfe5a88e26adf2e1a8d1c56eb616396ccae2c186 \
+    --hash=sha256:0b76bbb1cbae618d10679be8966f6d66c94f301cfc15cb49e2f2382563fb6efb \
+    --hash=sha256:0de620f978ca273ce027769dc8db7e6ee72631796187adc8471b3c76091b809e \
+    --hash=sha256:1183599e25fa38a1a322294b949da02b4f0da13dbc2688ef9dbe746df573f8a6 \
+    --hash=sha256:12bc0141b245918b80d9d17eca94663dbd3f5266ac77a0be60750f36102bbb0f \
+    --hash=sha256:1390ca2d301a2708fd4425c6d75528d22f26b8f5cbc9faba1ddca136671432bc \
+    --hash=sha256:13e91d6892b5fcb94a36ba061fb7a1f03d0185ed9d8a77c84ba389e5bb05e936 \
+    --hash=sha256:14b3f4783275339170984cadda66e3ec011cce87b405968dc8d51cf0f9997b0d \
+    --hash=sha256:1576fba3616f79496e2f067262200dbf4aab1bb727cd7e4e006076686413c80c \
+    --hash=sha256:1990d5a6a5dc358a0894c8ca02043fb9a5ad9538422001fb2826e91c50f1d539 \
+    --hash=sha256:1d83cd1cc03c22d922ec94d0d5f7b7c96b1332f5e122e81b1a61fb22da77879a \
+    --hash=sha256:1e8c1b9ecaf9f2590337d5622189aeb2f0dbc54ba0232fa0856cf390957584a9 \
+    --hash=sha256:26e78444bc77d089e62874dc74df05a5c71f01ac598010a327881a48408d0064 \
+    --hash=sha256:2b37931eac4b837c45e2522066bda221ac6d80e78922fb77c75eb12e4dbcdee5 \
+    --hash=sha256:3112de9e11ff1957148c6de1df2bc5cc1440ee36783412e5eedc6f53638a577d \
+    --hash=sha256:394b0135900b62dbf63e4809cdc8ac923182af2816d06ea61cd6763943c2cc05 \
+    --hash=sha256:3f01c2629a7d6b30d8afe0326b8c649b74825a0e1ebdcb01e8ffd1c920deb07d \
+    --hash=sha256:41cffc63c7c83dfc30c4cab5b4308ba74440a9633c4509c51a0c52431fb0f8ab \
+    --hash=sha256:4470fbed088c35dc20b78a39aaf4ae54fe81790c783b3264872a0224f437c31a \
+    --hash=sha256:5ed3576675c187e3baa80b02c4c9d0edfab78eff4e89dd9da736b921333a2432 \
+    --hash=sha256:6b24364150738ce488333b3fb48bfa14c189a66de41cd632796fbcacb26b4585 \
+    --hash=sha256:6da60fb24577f989535b8fc8b2ddc4212204aaf02e53c4c7ac94ac364150ed08 \
+    --hash=sha256:76c2ba7b5a09863d0a8166fbc753af96d561818c572dbaf697c52095938e7be4 \
+    --hash=sha256:954816850777ac234a4e32b8c88ac1f7847088a6e90cfb8f0e127a1bf3feddff \
+    --hash=sha256:9c24dd161c06992ed16c5e528a75878edbaeced5660c3db88c820f1f0d3fe1f4 \
+    --hash=sha256:a01bc25eb7a5688656c8770f931d5cb4a44c7de1b3cec69b84cc9745d1e4cc10 \
+    --hash=sha256:a19f816f4702d7b1951d7576026c7124b9bfb64a9543e571774cf517b7a50b29 \
+    --hash=sha256:a41611835010ed4ea4c7aed1da5b58aac78ee7e70932a91ed2705a7b38e40f52 \
+    --hash=sha256:a49730afb716f3f675755afec109895cab95bc9875db7ffe2e42c1b1c6279482 \
+    --hash=sha256:a86b0e4be775902a5496af4fb1b60d8a2a457d78f531458d294360b8637bb014 \
+    --hash=sha256:a8a72259a1652f192c68377be7011eac3c463e9892ef2948828c7d58e4829988 \
+    --hash=sha256:af00236fe21c4d4f4c227b6ccc19b44c594160cc3ff28d104cdce85855369277 \
+    --hash=sha256:b05e0626ec1c391432eabb47a8abd3bf199fb74bfde7cc44a26d2b1b352c2c6e \
+    --hash=sha256:b5933c45d11cbd9694b1540aa9076816cc7406964c7b16a380fd84d3a5fe3241 \
+    --hash=sha256:b5e0d47d619c739bdc636bbe007da4519fc953393304a5943e0b5aec96c9877c \
+    --hash=sha256:b67589f7955924865344e6eacfdcf70675e64f36800a576aa5e961f0008cde2a \
+    --hash=sha256:c5a2530400a6e7e68fd1552a55515de6a4559122e495f73554a51cedafc11669 \
+    --hash=sha256:cafe0ba3a96d0845121433cffa2b9232844a2609fce694fcc02f3f31214ece28 \
+    --hash=sha256:cdb2886c0be2c6c54d0651d5a61c29ef347e8eec81fd83afebbf7b59b80b7393 \
+    --hash=sha256:d0cf7076c8578b3de4e43a046cc7a1af8466e1c3f5e64167189fe8958a4f9c02 \
+    --hash=sha256:f1e1b92ee4ee9ffc68624ace218b89ca5ca667607ccee4541a90cc44999b9aea \
+    --hash=sha256:f941aaf15f47f316123e1933f9ea91a6efda73a161a6ab6046d1cde37be62c88 \
+    --hash=sha256:fb59a11689ff3c58e7652260127f9e34f7f45478a2f3ef831ab6db7bcd72108f \
+    --hash=sha256:fc9ffd9a38e21fad3e8c5a88926d57f94a32546e937e0be46142b2702003eba7
 starlette==0.37.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:6fe59f29268538e5d0d182f2791a479a0c64638e6935d1c6989e63fb2699c6ee \
     --hash=sha256:9af890290133b79fc3db55474ade20f6220a364a0402e0b556e7cd5e1e093823
 structlog==24.4.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:597f61e80a91cc0749a9fd2a098ed76715a1c8a01f73e336b746504d1aad7610 \
     --hash=sha256:b27bfecede327a6d2da5fbc96bd859f114ecc398a6389d664f62085ee7ae6fc4
-tomli==2.0.1 ; python_version >= "3.10" and python_full_version <= "3.11.0a6" \
-    --hash=sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc \
-    --hash=sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f
+tomli==2.0.2 ; python_version >= "3.10" and python_version < "3.11" \
+    --hash=sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38 \
+    --hash=sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -847,6 +834,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/bytes/requirements.txt b/bytes/requirements.txt
index d3d077cc7d0..6bd8c929fdf 100644
--- a/bytes/requirements.txt
+++ b/bytes/requirements.txt
@@ -1,102 +1,123 @@
-alembic==1.13.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:2edcc97bed0bd3272611ce3a98d98279e9c209e7186e43e75bbb1b2bdfdbcc43 \
-    --hash=sha256:4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595
+alembic==1.13.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2 \
+    --hash=sha256:908e905976d15235fae59c9ac42c4c5b75cfcefe3d27c0fbf7ae15a37715d80e
 annotated-types==0.7.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \
     --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89
-anyio==4.3.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \
-    --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6
+anyio==4.6.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:137b4559cbb034c477165047febb6ff83f390fc3b20bf181c1fc0a728cb8beeb \
+    --hash=sha256:c7d2e9d63e31599eeb636c8c5c03a7e108d73b345f064f1c19fdc87b79036a9a
 asgiref==3.8.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
-bcrypt==4.1.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:02d9ef8915f72dd6daaef40e0baeef8a017ce624369f09754baf32bb32dba25f \
-    --hash=sha256:1c28973decf4e0e69cee78c68e30a523be441972c826703bb93099868a8ff5b5 \
-    --hash=sha256:2a298db2a8ab20056120b45e86c00a0a5eb50ec4075b6142db35f593b97cb3fb \
-    --hash=sha256:33313a1200a3ae90b75587ceac502b048b840fc69e7f7a0905b5f87fac7a1258 \
-    --hash=sha256:3566a88234e8de2ccae31968127b0ecccbb4cddb629da744165db72b58d88ca4 \
-    --hash=sha256:387e7e1af9a4dd636b9505a465032f2f5cb8e61ba1120e79a0e1cd0b512f3dfc \
-    --hash=sha256:44290ccc827d3a24604f2c8bcd00d0da349e336e6503656cb8192133e27335e2 \
-    --hash=sha256:57fa9442758da926ed33a91644649d3e340a71e2d0a5a8de064fb621fd5a3326 \
-    --hash=sha256:68e3c6642077b0c8092580c819c1684161262b2e30c4f45deb000c38947bf483 \
-    --hash=sha256:69057b9fc5093ea1ab00dd24ede891f3e5e65bee040395fb1e66ee196f9c9b4a \
-    --hash=sha256:6cad43d8c63f34b26aef462b6f5e44fdcf9860b723d2453b5d391258c4c8e966 \
-    --hash=sha256:71b8be82bc46cedd61a9f4ccb6c1a493211d031415a34adde3669ee1b0afbb63 \
-    --hash=sha256:732b3920a08eacf12f93e6b04ea276c489f1c8fb49344f564cca2adb663b3e4c \
-    --hash=sha256:9800ae5bd5077b13725e2e3934aa3c9c37e49d3ea3d06318010aa40f54c63551 \
-    --hash=sha256:a97e07e83e3262599434816f631cc4c7ca2aa8e9c072c1b1a7fec2ae809a1d2d \
-    --hash=sha256:ac621c093edb28200728a9cca214d7e838529e557027ef0581685909acd28b5e \
-    --hash=sha256:b8df79979c5bae07f1db22dcc49cc5bccf08a0380ca5c6f391cbb5790355c0b0 \
-    --hash=sha256:b90e216dc36864ae7132cb151ffe95155a37a14e0de3a8f64b49655dd959ff9c \
-    --hash=sha256:ba4e4cc26610581a6329b3937e02d319f5ad4b85b074846bf4fef8a8cf51e7bb \
-    --hash=sha256:ba55e40de38a24e2d78d34c2d36d6e864f93e0d79d0b6ce915e4335aa81d01b1 \
-    --hash=sha256:be3ab1071662f6065899fe08428e45c16aa36e28bc42921c4901a191fda6ee42 \
-    --hash=sha256:d75fc8cd0ba23f97bae88a6ec04e9e5351ff3c6ad06f38fe32ba50cbd0d11946 \
-    --hash=sha256:e51c42750b7585cee7892c2614be0d14107fad9581d1738d954a262556dd1aab \
-    --hash=sha256:ea505c97a5c465ab8c3ba75c0805a102ce526695cd6818c6de3b1a38f6f60da1 \
-    --hash=sha256:eb3bd3321517916696233b5e0c67fd7d6281f0ef48e66812db35fc963a422a1c \
-    --hash=sha256:f70d9c61f9c4ca7d57f3bfe88a5ccf62546ffbadf3681bb1e268d9d2e41c91a7 \
-    --hash=sha256:fbe188b878313d01b7718390f31528be4010fed1faa798c5a1d0469c9c48c369
-cachetools==5.3.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0abad1021d3f8325b2fc1d2e9c8b9c9d57b04c3932657a72465447332c24d945 \
-    --hash=sha256:ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
-cffi==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
-    --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
-    --hash=sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417 \
-    --hash=sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab \
-    --hash=sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520 \
-    --hash=sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36 \
-    --hash=sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743 \
-    --hash=sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8 \
-    --hash=sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed \
-    --hash=sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684 \
-    --hash=sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56 \
-    --hash=sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324 \
-    --hash=sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d \
-    --hash=sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235 \
-    --hash=sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e \
-    --hash=sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088 \
-    --hash=sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000 \
-    --hash=sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7 \
-    --hash=sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e \
-    --hash=sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673 \
-    --hash=sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c \
-    --hash=sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe \
-    --hash=sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2 \
-    --hash=sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098 \
-    --hash=sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8 \
-    --hash=sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a \
-    --hash=sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0 \
-    --hash=sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b \
-    --hash=sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896 \
-    --hash=sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e \
-    --hash=sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9 \
-    --hash=sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2 \
-    --hash=sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b \
-    --hash=sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6 \
-    --hash=sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404 \
-    --hash=sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f \
-    --hash=sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 \
-    --hash=sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4 \
-    --hash=sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc \
-    --hash=sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936 \
-    --hash=sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba \
-    --hash=sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872 \
-    --hash=sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb \
-    --hash=sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614 \
-    --hash=sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1 \
-    --hash=sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d \
-    --hash=sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969 \
-    --hash=sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b \
-    --hash=sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4 \
-    --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \
-    --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \
-    --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357
+bcrypt==4.2.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:096a15d26ed6ce37a14c1ac1e48119660f21b24cba457f160a4b830f3fe6b5cb \
+    --hash=sha256:0da52759f7f30e83f1e30a888d9163a81353ef224d82dc58eb5bb52efcabc399 \
+    --hash=sha256:1bb429fedbe0249465cdd85a58e8376f31bb315e484f16e68ca4c786dcc04291 \
+    --hash=sha256:1d84cf6d877918620b687b8fd1bf7781d11e8a0998f576c7aa939776b512b98d \
+    --hash=sha256:1ee38e858bf5d0287c39b7a1fc59eec64bbf880c7d504d3a06a96c16e14058e7 \
+    --hash=sha256:1ff39b78a52cf03fdf902635e4c81e544714861ba3f0efc56558979dd4f09170 \
+    --hash=sha256:27fe0f57bb5573104b5a6de5e4153c60814c711b29364c10a75a54bb6d7ff48d \
+    --hash=sha256:3413bd60460f76097ee2e0a493ccebe4a7601918219c02f503984f0a7ee0aebe \
+    --hash=sha256:3698393a1b1f1fd5714524193849d0c6d524d33523acca37cd28f02899285060 \
+    --hash=sha256:373db9abe198e8e2c70d12b479464e0d5092cc122b20ec504097b5f2297ed184 \
+    --hash=sha256:39e1d30c7233cfc54f5c3f2c825156fe044efdd3e0b9d309512cc514a263ec2a \
+    --hash=sha256:3bbbfb2734f0e4f37c5136130405332640a1e46e6b23e000eeff2ba8d005da68 \
+    --hash=sha256:3d3a6d28cb2305b43feac298774b997e372e56c7c7afd90a12b3dc49b189151c \
+    --hash=sha256:5a1e8aa9b28ae28020a3ac4b053117fb51c57a010b9f969603ed885f23841458 \
+    --hash=sha256:61ed14326ee023917ecd093ee6ef422a72f3aec6f07e21ea5f10622b735538a9 \
+    --hash=sha256:655ea221910bcac76ea08aaa76df427ef8625f92e55a8ee44fbf7753dbabb328 \
+    --hash=sha256:762a2c5fb35f89606a9fde5e51392dad0cd1ab7ae64149a8b935fe8d79dd5ed7 \
+    --hash=sha256:77800b7147c9dc905db1cba26abe31e504d8247ac73580b4aa179f98e6608f34 \
+    --hash=sha256:8ac68872c82f1add6a20bd489870c71b00ebacd2e9134a8aa3f98a0052ab4b0e \
+    --hash=sha256:8d7bb9c42801035e61c109c345a28ed7e84426ae4865511eb82e913df18f58c2 \
+    --hash=sha256:8f6ede91359e5df88d1f5c1ef47428a4420136f3ce97763e31b86dd8280fbdf5 \
+    --hash=sha256:9c1c4ad86351339c5f320ca372dfba6cb6beb25e8efc659bedd918d921956bae \
+    --hash=sha256:c02d944ca89d9b1922ceb8a46460dd17df1ba37ab66feac4870f6862a1533c00 \
+    --hash=sha256:c52aac18ea1f4a4f65963ea4f9530c306b56ccd0c6f8c8da0c06976e34a6e841 \
+    --hash=sha256:cb2a8ec2bc07d3553ccebf0746bbf3d19426d1c6d1adbd4fa48925f66af7b9e8 \
+    --hash=sha256:cf69eaf5185fd58f268f805b505ce31f9b9fc2d64b376642164e9244540c1221 \
+    --hash=sha256:f4f4acf526fcd1c34e7ce851147deedd4e26e6402369304220250598b26448db
+boto3==1.35.31 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2e9af74d10d8af7610a8d8468d2914961f116912a024fce17351825260385a52 \
+    --hash=sha256:8c593af260c4ea3eb6f079c09908f94494ca2222aa4e40a7ff490fab1cee8b39
+botocore==1.35.31 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:4cee814875bc78656aef4011d3d6b2231e96f53ea3661ee428201afb579d5c31 \
+    --hash=sha256:f7bfa910cf2cbcc8c2307c1cf7b93495d614c2d699883417893e0a337fe4eb63
+cachetools==5.5.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \
+    --hash=sha256:2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
+cffi==1.17.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:045d61c734659cc045141be4bae381a41d89b741f795af1dd018bfb532fd0df8 \
+    --hash=sha256:0984a4925a435b1da406122d4d7968dd861c1385afe3b45ba82b750f229811e2 \
+    --hash=sha256:0e2b1fac190ae3ebfe37b979cc1ce69c81f4e4fe5746bb401dca63a9062cdaf1 \
+    --hash=sha256:0f048dcf80db46f0098ccac01132761580d28e28bc0f78ae0d58048063317e15 \
+    --hash=sha256:1257bdabf294dceb59f5e70c64a3e2f462c30c7ad68092d01bbbfb1c16b1ba36 \
+    --hash=sha256:1c39c6016c32bc48dd54561950ebd6836e1670f2ae46128f67cf49e789c52824 \
+    --hash=sha256:1d599671f396c4723d016dbddb72fe8e0397082b0a77a4fab8028923bec050e8 \
+    --hash=sha256:28b16024becceed8c6dfbc75629e27788d8a3f9030691a1dbf9821a128b22c36 \
+    --hash=sha256:2bb1a08b8008b281856e5971307cc386a8e9c5b625ac297e853d36da6efe9c17 \
+    --hash=sha256:30c5e0cb5ae493c04c8b42916e52ca38079f1b235c2f8ae5f4527b963c401caf \
+    --hash=sha256:31000ec67d4221a71bd3f67df918b1f88f676f1c3b535a7eb473255fdc0b83fc \
+    --hash=sha256:386c8bf53c502fff58903061338ce4f4950cbdcb23e2902d86c0f722b786bbe3 \
+    --hash=sha256:3edc8d958eb099c634dace3c7e16560ae474aa3803a5df240542b305d14e14ed \
+    --hash=sha256:45398b671ac6d70e67da8e4224a065cec6a93541bb7aebe1b198a61b58c7b702 \
+    --hash=sha256:46bf43160c1a35f7ec506d254e5c890f3c03648a4dbac12d624e4490a7046cd1 \
+    --hash=sha256:4ceb10419a9adf4460ea14cfd6bc43d08701f0835e979bf821052f1805850fe8 \
+    --hash=sha256:51392eae71afec0d0c8fb1a53b204dbb3bcabcb3c9b807eedf3e1e6ccf2de903 \
+    --hash=sha256:5da5719280082ac6bd9aa7becb3938dc9f9cbd57fac7d2871717b1feb0902ab6 \
+    --hash=sha256:610faea79c43e44c71e1ec53a554553fa22321b65fae24889706c0a84d4ad86d \
+    --hash=sha256:636062ea65bd0195bc012fea9321aca499c0504409f413dc88af450b57ffd03b \
+    --hash=sha256:6883e737d7d9e4899a8a695e00ec36bd4e5e4f18fabe0aca0efe0a4b44cdb13e \
+    --hash=sha256:6b8b4a92e1c65048ff98cfe1f735ef8f1ceb72e3d5f0c25fdb12087a23da22be \
+    --hash=sha256:6f17be4345073b0a7b8ea599688f692ac3ef23ce28e5df79c04de519dbc4912c \
+    --hash=sha256:706510fe141c86a69c8ddc029c7910003a17353970cff3b904ff0686a5927683 \
+    --hash=sha256:72e72408cad3d5419375fc87d289076ee319835bdfa2caad331e377589aebba9 \
+    --hash=sha256:733e99bc2df47476e3848417c5a4540522f234dfd4ef3ab7fafdf555b082ec0c \
+    --hash=sha256:7596d6620d3fa590f677e9ee430df2958d2d6d6de2feeae5b20e82c00b76fbf8 \
+    --hash=sha256:78122be759c3f8a014ce010908ae03364d00a1f81ab5c7f4a7a5120607ea56e1 \
+    --hash=sha256:805b4371bf7197c329fcb3ead37e710d1bca9da5d583f5073b799d5c5bd1eee4 \
+    --hash=sha256:85a950a4ac9c359340d5963966e3e0a94a676bd6245a4b55bc43949eee26a655 \
+    --hash=sha256:8f2cdc858323644ab277e9bb925ad72ae0e67f69e804f4898c070998d50b1a67 \
+    --hash=sha256:9755e4345d1ec879e3849e62222a18c7174d65a6a92d5b346b1863912168b595 \
+    --hash=sha256:98e3969bcff97cae1b2def8ba499ea3d6f31ddfdb7635374834cf89a1a08ecf0 \
+    --hash=sha256:a08d7e755f8ed21095a310a693525137cfe756ce62d066e53f502a83dc550f65 \
+    --hash=sha256:a1ed2dd2972641495a3ec98445e09766f077aee98a1c896dcb4ad0d303628e41 \
+    --hash=sha256:a24ed04c8ffd54b0729c07cee15a81d964e6fee0e3d4d342a27b020d22959dc6 \
+    --hash=sha256:a45e3c6913c5b87b3ff120dcdc03f6131fa0065027d0ed7ee6190736a74cd401 \
+    --hash=sha256:a9b15d491f3ad5d692e11f6b71f7857e7835eb677955c00cc0aefcd0669adaf6 \
+    --hash=sha256:ad9413ccdeda48c5afdae7e4fa2192157e991ff761e7ab8fdd8926f40b160cc3 \
+    --hash=sha256:b2ab587605f4ba0bf81dc0cb08a41bd1c0a5906bd59243d56bad7668a6fc6c16 \
+    --hash=sha256:b62ce867176a75d03a665bad002af8e6d54644fad99a3c70905c543130e39d93 \
+    --hash=sha256:c03e868a0b3bc35839ba98e74211ed2b05d2119be4e8a0f224fba9384f1fe02e \
+    --hash=sha256:c59d6e989d07460165cc5ad3c61f9fd8f1b4796eacbd81cee78957842b834af4 \
+    --hash=sha256:c7eac2ef9b63c79431bc4b25f1cd649d7f061a28808cbc6c47b534bd789ef964 \
+    --hash=sha256:c9c3d058ebabb74db66e431095118094d06abf53284d9c81f27300d0e0d8bc7c \
+    --hash=sha256:ca74b8dbe6e8e8263c0ffd60277de77dcee6c837a3d0881d8c1ead7268c9e576 \
+    --hash=sha256:caaf0640ef5f5517f49bc275eca1406b0ffa6aa184892812030f04c2abf589a0 \
+    --hash=sha256:cdf5ce3acdfd1661132f2a9c19cac174758dc2352bfe37d98aa7512c6b7178b3 \
+    --hash=sha256:d016c76bdd850f3c626af19b0542c9677ba156e4ee4fccfdd7848803533ef662 \
+    --hash=sha256:d01b12eeeb4427d3110de311e1774046ad344f5b1a7403101878976ecd7a10f3 \
+    --hash=sha256:d63afe322132c194cf832bfec0dc69a99fb9bb6bbd550f161a49e9e855cc78ff \
+    --hash=sha256:da95af8214998d77a98cc14e3a3bd00aa191526343078b530ceb0bd710fb48a5 \
+    --hash=sha256:dd398dbc6773384a17fe0d3e7eeb8d1a21c2200473ee6806bb5e6a8e62bb73dd \
+    --hash=sha256:de2ea4b5833625383e464549fec1bc395c1bdeeb5f25c4a3a82b5a8c756ec22f \
+    --hash=sha256:de55b766c7aa2e2a3092c51e0483d700341182f08e67c63630d5b6f200bb28e5 \
+    --hash=sha256:df8b1c11f177bc2313ec4b2d46baec87a5f3e71fc8b45dab2ee7cae86d9aba14 \
+    --hash=sha256:e03eab0a8677fa80d646b5ddece1cbeaf556c313dcfac435ba11f107ba117b5d \
+    --hash=sha256:e221cf152cff04059d011ee126477f0d9588303eb57e88923578ace7baad17f9 \
+    --hash=sha256:e31ae45bc2e29f6b2abd0de1cc3b9d5205aa847cafaecb8af1476a609a2f6eb7 \
+    --hash=sha256:edae79245293e15384b51f88b00613ba9f7198016a5948b5dddf4917d4d26382 \
+    --hash=sha256:f1e22e8c4419538cb197e4dd60acc919d7696e5ef98ee4da4e01d3f8cfa4cc5a \
+    --hash=sha256:f3a2b4222ce6b60e2e8b337bb9596923045681d71e5a082783484d845390938e \
+    --hash=sha256:f6a16c31041f09ead72d69f583767292f750d24913dadacf5756b966aacb3f1a \
+    --hash=sha256:f75c7ab1f9e4aca5414ed4d8e5c0e303a34f4421f8a0d47a4d019ceff0ab6af4 \
+    --hash=sha256:f79fc4fc25f1c8698ff97788206bb3c2598949bfe0fef03d299eb1b5356ada99 \
+    --hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
+    --hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -194,175 +215,197 @@ click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0" and platform_system == "Windows" \
     --hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \
     --hash=sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6
-cryptography==42.0.8 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:013629ae70b40af70c9a7a5db40abe5d9054e6f4380e50ce769947b73bf3caad \
-    --hash=sha256:2346b911eb349ab547076f47f2e035fc8ff2c02380a7cbbf8d87114fa0f1c583 \
-    --hash=sha256:2f66d9cd9147ee495a8374a45ca445819f8929a3efcd2e3df6428e46c3cbb10b \
-    --hash=sha256:2f88d197e66c65be5e42cd72e5c18afbfae3f741742070e3019ac8f4ac57262c \
-    --hash=sha256:31f721658a29331f895a5a54e7e82075554ccfb8b163a18719d342f5ffe5ecb1 \
-    --hash=sha256:343728aac38decfdeecf55ecab3264b015be68fc2816ca800db649607aeee648 \
-    --hash=sha256:5226d5d21ab681f432a9c1cf8b658c0cb02533eece706b155e5fbd8a0cdd3949 \
-    --hash=sha256:57080dee41209e556a9a4ce60d229244f7a66ef52750f813bfbe18959770cfba \
-    --hash=sha256:5a94eccb2a81a309806027e1670a358b99b8fe8bfe9f8d329f27d72c094dde8c \
-    --hash=sha256:6b7c4f03ce01afd3b76cf69a5455caa9cfa3de8c8f493e0d3ab7d20611c8dae9 \
-    --hash=sha256:7016f837e15b0a1c119d27ecd89b3515f01f90a8615ed5e9427e30d9cdbfed3d \
-    --hash=sha256:81884c4d096c272f00aeb1f11cf62ccd39763581645b0812e99a91505fa48e0c \
-    --hash=sha256:81d8a521705787afe7a18d5bfb47ea9d9cc068206270aad0b96a725022e18d2e \
-    --hash=sha256:8d09d05439ce7baa8e9e95b07ec5b6c886f548deb7e0f69ef25f64b3bce842f2 \
-    --hash=sha256:961e61cefdcb06e0c6d7e3a1b22ebe8b996eb2bf50614e89384be54c48c6b63d \
-    --hash=sha256:9c0c1716c8447ee7dbf08d6db2e5c41c688544c61074b54fc4564196f55c25a7 \
-    --hash=sha256:a0608251135d0e03111152e41f0cc2392d1e74e35703960d4190b2e0f4ca9c70 \
-    --hash=sha256:a0c5b2b0585b6af82d7e385f55a8bc568abff8923af147ee3c07bd8b42cda8b2 \
-    --hash=sha256:ad803773e9df0b92e0a817d22fd8a3675493f690b96130a5e24f1b8fabbea9c7 \
-    --hash=sha256:b297f90c5723d04bcc8265fc2a0f86d4ea2e0f7ab4b6994459548d3a6b992a14 \
-    --hash=sha256:ba4f0a211697362e89ad822e667d8d340b4d8d55fae72cdd619389fb5912eefe \
-    --hash=sha256:c4783183f7cb757b73b2ae9aed6599b96338eb957233c58ca8f49a49cc32fd5e \
-    --hash=sha256:c9bb2ae11bfbab395bdd072985abde58ea9860ed84e59dbc0463a5d0159f5b71 \
-    --hash=sha256:cafb92b2bc622cd1aa6a1dce4b93307792633f4c5fe1f46c6b97cf67073ec961 \
-    --hash=sha256:d45b940883a03e19e944456a558b67a41160e367a719833c53de6911cabba2b7 \
-    --hash=sha256:dc0fdf6787f37b1c6b08e6dfc892d9d068b5bdb671198c72072828b80bd5fe4c \
-    --hash=sha256:dea567d1b0e8bc5764b9443858b673b734100c2871dc93163f58c46a97a83d28 \
-    --hash=sha256:dec9b018df185f08483f294cae6ccac29e7a6e0678996587363dc352dc65c842 \
-    --hash=sha256:e3ec3672626e1b9e55afd0df6d774ff0e953452886e06e0f1eb7eb0c832e8902 \
-    --hash=sha256:e599b53fd95357d92304510fb7bda8523ed1f79ca98dce2f43c115950aa78801 \
-    --hash=sha256:fa76fbb7596cc5839320000cdd5d0955313696d9511debab7ee7278fc8b5c84a \
-    --hash=sha256:fff12c88a672ab9c9c1cf7b0c80e3ad9e2ebd9d828d955c126be4fd3e5578c9e
+cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494 \
+    --hash=sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806 \
+    --hash=sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d \
+    --hash=sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062 \
+    --hash=sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2 \
+    --hash=sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4 \
+    --hash=sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1 \
+    --hash=sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85 \
+    --hash=sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84 \
+    --hash=sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042 \
+    --hash=sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d \
+    --hash=sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962 \
+    --hash=sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2 \
+    --hash=sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa \
+    --hash=sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d \
+    --hash=sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365 \
+    --hash=sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96 \
+    --hash=sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47 \
+    --hash=sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d \
+    --hash=sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d \
+    --hash=sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c \
+    --hash=sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb \
+    --hash=sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277 \
+    --hash=sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172 \
+    --hash=sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034 \
+    --hash=sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a \
+    --hash=sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289
 deprecated==1.2.14 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c \
     --hash=sha256:e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3
-exceptiongroup==1.2.0 ; python_version >= "3.10" and python_version < "3.11" \
-    --hash=sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14 \
-    --hash=sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68
+exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11" \
+    --hash=sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b \
+    --hash=sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc
 fastapi-slim==0.111.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:ac29948dcbf84cc78d68ed2c4df4e695ac265cf53c339e5794008476e9befbbb \
     --hash=sha256:f799a60658f56c49fe3842eb534730fabe1168731c0b407b98a042c8d57be39d
-googleapis-common-protos==1.62.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07 \
-    --hash=sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277
-greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" \
-    --hash=sha256:01bc7ea167cf943b4c802068e178bbf70ae2e8c080467070d01bfa02f337ee67 \
-    --hash=sha256:0448abc479fab28b00cb472d278828b3ccca164531daab4e970a0458786055d6 \
-    --hash=sha256:086152f8fbc5955df88382e8a75984e2bb1c892ad2e3c80a2508954e52295257 \
-    --hash=sha256:098d86f528c855ead3479afe84b49242e174ed262456c342d70fc7f972bc13c4 \
-    --hash=sha256:149e94a2dd82d19838fe4b2259f1b6b9957d5ba1b25640d2380bea9c5df37676 \
-    --hash=sha256:1551a8195c0d4a68fac7a4325efac0d541b48def35feb49d803674ac32582f61 \
-    --hash=sha256:15d79dd26056573940fcb8c7413d84118086f2ec1a8acdfa854631084393efcc \
-    --hash=sha256:1996cb9306c8595335bb157d133daf5cf9f693ef413e7673cb07e3e5871379ca \
-    --hash=sha256:1a7191e42732df52cb5f39d3527217e7ab73cae2cb3694d241e18f53d84ea9a7 \
-    --hash=sha256:1ea188d4f49089fc6fb283845ab18a2518d279c7cd9da1065d7a84e991748728 \
-    --hash=sha256:1f672519db1796ca0d8753f9e78ec02355e862d0998193038c7073045899f305 \
-    --hash=sha256:2516a9957eed41dd8f1ec0c604f1cdc86758b587d964668b5b196a9db5bfcde6 \
-    --hash=sha256:2797aa5aedac23af156bbb5a6aa2cd3427ada2972c828244eb7d1b9255846379 \
-    --hash=sha256:2dd6e660effd852586b6a8478a1d244b8dc90ab5b1321751d2ea15deb49ed414 \
-    --hash=sha256:3ddc0f794e6ad661e321caa8d2f0a55ce01213c74722587256fb6566049a8b04 \
-    --hash=sha256:3ed7fb269f15dc662787f4119ec300ad0702fa1b19d2135a37c2c4de6fadfd4a \
-    --hash=sha256:419b386f84949bf0e7c73e6032e3457b82a787c1ab4a0e43732898a761cc9dbf \
-    --hash=sha256:43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491 \
-    --hash=sha256:52f59dd9c96ad2fc0d5724107444f76eb20aaccb675bf825df6435acb7703559 \
-    --hash=sha256:57e8974f23e47dac22b83436bdcf23080ade568ce77df33159e019d161ce1d1e \
-    --hash=sha256:5b51e85cb5ceda94e79d019ed36b35386e8c37d22f07d6a751cb659b180d5274 \
-    --hash=sha256:649dde7de1a5eceb258f9cb00bdf50e978c9db1b996964cd80703614c86495eb \
-    --hash=sha256:64d7675ad83578e3fc149b617a444fab8efdafc9385471f868eb5ff83e446b8b \
-    --hash=sha256:68834da854554926fbedd38c76e60c4a2e3198c6fbed520b106a8986445caaf9 \
-    --hash=sha256:6b66c9c1e7ccabad3a7d037b2bcb740122a7b17a53734b7d72a344ce39882a1b \
-    --hash=sha256:70fb482fdf2c707765ab5f0b6655e9cfcf3780d8d87355a063547b41177599be \
-    --hash=sha256:7170375bcc99f1a2fbd9c306f5be8764eaf3ac6b5cb968862cad4c7057756506 \
-    --hash=sha256:73a411ef564e0e097dbe7e866bb2dda0f027e072b04da387282b02c308807405 \
-    --hash=sha256:77457465d89b8263bca14759d7c1684df840b6811b2499838cc5b040a8b5b113 \
-    --hash=sha256:7f362975f2d179f9e26928c5b517524e89dd48530a0202570d55ad6ca5d8a56f \
-    --hash=sha256:81bb9c6d52e8321f09c3d165b2a78c680506d9af285bfccbad9fb7ad5a5da3e5 \
-    --hash=sha256:881b7db1ebff4ba09aaaeae6aa491daeb226c8150fc20e836ad00041bcb11230 \
-    --hash=sha256:894393ce10ceac937e56ec00bb71c4c2f8209ad516e96033e4b3b1de270e200d \
-    --hash=sha256:99bf650dc5d69546e076f413a87481ee1d2d09aaaaaca058c9251b6d8c14783f \
-    --hash=sha256:9da2bd29ed9e4f15955dd1595ad7bc9320308a3b766ef7f837e23ad4b4aac31a \
-    --hash=sha256:afaff6cf5200befd5cec055b07d1c0a5a06c040fe5ad148abcd11ba6ab9b114e \
-    --hash=sha256:b1b5667cced97081bf57b8fa1d6bfca67814b0afd38208d52538316e9422fc61 \
-    --hash=sha256:b37eef18ea55f2ffd8f00ff8fe7c8d3818abd3e25fb73fae2ca3b672e333a7a6 \
-    --hash=sha256:b542be2440edc2d48547b5923c408cbe0fc94afb9f18741faa6ae970dbcb9b6d \
-    --hash=sha256:b7dcbe92cc99f08c8dd11f930de4d99ef756c3591a5377d1d9cd7dd5e896da71 \
-    --hash=sha256:b7f009caad047246ed379e1c4dbcb8b020f0a390667ea74d2387be2998f58a22 \
-    --hash=sha256:bba5387a6975598857d86de9eac14210a49d554a77eb8261cc68b7d082f78ce2 \
-    --hash=sha256:c5e1536de2aad7bf62e27baf79225d0d64360d4168cf2e6becb91baf1ed074f3 \
-    --hash=sha256:c5ee858cfe08f34712f548c3c363e807e7186f03ad7a5039ebadb29e8c6be067 \
-    --hash=sha256:c9db1c18f0eaad2f804728c67d6c610778456e3e1cc4ab4bbd5eeb8e6053c6fc \
-    --hash=sha256:d353cadd6083fdb056bb46ed07e4340b0869c305c8ca54ef9da3421acbdf6881 \
-    --hash=sha256:d46677c85c5ba00a9cb6f7a00b2bfa6f812192d2c9f7d9c4f6a55b60216712f3 \
-    --hash=sha256:d4d1ac74f5c0c0524e4a24335350edad7e5f03b9532da7ea4d3c54d527784f2e \
-    --hash=sha256:d73a9fe764d77f87f8ec26a0c85144d6a951a6c438dfe50487df5595c6373eac \
-    --hash=sha256:da70d4d51c8b306bb7a031d5cff6cc25ad253affe89b70352af5f1cb68e74b53 \
-    --hash=sha256:daf3cb43b7cf2ba96d614252ce1684c1bccee6b2183a01328c98d36fcd7d5cb0 \
-    --hash=sha256:dca1e2f3ca00b84a396bc1bce13dd21f680f035314d2379c4160c98153b2059b \
-    --hash=sha256:dd4f49ae60e10adbc94b45c0b5e6a179acc1736cf7a90160b404076ee283cf83 \
-    --hash=sha256:e1f145462f1fa6e4a4ae3c0f782e580ce44d57c8f2c7aae1b6fa88c0b2efdb41 \
-    --hash=sha256:e3391d1e16e2a5a1507d83e4a8b100f4ee626e8eca43cf2cadb543de69827c4c \
-    --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
-    --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
-    --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+googleapis-common-protos==1.65.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2972e6c496f435b92590fd54045060867f3fe9be2c82ab148fc8885035479a63 \
+    --hash=sha256:334a29d07cddc3aa01dee4988f9afd9b2916ee2ff49d6b757155dc0d197852c0
+greenlet==3.1.1 ; python_version >= "3.10" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "4.0" \
+    --hash=sha256:0153404a4bb921f0ff1abeb5ce8a5131da56b953eda6e14b88dc6bbc04d2049e \
+    --hash=sha256:03a088b9de532cbfe2ba2034b2b85e82df37874681e8c470d6fb2f8c04d7e4b7 \
+    --hash=sha256:04b013dc07c96f83134b1e99888e7a79979f1a247e2a9f59697fa14b5862ed01 \
+    --hash=sha256:05175c27cb459dcfc05d026c4232f9de8913ed006d42713cb8a5137bd49375f1 \
+    --hash=sha256:09fc016b73c94e98e29af67ab7b9a879c307c6731a2c9da0db5a7d9b7edd1159 \
+    --hash=sha256:0bbae94a29c9e5c7e4a2b7f0aae5c17e8e90acbfd3bf6270eeba60c39fce3563 \
+    --hash=sha256:0fde093fb93f35ca72a556cf72c92ea3ebfda3d79fc35bb19fbe685853869a83 \
+    --hash=sha256:1443279c19fca463fc33e65ef2a935a5b09bb90f978beab37729e1c3c6c25fe9 \
+    --hash=sha256:1776fd7f989fc6b8d8c8cb8da1f6b82c5814957264d1f6cf818d475ec2bf6395 \
+    --hash=sha256:1d3755bcb2e02de341c55b4fca7a745a24a9e7212ac953f6b3a48d117d7257aa \
+    --hash=sha256:23f20bb60ae298d7d8656c6ec6db134bca379ecefadb0b19ce6f19d1f232a942 \
+    --hash=sha256:275f72decf9932639c1c6dd1013a1bc266438eb32710016a1c742df5da6e60a1 \
+    --hash=sha256:2846930c65b47d70b9d178e89c7e1a69c95c1f68ea5aa0a58646b7a96df12441 \
+    --hash=sha256:3319aa75e0e0639bc15ff54ca327e8dc7a6fe404003496e3c6925cd3142e0e22 \
+    --hash=sha256:346bed03fe47414091be4ad44786d1bd8bef0c3fcad6ed3dee074a032ab408a9 \
+    --hash=sha256:36b89d13c49216cadb828db8dfa6ce86bbbc476a82d3a6c397f0efae0525bdd0 \
+    --hash=sha256:37b9de5a96111fc15418819ab4c4432e4f3c2ede61e660b1e33971eba26ef9ba \
+    --hash=sha256:396979749bd95f018296af156201d6211240e7a23090f50a8d5d18c370084dc3 \
+    --hash=sha256:3b2813dc3de8c1ee3f924e4d4227999285fd335d1bcc0d2be6dc3f1f6a318ec1 \
+    --hash=sha256:411f015496fec93c1c8cd4e5238da364e1da7a124bcb293f085bf2860c32c6f6 \
+    --hash=sha256:47da355d8687fd65240c364c90a31569a133b7b60de111c255ef5b606f2ae291 \
+    --hash=sha256:48ca08c771c268a768087b408658e216133aecd835c0ded47ce955381105ba39 \
+    --hash=sha256:4afe7ea89de619adc868e087b4d2359282058479d7cfb94970adf4b55284574d \
+    --hash=sha256:4ce3ac6cdb6adf7946475d7ef31777c26d94bccc377e070a7986bd2d5c515467 \
+    --hash=sha256:4ead44c85f8ab905852d3de8d86f6f8baf77109f9da589cb4fa142bd3b57b475 \
+    --hash=sha256:54558ea205654b50c438029505def3834e80f0869a70fb15b871c29b4575ddef \
+    --hash=sha256:5e06afd14cbaf9e00899fae69b24a32f2196c19de08fcb9f4779dd4f004e5e7c \
+    --hash=sha256:62ee94988d6b4722ce0028644418d93a52429e977d742ca2ccbe1c4f4a792511 \
+    --hash=sha256:63e4844797b975b9af3a3fb8f7866ff08775f5426925e1e0bbcfe7932059a12c \
+    --hash=sha256:6510bf84a6b643dabba74d3049ead221257603a253d0a9873f55f6a59a65f822 \
+    --hash=sha256:667a9706c970cb552ede35aee17339a18e8f2a87a51fba2ed39ceeeb1004798a \
+    --hash=sha256:6ef9ea3f137e5711f0dbe5f9263e8c009b7069d8a1acea822bd5e9dae0ae49c8 \
+    --hash=sha256:7017b2be767b9d43cc31416aba48aab0d2309ee31b4dbf10a1d38fb7972bdf9d \
+    --hash=sha256:7124e16b4c55d417577c2077be379514321916d5790fa287c9ed6f23bd2ffd01 \
+    --hash=sha256:73aaad12ac0ff500f62cebed98d8789198ea0e6f233421059fa68a5aa7220145 \
+    --hash=sha256:77c386de38a60d1dfb8e55b8c1101d68c79dfdd25c7095d51fec2dd800892b80 \
+    --hash=sha256:7876452af029456b3f3549b696bb36a06db7c90747740c5302f74a9e9fa14b13 \
+    --hash=sha256:7939aa3ca7d2a1593596e7ac6d59391ff30281ef280d8632fa03d81f7c5f955e \
+    --hash=sha256:8320f64b777d00dd7ccdade271eaf0cad6636343293a25074cc5566160e4de7b \
+    --hash=sha256:85f3ff71e2e60bd4b4932a043fbbe0f499e263c628390b285cb599154a3b03b1 \
+    --hash=sha256:8b8b36671f10ba80e159378df9c4f15c14098c4fd73a36b9ad715f057272fbef \
+    --hash=sha256:93147c513fac16385d1036b7e5b102c7fbbdb163d556b791f0f11eada7ba65dc \
+    --hash=sha256:935e943ec47c4afab8965954bf49bfa639c05d4ccf9ef6e924188f762145c0ff \
+    --hash=sha256:94b6150a85e1b33b40b1464a3f9988dcc5251d6ed06842abff82e42632fac120 \
+    --hash=sha256:94ebba31df2aa506d7b14866fed00ac141a867e63143fe5bca82a8e503b36437 \
+    --hash=sha256:95ffcf719966dd7c453f908e208e14cde192e09fde6c7186c8f1896ef778d8cd \
+    --hash=sha256:98884ecf2ffb7d7fe6bd517e8eb99d31ff7855a840fa6d0d63cd07c037f6a981 \
+    --hash=sha256:99cfaa2110534e2cf3ba31a7abcac9d328d1d9f1b95beede58294a60348fba36 \
+    --hash=sha256:9e8f8c9cb53cdac7ba9793c276acd90168f416b9ce36799b9b885790f8ad6c0a \
+    --hash=sha256:a0dfc6c143b519113354e780a50381508139b07d2177cb6ad6a08278ec655798 \
+    --hash=sha256:b2795058c23988728eec1f36a4e5e4ebad22f8320c85f3587b539b9ac84128d7 \
+    --hash=sha256:b42703b1cf69f2aa1df7d1030b9d77d3e584a70755674d60e710f0af570f3761 \
+    --hash=sha256:b7cede291382a78f7bb5f04a529cb18e068dd29e0fb27376074b6d0317bf4dd0 \
+    --hash=sha256:b8a678974d1f3aa55f6cc34dc480169d58f2e6d8958895d68845fa4ab566509e \
+    --hash=sha256:b8da394b34370874b4572676f36acabac172602abf054cbc4ac910219f3340af \
+    --hash=sha256:c3a701fe5a9695b238503ce5bbe8218e03c3bcccf7e204e455e7462d770268aa \
+    --hash=sha256:c4aab7f6381f38a4b42f269057aee279ab0fc7bf2e929e3d4abfae97b682a12c \
+    --hash=sha256:ca9d0ff5ad43e785350894d97e13633a66e2b50000e8a183a50a88d834752d42 \
+    --hash=sha256:d0028e725ee18175c6e422797c407874da24381ce0690d6b9396c204c7f7276e \
+    --hash=sha256:d21e10da6ec19b457b82636209cbe2331ff4306b54d06fa04b7c138ba18c8a81 \
+    --hash=sha256:d5e975ca70269d66d17dd995dafc06f1b06e8cb1ec1e9ed54c1d1e4a7c4cf26e \
+    --hash=sha256:da7a9bff22ce038e19bf62c4dd1ec8391062878710ded0a845bcf47cc0200617 \
+    --hash=sha256:db32b5348615a04b82240cc67983cb315309e88d444a288934ee6ceaebcad6cc \
+    --hash=sha256:dcc62f31eae24de7f8dce72134c8651c58000d3b1868e01392baea7c32c247de \
+    --hash=sha256:dfc59d69fc48664bc693842bd57acfdd490acafda1ab52c7836e3fc75c90a111 \
+    --hash=sha256:e347b3bfcf985a05e8c0b7d462ba6f15b1ee1c909e2dcad795e49e91b152c383 \
+    --hash=sha256:e4d333e558953648ca09d64f13e6d8f0523fa705f51cae3f03b5983489958c70 \
+    --hash=sha256:ed10eac5830befbdd0c32f83e8aa6288361597550ba669b04c48f0f9a2c843c6 \
+    --hash=sha256:efc0f674aa41b92da8c49e0346318c6075d734994c3c4e4430b1c3f853e498e4 \
+    --hash=sha256:f1695e76146579f8c06c1509c7ce4dfe0706f49c6831a817ac04eebb2fd02011 \
+    --hash=sha256:f1d4aeb8891338e60d1ab6127af1fe45def5259def8094b9c7e34690c8858803 \
+    --hash=sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79 \
+    --hash=sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f
+grpcio==1.66.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02697eb4a5cbe5a9639f57323b4c37bcb3ab2d48cec5da3dc2f13334d72790dd \
+    --hash=sha256:03b0b307ba26fae695e067b94cbb014e27390f8bc5ac7a3a39b7723fed085604 \
+    --hash=sha256:05bc2ceadc2529ab0b227b1310d249d95d9001cd106aa4d31e8871ad3c428d73 \
+    --hash=sha256:06de8ec0bd71be123eec15b0e0d457474931c2c407869b6c349bd9bed4adbac3 \
+    --hash=sha256:0be4e0490c28da5377283861bed2941d1d20ec017ca397a5df4394d1c31a9b50 \
+    --hash=sha256:12fda97ffae55e6526825daf25ad0fa37483685952b5d0f910d6405c87e3adb6 \
+    --hash=sha256:1caa38fb22a8578ab8393da99d4b8641e3a80abc8fd52646f1ecc92bcb8dee34 \
+    --hash=sha256:2018b053aa15782db2541ca01a7edb56a0bf18c77efed975392583725974b249 \
+    --hash=sha256:20657d6b8cfed7db5e11b62ff7dfe2e12064ea78e93f1434d61888834bc86d75 \
+    --hash=sha256:2335c58560a9e92ac58ff2bc5649952f9b37d0735608242973c7a8b94a6437d8 \
+    --hash=sha256:31fd163105464797a72d901a06472860845ac157389e10f12631025b3e4d0453 \
+    --hash=sha256:38b68498ff579a3b1ee8f93a05eb48dc2595795f2f62716e797dc24774c1aaa8 \
+    --hash=sha256:3b00efc473b20d8bf83e0e1ae661b98951ca56111feb9b9611df8efc4fe5d55d \
+    --hash=sha256:3ed71e81782966ffead60268bbda31ea3f725ebf8aa73634d5dda44f2cf3fb9c \
+    --hash=sha256:45a3d462826f4868b442a6b8fdbe8b87b45eb4f5b5308168c156b21eca43f61c \
+    --hash=sha256:49f0ca7ae850f59f828a723a9064cadbed90f1ece179d375966546499b8a2c9c \
+    --hash=sha256:4e504572433f4e72b12394977679161d495c4c9581ba34a88d843eaf0f2fbd39 \
+    --hash=sha256:4ea1d062c9230278793820146c95d038dc0f468cbdd172eec3363e42ff1c7d01 \
+    --hash=sha256:563588c587b75c34b928bc428548e5b00ea38c46972181a4d8b75ba7e3f24231 \
+    --hash=sha256:6001e575b8bbd89eee11960bb640b6da6ae110cf08113a075f1e2051cc596cae \
+    --hash=sha256:66a0cd8ba6512b401d7ed46bb03f4ee455839957f28b8d61e7708056a806ba6a \
+    --hash=sha256:6851de821249340bdb100df5eacfecfc4e6075fa85c6df7ee0eb213170ec8e5d \
+    --hash=sha256:728bdf36a186e7f51da73be7f8d09457a03061be848718d0edf000e709418987 \
+    --hash=sha256:73e3b425c1e155730273f73e419de3074aa5c5e936771ee0e4af0814631fb30a \
+    --hash=sha256:73fc8f8b9b5c4a03e802b3cd0c18b2b06b410d3c1dcbef989fdeb943bd44aff7 \
+    --hash=sha256:78fa51ebc2d9242c0fc5db0feecc57a9943303b46664ad89921f5079e2e4ada7 \
+    --hash=sha256:7b2c86457145ce14c38e5bf6bdc19ef88e66c5fee2c3d83285c5aef026ba93b3 \
+    --hash=sha256:7d69ce1f324dc2d71e40c9261d3fdbe7d4c9d60f332069ff9b2a4d8a257c7b2b \
+    --hash=sha256:802d84fd3d50614170649853d121baaaa305de7b65b3e01759247e768d691ddf \
+    --hash=sha256:80fd702ba7e432994df208f27514280b4b5c6843e12a48759c9255679ad38db8 \
+    --hash=sha256:8ac475e8da31484efa25abb774674d837b343afb78bb3bcdef10f81a93e3d6bf \
+    --hash=sha256:950da58d7d80abd0ea68757769c9db0a95b31163e53e5bb60438d263f4bed7b7 \
+    --hash=sha256:99a641995a6bc4287a6315989ee591ff58507aa1cbe4c2e70d88411c4dcc0839 \
+    --hash=sha256:9c3a99c519f4638e700e9e3f83952e27e2ea10873eecd7935823dab0c1c9250e \
+    --hash=sha256:9c509a4f78114cbc5f0740eb3d7a74985fd2eff022971bc9bc31f8bc93e66a3b \
+    --hash=sha256:a18e20d8321c6400185b4263e27982488cb5cdd62da69147087a76a24ef4e7e3 \
+    --hash=sha256:a917d26e0fe980b0ac7bfcc1a3c4ad6a9a4612c911d33efb55ed7833c749b0ee \
+    --hash=sha256:a9539f01cb04950fd4b5ab458e64a15f84c2acc273670072abe49a3f29bbad54 \
+    --hash=sha256:ad2efdbe90c73b0434cbe64ed372e12414ad03c06262279b104a029d1889d13e \
+    --hash=sha256:b672abf90a964bfde2d0ecbce30f2329a47498ba75ce6f4da35a2f4532b7acbc \
+    --hash=sha256:bbd27c24a4cc5e195a7f56cfd9312e366d5d61b86e36d46bbe538457ea6eb8dd \
+    --hash=sha256:c400ba5675b67025c8a9f48aa846f12a39cf0c44df5cd060e23fda5b30e9359d \
+    --hash=sha256:c408f5ef75cfffa113cacd8b0c0e3611cbfd47701ca3cdc090594109b9fcbaed \
+    --hash=sha256:c806852deaedee9ce8280fe98955c9103f62912a5b2d5ee7e3eaa284a6d8d8e7 \
+    --hash=sha256:ce89f5876662f146d4c1f695dda29d4433a5d01c8681fbd2539afff535da14d4 \
+    --hash=sha256:d25a14af966438cddf498b2e338f88d1c9706f3493b1d73b93f695c99c5f0e2a \
+    --hash=sha256:d8d4732cc5052e92cea2f78b233c2e2a52998ac40cd651f40e398893ad0d06ec \
+    --hash=sha256:d9a9724a156c8ec6a379869b23ba3323b7ea3600851c91489b871e375f710bc8 \
+    --hash=sha256:e636ce23273683b00410f1971d209bf3689238cf5538d960adc3cdfe80dd0dbd \
+    --hash=sha256:e88264caad6d8d00e7913996030bac8ad5f26b7411495848cc218bd3a9040b6c \
+    --hash=sha256:f145cc21836c332c67baa6fc81099d1d27e266401565bf481948010d6ea32d46 \
+    --hash=sha256:fb57870449dfcfac428afbb5a877829fcb0d6db9d9baa1148705739e9083880e \
+    --hash=sha256:fb70487c95786e345af5e854ffec8cb8cc781bcc5df7930c4fbb7feaa72e1cdf \
+    --hash=sha256:fe96281713168a3270878255983d2cb1a97e034325c8c2c25169a69289d3ecfa \
+    --hash=sha256:ff1f7882e56c40b0d33c4922c15dfa30612f05fb785074a012f7cda74d1c3679
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
-httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
-    --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
-idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
-    --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
-importlib-metadata==6.11.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:1231cf92d825c9e03cfc4da076a16de6422c863558229ea0b22b675657463443 \
-    --hash=sha256:f0afba6205ad8f8947c7d338b5342d5db2afbfd82f9cbef7879a9539cc12eb9b
-mako==1.3.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:2a0c8ad7f6274271b3bb7467dd37cf9cc6dab4bc19cb69a4ef10669402de698e \
-    --hash=sha256:32a99d70754dfce237019d17ffe4a282d2d3351b9c476e90d8a60e63f133b80c
+httpcore==1.0.6 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:27b59625743b85577a8c0e10e55b50b5368a4f2cfe8cc7bcfa9cf00829c2682f \
+    --hash=sha256:73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
+idna==3.10 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \
+    --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3
+importlib-metadata==8.0.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:15584cf2b1bf449d98ff8a6ff1abef57bf20f3ac6454f431736cd3e660921b2f \
+    --hash=sha256:188bd24e4c346d3f0a933f275c2fec67050326a856b9a359881d7c2a697e8812
+jmespath==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02e2e4cc71b5bcab88332eebf907519190dd9e6e82107fa7f83b1003a6252980 \
+    --hash=sha256:90261b206d6defd58fdd5e85f478bf633a2901798906be2ad389150c5c60edbe
+mako==1.3.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:260f1dbc3a519453a9c856dedfe4beb4e50bd5a26d96386cb6c80856556bb91a \
+    --hash=sha256:48dbc20568c1d276a2698b36d968fa76161bf127194907ea6fc594fa81f943bc
 markupsafe==2.1.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf \
     --hash=sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff \
@@ -472,18 +515,18 @@ pika==1.3.2 ; python_version >= "3.10" and python_version < "4.0" \
 prometheus-client==0.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0836af6eb2c8f4fed712b2f279f6c0a8bbab29f9f4aa15276b91c7cb0d1616ab \
     --hash=sha256:a03e35b359f14dd1630898543e2120addfdeacd1a6069c1367ae90fd93ad3f48
-protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:19b270aeaa0099f16d3ca02628546b8baefe2955bbe23224aaf856134eccf1e4 \
-    --hash=sha256:209ba4cc916bab46f64e56b85b090607a676f66b473e6b762e6f1d9d591eb2e8 \
-    --hash=sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c \
-    --hash=sha256:7c8daa26095f82482307bc717364e7c13f4f1c99659be82890dcfc215194554d \
-    --hash=sha256:c053062984e61144385022e53678fbded7aea14ebb3e0305ae3592fb219ccfa4 \
-    --hash=sha256:d4198877797a83cbfe9bffa3803602bbe1625dc30d8a097365dbc762e5790faa \
-    --hash=sha256:e3c97a1555fd6388f857770ff8b9703083de6bf1f9274a002a332d65fbb56c8c \
-    --hash=sha256:e7cb0ae90dd83727f0c0718634ed56837bfeeee29a5f82a7514c03ee1364c019 \
-    --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
-    --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
-    --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
+protobuf==4.25.5 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0aebecb809cae990f8129ada5ca273d9d670b76d9bfc9b1809f0a9c02b7dbf41 \
+    --hash=sha256:4be0571adcbe712b282a330c6e89eae24281344429ae95c6d85e79e84780f5ea \
+    --hash=sha256:5e61fd921603f58d2f5acb2806a929b4675f8874ff5f330b7d6f7e2e784bbcd8 \
+    --hash=sha256:7a183f592dc80aa7c8da7ad9e55091c4ffc9497b3054452d629bb85fa27c2a45 \
+    --hash=sha256:7f8249476b4a9473645db7f8ab42b02fe1488cbe5fb72fddd445e0665afd8584 \
+    --hash=sha256:919ad92d9b0310070f8356c24b855c98df2b8bd207ebc1c0c6fcc9ab1e007f3d \
+    --hash=sha256:98d8d8aa50de6a2747efd9cceba361c9034050ecce3e09136f90de37ddba66e1 \
+    --hash=sha256:abe32aad8561aa7cc94fc7ba4fdef646e576983edb94a73381b03c53728a626f \
+    --hash=sha256:b0234dd5a03049e4ddd94b93400b67803c823cfc405689688f59b34e0742381a \
+    --hash=sha256:b2fde3d805354df675ea4c7c6338c1aecd254dfc9925e88c6d31a2bcb97eb173 \
+    --hash=sha256:fe14e16c22be926d3abfcb500e60cab068baf10b542b8c858fa27e098123e331
 psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981 \
     --hash=sha256:38a8dcc6856f569068b47de286b472b7c473ac7977243593a288ebce0dc89516 \
@@ -498,114 +541,112 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024 \
     --hash=sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913 \
     --hash=sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c
-pyasn1-modules==0.3.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5bd01446b736eb9d31512a30d46c1ac3395d676c6f3cafa4c03eb54b9925631c \
-    --hash=sha256:d3ccd6ed470d9ffbc716be08bd90efbd44d0734bc9303818f7336070984a162d
-pyasn1==0.5.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:4439847c58d40b1d0a573d07e3856e95333f1976294494c325775aeca506eb58 \
-    --hash=sha256:6d391a96e59b23130a5cfa74d6fd7f388dbbe26cc8f1edf39fdddf08d9d6676c
-pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
-    --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
-pyjwt==2.8.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de \
-    --hash=sha256:59127c392cc44c2da5bb3192169a91f429924e17aff6534d70fdc02ab3e04320
+pyasn1-modules==0.4.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c
+pyasn1==0.6.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:6f580d2bdd84365380830acf45550f2511469f673cb4a5ae3857a3170128b034
+pycparser==2.22 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6 \
+    --hash=sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
+pyjwt==2.9.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:3b02fb0f44517787776cf48f2ae25d8e14f300e6d7545a4315cee571a415e850 \
+    --hash=sha256:7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c
 pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06b8f6fa7f5de8d5d2f7573fe8c863c051225a27b61e6860fd047b1775807858 \
     --hash=sha256:0c84947a22519e013607c9be43706dd42513f9e6ae5d39d3613ca1e142fba44d \
@@ -617,9 +658,9 @@ pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:a36d4a9dda1f19ce6e03c9a784a2921a4b726b02e1c736600ca9c22029474394 \
     --hash=sha256:a422368fc821589c228f4c49438a368831cb5bbc0eab5ebe1d7fac9dded6567b \
     --hash=sha256:e46dae94e34b085175f8abb3b0aaa7da40767865ac82c928eeb9e57e1ea8a543
-python-dateutil==2.9.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:78e73e19c63f5b20ffa567001531680d939dc042bf7850431877645523c66709 \
-    --hash=sha256:cbf2f1da5e6083ac2fbfd4da39a25f34312230110440f424a14c7558bb85d82e
+python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
+    --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
 python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \
     --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a
@@ -632,41 +673,63 @@ requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0" \
 rfc3161ng==2.1.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1e88614da61b22abd591577f9dd39d3a030335f9e8a12d8bc001149c17d0a01e \
     --hash=sha256:81fe7e4488f523c758b1206bf5e72ba2066b78f2812107b1b7bb16a7596e524b
-setuptools==71.0.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:3d8531791a27056f4a38cd3e54084d8b1c4228ff9cf3f2d7dd075ec99f9fd70d \
-    --hash=sha256:f501b6e6db709818dc76882582d9c516bf3b67b948864c5fa1d1624c09a49207
+s3transfer==0.10.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0711534e9356d3cc692fdde846b4a1e4b0cb6519971860796e6bc4c7aea00ef6 \
+    --hash=sha256:eca1c20de70a39daee580aef4986996620f365c4e0fda6a86100231d62f1bf69
+setuptools==75.1.0 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2 \
+    --hash=sha256:d59a21b17a275fb872a9c3dae73963160ae079f1049ed956880cd7c09b120538
 six==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
 sniffio==1.3.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2 \
     --hash=sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc
-sqlalchemy==1.4.51 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0535d5b57d014d06ceeaeffd816bb3a6e2dddeb670222570b8c4953e2d2ea678 \
-    --hash=sha256:0892e7ac8bc76da499ad3ee8de8da4d7905a3110b952e2a35a940dab1ffa550e \
-    --hash=sha256:0d661cff58c91726c601cc0ee626bf167b20cc4d7941c93c5f3ac28dc34ddbea \
-    --hash=sha256:245c67c88e63f1523e9216cad6ba3107dea2d3ee19adc359597a628afcabfbcb \
-    --hash=sha256:2ad16880ccd971ac8e570550fbdef1385e094b022d6fc85ef3ce7df400dddad3 \
-    --hash=sha256:2be4e6294c53f2ec8ea36486b56390e3bcaa052bf3a9a47005687ccf376745d1 \
-    --hash=sha256:2c55040d8ea65414de7c47f1a23823cd9f3fad0dc93e6b6b728fee81230f817b \
-    --hash=sha256:352df882088a55293f621328ec33b6ffca936ad7f23013b22520542e1ab6ad1b \
-    --hash=sha256:3823dda635988e6744d4417e13f2e2b5fe76c4bf29dd67e95f98717e1b094cad \
-    --hash=sha256:38ef80328e3fee2be0a1abe3fe9445d3a2e52a1282ba342d0dab6edf1fef4707 \
-    --hash=sha256:3ec7a0ed9b32afdf337172678a4a0e6419775ba4e649b66f49415615fa47efbd \
-    --hash=sha256:55e699466106d09f028ab78d3c2e1f621b5ef2c8694598242259e4515715da7c \
-    --hash=sha256:6cacc0b2dd7d22a918a9642fc89840a5d3cee18a0e1fe41080b1141b23b10916 \
-    --hash=sha256:7deeae5071930abb3669b5185abb6c33ddfd2398f87660fafdb9e6a5fb0f3f2f \
-    --hash=sha256:86a22143a4001f53bf58027b044da1fb10d67b62a785fc1390b5c7f089d9838c \
-    --hash=sha256:8ca484ca11c65e05639ffe80f20d45e6be81fbec7683d6c9a15cd421e6e8b340 \
-    --hash=sha256:af55cc207865d641a57f7044e98b08b09220da3d1b13a46f26487cc2f898a072 \
-    --hash=sha256:b97fd5bb6b7c1a64b7ac0632f7ce389b8ab362e7bd5f60654c2a418496be5d7f \
-    --hash=sha256:c37bc677690fd33932182b85d37433845de612962ed080c3e4d92f758d1bd894 \
-    --hash=sha256:d3cf56cc36d42908495760b223ca9c2c0f9f0002b4eddc994b24db5fcb86a9e4 \
-    --hash=sha256:e646b19f47d655261b22df9976e572f588185279970efba3d45c377127d35349 \
-    --hash=sha256:e7908c2025eb18394e32d65dd02d2e37e17d733cdbe7d78231c2b6d7eb20cdb9 \
-    --hash=sha256:e8f2df79a46e130235bc5e1bbef4de0583fb19d481eaa0bffa76e8347ea45ec6 \
-    --hash=sha256:eb18549b770351b54e1ab5da37d22bc530b8bfe2ee31e22b9ebe650640d2ef12 \
-    --hash=sha256:f8cafa6f885a0ff5e39efa9325195217bb47d5929ab0051636610d24aef45ade
+sqlalchemy==1.4.54 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:02d2ecb9508f16ab9c5af466dfe5a88e26adf2e1a8d1c56eb616396ccae2c186 \
+    --hash=sha256:0b76bbb1cbae618d10679be8966f6d66c94f301cfc15cb49e2f2382563fb6efb \
+    --hash=sha256:0de620f978ca273ce027769dc8db7e6ee72631796187adc8471b3c76091b809e \
+    --hash=sha256:1183599e25fa38a1a322294b949da02b4f0da13dbc2688ef9dbe746df573f8a6 \
+    --hash=sha256:12bc0141b245918b80d9d17eca94663dbd3f5266ac77a0be60750f36102bbb0f \
+    --hash=sha256:1390ca2d301a2708fd4425c6d75528d22f26b8f5cbc9faba1ddca136671432bc \
+    --hash=sha256:13e91d6892b5fcb94a36ba061fb7a1f03d0185ed9d8a77c84ba389e5bb05e936 \
+    --hash=sha256:14b3f4783275339170984cadda66e3ec011cce87b405968dc8d51cf0f9997b0d \
+    --hash=sha256:1576fba3616f79496e2f067262200dbf4aab1bb727cd7e4e006076686413c80c \
+    --hash=sha256:1990d5a6a5dc358a0894c8ca02043fb9a5ad9538422001fb2826e91c50f1d539 \
+    --hash=sha256:1d83cd1cc03c22d922ec94d0d5f7b7c96b1332f5e122e81b1a61fb22da77879a \
+    --hash=sha256:1e8c1b9ecaf9f2590337d5622189aeb2f0dbc54ba0232fa0856cf390957584a9 \
+    --hash=sha256:26e78444bc77d089e62874dc74df05a5c71f01ac598010a327881a48408d0064 \
+    --hash=sha256:2b37931eac4b837c45e2522066bda221ac6d80e78922fb77c75eb12e4dbcdee5 \
+    --hash=sha256:3112de9e11ff1957148c6de1df2bc5cc1440ee36783412e5eedc6f53638a577d \
+    --hash=sha256:394b0135900b62dbf63e4809cdc8ac923182af2816d06ea61cd6763943c2cc05 \
+    --hash=sha256:3f01c2629a7d6b30d8afe0326b8c649b74825a0e1ebdcb01e8ffd1c920deb07d \
+    --hash=sha256:41cffc63c7c83dfc30c4cab5b4308ba74440a9633c4509c51a0c52431fb0f8ab \
+    --hash=sha256:4470fbed088c35dc20b78a39aaf4ae54fe81790c783b3264872a0224f437c31a \
+    --hash=sha256:5ed3576675c187e3baa80b02c4c9d0edfab78eff4e89dd9da736b921333a2432 \
+    --hash=sha256:6b24364150738ce488333b3fb48bfa14c189a66de41cd632796fbcacb26b4585 \
+    --hash=sha256:6da60fb24577f989535b8fc8b2ddc4212204aaf02e53c4c7ac94ac364150ed08 \
+    --hash=sha256:76c2ba7b5a09863d0a8166fbc753af96d561818c572dbaf697c52095938e7be4 \
+    --hash=sha256:954816850777ac234a4e32b8c88ac1f7847088a6e90cfb8f0e127a1bf3feddff \
+    --hash=sha256:9c24dd161c06992ed16c5e528a75878edbaeced5660c3db88c820f1f0d3fe1f4 \
+    --hash=sha256:a01bc25eb7a5688656c8770f931d5cb4a44c7de1b3cec69b84cc9745d1e4cc10 \
+    --hash=sha256:a19f816f4702d7b1951d7576026c7124b9bfb64a9543e571774cf517b7a50b29 \
+    --hash=sha256:a41611835010ed4ea4c7aed1da5b58aac78ee7e70932a91ed2705a7b38e40f52 \
+    --hash=sha256:a49730afb716f3f675755afec109895cab95bc9875db7ffe2e42c1b1c6279482 \
+    --hash=sha256:a86b0e4be775902a5496af4fb1b60d8a2a457d78f531458d294360b8637bb014 \
+    --hash=sha256:a8a72259a1652f192c68377be7011eac3c463e9892ef2948828c7d58e4829988 \
+    --hash=sha256:af00236fe21c4d4f4c227b6ccc19b44c594160cc3ff28d104cdce85855369277 \
+    --hash=sha256:b05e0626ec1c391432eabb47a8abd3bf199fb74bfde7cc44a26d2b1b352c2c6e \
+    --hash=sha256:b5933c45d11cbd9694b1540aa9076816cc7406964c7b16a380fd84d3a5fe3241 \
+    --hash=sha256:b5e0d47d619c739bdc636bbe007da4519fc953393304a5943e0b5aec96c9877c \
+    --hash=sha256:b67589f7955924865344e6eacfdcf70675e64f36800a576aa5e961f0008cde2a \
+    --hash=sha256:c5a2530400a6e7e68fd1552a55515de6a4559122e495f73554a51cedafc11669 \
+    --hash=sha256:cafe0ba3a96d0845121433cffa2b9232844a2609fce694fcc02f3f31214ece28 \
+    --hash=sha256:cdb2886c0be2c6c54d0651d5a61c29ef347e8eec81fd83afebbf7b59b80b7393 \
+    --hash=sha256:d0cf7076c8578b3de4e43a046cc7a1af8466e1c3f5e64167189fe8958a4f9c02 \
+    --hash=sha256:f1e1b92ee4ee9ffc68624ace218b89ca5ca667607ccee4541a90cc44999b9aea \
+    --hash=sha256:f941aaf15f47f316123e1933f9ea91a6efda73a161a6ab6046d1cde37be62c88 \
+    --hash=sha256:fb59a11689ff3c58e7652260127f9e34f7f45478a2f3ef831ab6db7bcd72108f \
+    --hash=sha256:fc9ffd9a38e21fad3e8c5a88926d57f94a32546e937e0be46142b2702003eba7
 starlette==0.37.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:6fe59f29268538e5d0d182f2791a479a0c64638e6935d1c6989e63fb2699c6ee \
     --hash=sha256:9af890290133b79fc3db55474ade20f6220a364a0402e0b556e7cd5e1e093823
@@ -676,9 +739,9 @@ structlog==24.4.0 ; python_version >= "3.10" and python_version < "4.0" \
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -753,6 +816,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/bytes/tests/client.py b/bytes/tests/client.py
index 6996d1e821b..8a685548ab1 100644
--- a/bytes/tests/client.py
+++ b/bytes/tests/client.py
@@ -1,13 +1,15 @@
 import typing
+from base64 import b64encode
 from collections.abc import Callable
 from functools import wraps
 from typing import Any
 from uuid import UUID
 
 import httpx
-from httpx import HTTPError
+from httpx import HTTPError, HTTPStatusError
 
-from bytes.models import BoefjeMeta, NormalizerMeta
+from bytes.api.models import BoefjeOutput
+from bytes.models import BoefjeMeta, NormalizerMeta, RawDataMeta
 from bytes.repositories.meta_repository import BoefjeMetaFilter, NormalizerMetaFilter, RawDataFilter
 
 BYTES_API_CLIENT_VERSION = "0.2"
@@ -21,7 +23,7 @@ def wrapper(self, *args, **kwargs):  # type: ignore
         try:
             return function(self, *args, **kwargs)
         except HTTPError as error:
-            if error.response.status_code != 401:
+            if not isinstance(error, HTTPStatusError) or error.response.status_code != 401:
                 raise
 
             self.login()
@@ -89,7 +91,7 @@ def get_boefje_meta_by_id(self, boefje_meta_id: UUID) -> BoefjeMeta:
         self._verify_response(response)
 
         boefje_meta_json = response.json()
-        return BoefjeMeta.parse_obj(boefje_meta_json)
+        return BoefjeMeta.model_validate(boefje_meta_json)
 
     @retry_with_login
     def get_boefje_meta(self, query_filter: BoefjeMetaFilter) -> list[BoefjeMeta]:
@@ -97,7 +99,7 @@ def get_boefje_meta(self, query_filter: BoefjeMetaFilter) -> list[BoefjeMeta]:
         self._verify_response(response)
 
         boefje_meta_json = response.json()
-        return [BoefjeMeta.parse_obj(boefje_meta) for boefje_meta in boefje_meta_json]
+        return [BoefjeMeta.model_validate(boefje_meta) for boefje_meta in boefje_meta_json]
 
     @retry_with_login
     def save_normalizer_meta(self, normalizer_meta: NormalizerMeta) -> None:
@@ -111,7 +113,7 @@ def get_normalizer_meta_by_id(self, normalizer_meta_id: UUID) -> NormalizerMeta:
         self._verify_response(response)
 
         normalizer_meta_json = response.json()
-        return NormalizerMeta.parse_obj(normalizer_meta_json)
+        return NormalizerMeta.model_validate(normalizer_meta_json)
 
     @retry_with_login
     def get_normalizer_meta(self, query_filter: NormalizerMetaFilter) -> list[NormalizerMeta]:
@@ -119,26 +121,41 @@ def get_normalizer_meta(self, query_filter: NormalizerMetaFilter) -> list[Normal
         self._verify_response(response)
 
         normalizer_meta_json = response.json()
-        return [NormalizerMeta.parse_obj(normalizer_meta) for normalizer_meta in normalizer_meta_json]
+        return [NormalizerMeta.model_validate(normalizer_meta) for normalizer_meta in normalizer_meta_json]
 
     @retry_with_login
     def save_raw(self, boefje_meta_id: UUID, raw: bytes, mime_types: list[str] | None = None) -> str:
         if not mime_types:
             mime_types = []
 
-        headers = {"content-type": "application/octet-stream"}
-
+        file_name = "raw"  # The name provides a key for all ids returned, so this is arbitrary as we only upload 1 file
         response = self.client.post(
             "/bytes/raw",
-            content=raw,
-            headers=headers,
-            params={"mime_types": mime_types, "boefje_meta_id": str(boefje_meta_id)},
+            json={
+                "files": [
+                    {
+                        "name": file_name,
+                        "content": b64encode(raw).decode(),
+                        "tags": mime_types,
+                    }
+                ],
+            },
+            params={"boefje_meta_id": str(boefje_meta_id)},
         )
+        self._verify_response(response)
+
+        return response.json()[file_name]
 
+    @retry_with_login
+    def save_raws(self, boefje_meta_id: UUID, boefje_output: BoefjeOutput) -> dict[str, str]:
+        response = self.client.post(
+            "/bytes/raw",
+            content=boefje_output.model_dump_json(),
+            params={"boefje_meta_id": str(boefje_meta_id)},
+        )
         self._verify_response(response)
-        raw_id = response.json()["id"]
 
-        return str(raw_id)
+        return response.json()
 
     @retry_with_login
     def get_raw(self, raw_id: UUID) -> bytes:
@@ -147,6 +164,13 @@ def get_raw(self, raw_id: UUID) -> bytes:
 
         return response.content
 
+    @retry_with_login
+    def get_raw_meta(self, raw_id: UUID) -> RawDataMeta:
+        response = self.client.get(f"/bytes/raw/{raw_id}/meta")
+        self._verify_response(response)
+
+        return RawDataMeta.model_validate(response.json())
+
     @retry_with_login
     def get_raws(self, query_filter: RawDataFilter) -> dict[str, str]:
         params = query_filter.model_dump(exclude_none=True)
diff --git a/bytes/tests/integration/test_bytes_api.py b/bytes/tests/integration/test_bytes_api.py
index 95122aaeea0..c5865f4962b 100644
--- a/bytes/tests/integration/test_bytes_api.py
+++ b/bytes/tests/integration/test_bytes_api.py
@@ -1,10 +1,12 @@
 import uuid
+from base64 import b64encode
 
 import httpx
 import pytest
 from httpx import HTTPError
 from prometheus_client.parser import text_string_to_metric_families
 
+from bytes.api.models import BoefjeOutput, File
 from bytes.models import MimeType
 from bytes.rabbitmq import RabbitMQEventManager
 from bytes.repositories.meta_repository import BoefjeMetaFilter, NormalizerMetaFilter, RawDataFilter
@@ -147,7 +149,10 @@ def test_normalizer_meta(bytes_api_client: BytesAPIClient, event_manager: Rabbit
     normalizer_meta.raw_data.hash_retrieval_link = retrieved_normalizer_meta.raw_data.hash_retrieval_link
     normalizer_meta.raw_data.signing_provider_url = retrieved_normalizer_meta.raw_data.signing_provider_url
 
-    assert normalizer_meta.dict() == retrieved_normalizer_meta.dict()
+    normalizer_meta.raw_data.mime_types = sorted(normalizer_meta.raw_data.mime_types)
+    retrieved_normalizer_meta.raw_data.mime_types = sorted(retrieved_normalizer_meta.raw_data.mime_types)
+
+    assert normalizer_meta.model_dump_json() == retrieved_normalizer_meta.model_dump_json()
 
 
 def test_filtered_normalizer_meta(bytes_api_client: BytesAPIClient) -> None:
@@ -231,6 +236,23 @@ def test_raw(bytes_api_client: BytesAPIClient, event_manager: RabbitMQEventManag
     assert str(boefje_meta.id) in body.decode()
 
 
+def test_raw_big(bytes_api_client: BytesAPIClient, event_manager: RabbitMQEventManager) -> None:
+    boefje_meta = get_boefje_meta()
+    bytes_api_client.save_boefje_meta(boefje_meta)
+
+    raw = b"test 123" * 100000
+    raw_id = bytes_api_client.save_raw(boefje_meta.id, raw)
+
+    retrieved_raw = bytes_api_client.get_raw(raw_id)
+
+    assert retrieved_raw == raw
+
+    method, properties, body = event_manager.connection.channel().basic_get("test__raw_file_received")
+    event_manager.connection.channel().basic_ack(method.delivery_tag)
+
+    assert str(boefje_meta.id) in body.decode()
+
+
 def test_save_raw_with_one_mime_type(bytes_api_client: BytesAPIClient) -> None:
     boefje_meta = get_boefje_meta(meta_id=uuid.uuid4())
     bytes_api_client.save_boefje_meta(boefje_meta)
@@ -255,21 +277,30 @@ def test_save_raw_no_mime_types(bytes_api_client: BytesAPIClient) -> None:
     boefje_meta = get_boefje_meta(meta_id=uuid.uuid4())
     bytes_api_client.save_boefje_meta(boefje_meta)
 
-    headers = {"content-type": "application/octet-stream"}
     bytes_api_client.login()
-    headers.update(bytes_api_client.client.headers)
 
     raw_url = f"{bytes_api_client.client.base_url}/bytes/raw"
 
     raw = b"second test 123456"
+    file_name = "raw"
     response = httpx.post(
-        raw_url, content=raw, headers=headers, params={"boefje_meta_id": str(boefje_meta.id)}, timeout=30
+        raw_url,
+        json={
+            "files": [
+                {
+                    "name": file_name,
+                    "content": b64encode(raw).decode(),
+                    "tags": [],
+                }
+            ]
+        },
+        headers=bytes_api_client.client.headers,
+        params={"boefje_meta_id": str(boefje_meta.id)},
     )
-
     assert response.status_code == 200
 
     get_raw_without_mime_type_response = httpx.get(
-        f"{raw_url}/{response.json().get('id')}", headers=bytes_api_client.client.headers, timeout=30
+        f"{raw_url}/{response.json()[file_name]}", headers=bytes_api_client.client.headers, timeout=30
     )
 
     assert get_raw_without_mime_type_response.status_code == 200
@@ -284,8 +315,18 @@ def test_raw_mimes(bytes_api_client: BytesAPIClient) -> None:
 
     raw = b"test 123456"
     second_raw = b"second test 200"
-    bytes_api_client.save_raw(boefje_meta.id, raw, mime_types)
-    bytes_api_client.save_raw(boefje_meta.id, second_raw, second_mime_types)
+    first_id = bytes_api_client.save_raw(boefje_meta.id, raw, mime_types)
+    second_id = bytes_api_client.save_raw(boefje_meta.id, second_raw, second_mime_types)
+
+    first_meta = bytes_api_client.get_raw_meta(first_id)
+    second_meta = bytes_api_client.get_raw_meta(second_id)
+
+    assert first_meta.id != second_meta.id
+    assert {x.value for x in first_meta.mime_types} == set(mime_types)
+    assert {x.value for x in second_meta.mime_types} == set(second_mime_types)
+
+    assert bytes_api_client.get_raw(first_id) == raw
+    assert bytes_api_client.get_raw(second_id) == second_raw
 
     retrieved_raws = bytes_api_client.get_raws(
         RawDataFilter(
@@ -293,13 +334,13 @@ def test_raw_mimes(bytes_api_client: BytesAPIClient) -> None:
         )
     )
     assert len(retrieved_raws) == 1
-    assert retrieved_raws[0]["mime_types"] == [{"value": value} for value in mime_types]
+    assert {x["value"] for x in retrieved_raws[0]["mime_types"]} == set(mime_types)
 
     retrieved_raws = bytes_api_client.get_raws(
         RawDataFilter(boefje_meta_id=boefje_meta.id, normalized=False, mime_types=[MimeType(value="text/html")])
     )
     assert len(retrieved_raws) == 1
-    assert retrieved_raws[0]["mime_types"] == [{"value": value} for value in mime_types]
+    assert {x["value"] for x in retrieved_raws[0]["mime_types"]} == set(mime_types)
 
     retrieved_raws = bytes_api_client.get_raws(
         RawDataFilter(boefje_meta_id=boefje_meta.id, normalized=False, mime_types=[MimeType(value="bad/mime")])
@@ -336,3 +377,25 @@ def test_cannot_overwrite_raw(bytes_api_client: BytesAPIClient) -> None:
     retrieved_raw = bytes_api_client.get_raw(first_raw_id)
 
     assert retrieved_raw == right_raw
+
+
+def test_save_multiple_raw_files(bytes_api_client: BytesAPIClient) -> None:
+    boefje_meta = get_boefje_meta()
+    bytes_api_client.save_boefje_meta(boefje_meta)
+
+    first_raw = b"first"
+    second_raw = b"second"
+    boefje_output = BoefjeOutput(
+        files=[
+            File(name="first", content=b64encode(first_raw).decode(), tags=[]),
+            File(name="second", content=b64encode(second_raw).decode(), tags=["mime", "type"]),
+        ]
+    )
+
+    ids = bytes_api_client.save_raws(boefje_meta.id, boefje_output)
+
+    assert bytes_api_client.get_raw(ids["first"]) == first_raw
+    assert bytes_api_client.get_raw(ids["second"]) == second_raw
+
+    assert bytes_api_client.get_raw_meta(ids["first"]).mime_types == set()
+    assert {x.value for x in bytes_api_client.get_raw_meta(ids["second"]).mime_types} == {"mime", "type"}
diff --git a/bytes/tests/integration/test_migrations.py b/bytes/tests/integration/test_migrations.py
index eb3a29c0c4f..4967d847470 100644
--- a/bytes/tests/integration/test_migrations.py
+++ b/bytes/tests/integration/test_migrations.py
@@ -13,15 +13,15 @@ def test_clean_mime_types(meta_repository: SQLMetaDataRepository) -> None:
         meta_repository.save_boefje_meta(boefje_meta)
 
         raw = get_raw_data()
-        raw.mime_types.append(MimeType(value=raw.boefje_meta.boefje.id))
+        raw.mime_types.add(MimeType(value=raw.boefje_meta.boefje.id))
         raw_id_1 = meta_repository.save_raw(raw)
 
-        raw.mime_types.append(
+        raw.mime_types.add(
             MimeType(value=f"boefje/{raw.boefje_meta.boefje.id}-ce293f79fd3c809a300a2837bb1da4f7115fc034a1f78")
         )
         raw_id_2 = meta_repository.save_raw(raw)
 
-        raw.mime_types.append(
+        raw.mime_types.add(
             MimeType(value=f"boefje/{raw.boefje_meta.boefje.id}-ba293f79fd3c809a300a2837bb1da4f7115fc034a1f78")
         )
         raw_id_3 = meta_repository.save_raw(raw)
diff --git a/bytes/tests/unit/test_context_mapping.py b/bytes/tests/unit/test_context_mapping.py
index 62f303f2c46..61147f84414 100644
--- a/bytes/tests/unit/test_context_mapping.py
+++ b/bytes/tests/unit/test_context_mapping.py
@@ -62,7 +62,7 @@ def test_context_mapping_raw() -> None:
     assert raw_data.hash_retrieval_link == raw_data_in_db.hash_retrieval_link
     assert raw_data.secure_hash == raw_data_in_db.secure_hash
     assert raw_data.signing_provider_url is None
-    assert raw_data.mime_types == [to_mime_type(mime_type) for mime_type in raw_data_in_db.mime_types]
+    assert raw_data.mime_types == {to_mime_type(mime_type) for mime_type in raw_data_in_db.mime_types}
 
     raw_data_new = to_raw_data(raw_data_in_db, raw_data.value)
 
diff --git a/cveapi/poetry.lock b/cveapi/poetry.lock
index 1a6a8b170e0..58d50c02c55 100644
--- a/cveapi/poetry.lock
+++ b/cveapi/poetry.lock
@@ -22,13 +22,13 @@ trio = ["trio (>=0.23)"]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -65,13 +65,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -86,6 +86,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
diff --git a/cveapi/requirements.txt b/cveapi/requirements.txt
index 4ecbe5e20a7..f436f513d83 100644
--- a/cveapi/requirements.txt
+++ b/cveapi/requirements.txt
@@ -1,18 +1,18 @@
 anyio==4.3.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:048e05d0f6caeed70d731f3db756d35dcc1f35747c8c403364a8332c630441b8 \
     --hash=sha256:f75253795a87df48568485fd18cdd2a3fa5c4f7c5be8e5e36637733fce06fed6
-certifi==2024.7.4 ; python_version >= "3.11" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.11" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 h11==0.14.0 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.11" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.11" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.11" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
diff --git a/docker-compose.release-example.yml b/docker-compose.release-example.yml
index 9469c26bff7..c90b1bf7bdb 100644
--- a/docker-compose.release-example.yml
+++ b/docker-compose.release-example.yml
@@ -31,7 +31,7 @@ services:
       APPS: "ROCKY BYTES KATALOGUS SCHEDULER"
 
   crux:
-    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.0.8"
+    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.1.0"
     restart: on-failure
     ports:
       - "127.0.0.1:3000:3000"
diff --git a/docker-compose.yml b/docker-compose.yml
index a1b1a486639..5b13236e92c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -154,6 +154,27 @@ services:
       - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL:-}
       - GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN=${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN:-}
 
+  rocky_worker:
+    restart: unless-stopped
+    depends_on:
+      - postgres
+    build:
+      context: .
+      dockerfile: rocky/Dockerfile
+      target: dev
+      args:
+        ENVIRONMENT: dev
+    command: python3 manage.py worker
+    volumes:
+      - ./rocky:/app/rocky
+      - ./octopoes/octopoes:/app/rocky/octopoes
+    env_file:
+      - .env-defaults
+      - .env
+    environment:
+      - GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL:-}
+      - GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN=${GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN:-}
+
   bytes:
     restart: unless-stopped
     depends_on:
diff --git a/docs/source/developer_documentation/boefjes.md b/docs/source/developer_documentation/boefjes.md
index 553dfddd74e..2a8c4737138 100644
--- a/docs/source/developer_documentation/boefjes.md
+++ b/docs/source/developer_documentation/boefjes.md
@@ -51,13 +51,13 @@ although this would be more complicated.
 ## Environment variables
 
 By design, Boefjes do not have access to the host system's environment variables.
-If a Boefje requires access to an environment variable (e.g. `HTTP_PROXY` or `USER_AGENT`), it should note as such in its `boefje.json` manifest.
+If a Boefje requires access to an environment variable (e.g. `HTTP_PROXY` or `USER_AGENT`), it should note as such in its `schema.json`.
 The system-wide variables can be set as environment variable to the boefjes runner by prefixing it with `BOEFJE_`.
 This is to prevent a Boefje from accessing variables it should not have access to, such as secrets.
 To illustrate: if `BOEFJE_HTTP_PROXY=https://proxy:8080` environment variable is configured, the Boefje can access it as `HTTP_PROXY`.
 This feature can also be used to set default values for KAT-alogus settings. For example, configuring the `BOEFJE_TOP_PORTS` environment variable
 will set the default value for the `TOP_PORTS` setting (used by the nmap Boefje).
-This default value can be overridden by setting any value for `TOP_PORTS` in the KAT-alogus.
+This default value can be overridden per organisation by setting any value for `TOP_PORTS` in the KAT-alogus.
 
 ## Technical Design
 
diff --git a/docs/source/developer_documentation/development_tutorial/creating_a_boefje.md b/docs/source/developer_documentation/development_tutorial/creating_a_boefje.md
index dbb2f3bdc70..be2569b928a 100644
--- a/docs/source/developer_documentation/development_tutorial/creating_a_boefje.md
+++ b/docs/source/developer_documentation/development_tutorial/creating_a_boefje.md
@@ -1,4 +1,42 @@
-# Creating a boefje
+# Creating a Boefje
+
+There are two ways to create a Boefje. The first is to create a Boefje with the User Interface (UI). The second option is to create it in the backend.
+
+## Boefje variants
+
+Boefje variants are Boefjes that use the same container image. In OpenKAT, all Boefjes with the same container image will be seen as 'variants' of each other and will be shown together on those Boefje detail pages.
+
+## Creating a Boefje (variant) in the User Interface
+
+**Note:** Currently, only admins are able to create Boefjes in the UI.
+
+To create a **new** Boefje, go to the KAT-alogus. Here you will find the _'Add Boefje'_ button.
+To create a **variant** of an existing Boefje, go to the Boefje detail page of the Boefje you would like to use as a template and press the _'Add variant'_ button.
+
+### Set up your Boefje
+
+You will be directed to the Setup page, where you can configure your Boefje. The following items can be filled in:
+
+| Field             | Required | Explanation                                                                                                                                                                                                                                                                                                                             |
+| ----------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Container image   | Yes      | The name of the Docker image. For example: _'ghcr.io/minvws/openkat/nmap'_                                                                                                                                                                                                                                                              |
+| Name              | Yes      | Give your Boefje a suitable name. This name will be visible in the KAT-alogus.                                                                                                                                                                                                                                                          |
+| Description       | No       | A description of the Boefje explaining in short what it can do. This will both be displayed inside the KAT-alogus and on the Boefje details page.                                                                                                                                                                                       |
+| Arguments         | No       | For example: _'-sTU --top-ports 1000'_                                                                                                                                                                                                                                                                                                  |
+| Json Schema       | No       | If any other settings are needed for your Boefje, add these as a JSON Schema, otherwise, leave the field empty or 'null'. This JSON is used as the basis for a form for the user. When the user enables this Boefje they can get the option to give extra information. For example, it can contain an API key that the script requires. |
+| Input object type | No       | Select the object type(s) that your Boefje consumes.                                                                                                                                                                                                                                                                                    |
+| Output mime-types | No       | Add a set of mime-types that are produced by this Boefje, separated by commas. For example: _'text/html'_, _'image/jpeg'_ or _'boefje/{boefje-id}'_. These output mime-types will be shown on the Boefje detail page as information for other users.                                                                                    |
+| Clearance level   | No       | Select a clearance level for your Boefje, which indicates the clearance level the OOI's need before your Boefje will be scheduled on them.                                                                                                                                                                                              |
+
+### Using your Boefje
+
+After finishing the setup and creating your Boefje, you can view it in the KAT-alogus for All Organizations in your OpenKAT-install. The Boefje detail page will show you all the detailed information about your newly created Boefje. Both on the KAT-alogus as on the Boefje detail page, you can enable or disable your Boefje.
+
+### Updating your Boefje
+
+To update your Boefje, you go to the _'Variants'_ section on the Boefje detail page. Expand the table row of the Boefje you want to change and press the _'Edit Boefje'_ button.
+
+## Creating a boefje in the code
 
 Inside `boefjes/boefjes/plugins/` create a new folder with a name starting with `kat_` for this example we use `kat_hello_katty`
 
@@ -14,11 +52,11 @@ $ tree boefjes/boefjes/plugins/kat_hello_katty/
 └── schema.json
 ```
 
-## `__init__.py`
+### `__init__.py`
 
 This file stays empty.
 
-## `boefje.json`
+### `boefje.json`
 
 This file contains information about our boefje. For example, this file contains information about what OOIs our boefje should be looking out for. Here is the example we will be using:
 
@@ -28,7 +66,6 @@ This file contains information about our boefje. For example, this file contains
   "name": "Hello Katty",
   "description": "A simple boefje that can say hello",
   "consumes": ["IPAddressV4", "IPAddressV6"],
-  "environment_keys": ["MESSAGE", "NUMBER"],
   "scan_level": 0,
   "oci_image": "openkat/hello-katty"
 }
@@ -38,22 +75,22 @@ This file contains information about our boefje. For example, this file contains
 - **`name`**: A name to display in the KAT-alogus.
 - **`description`**: A description in the KAT-alogus.
 - **`consumes`**: A list of OOI types that trigger the boefje to run. Whenever one of these OOIs gets added, this boefje will run with that OOI. In our case, we will run our boefje whenever a new IPAddressV4 or IPAddressV6 gets added.
-- **`environment_keys`**: A list of inputs provided by the user. More information about these inputs can be found in `schema.json`. OpenKAT also provides some environment variables.
 - **`scan_level`**: A scan level that decides how intrusively this boefje will scan the provided OOIs. Since we will not make any external requests our boefje will have a scan level of 0.
 - **`oci_image`**: The name of the docker image that is provided inside `boefjes/Makefile`
 
-## `cover.jpg`
+### `cover.jpg`
 
 This file has to be an image of the developer's cat. This image will be used as a thumbnail for the boefje.
 
-## `description.md`
+### `description.md`
 
 This file contains a description of the boefje to explain to the user what this boefje does. For this example we can leave this empty.
 
-## `schema.json`
+### `schema.json`
 
-This JSON is used as the basis for a form for the user. When the user enables this boefje they can get the option to give extra information. For example, it can contain an API key that the script requires.
-This is an example of a `schema.json` file:
+To allow the user to pass information to a boefje runtime, add a schema.json file to the folder where your boefje is located.
+This can be used, for example, to add an API key that the script requires.
+It must conform to the https://json-schema.org/ standard, for example:
 
 ```json
 {
@@ -78,6 +115,24 @@ This is an example of a `schema.json` file:
 }
 ```
 
+This JSON defines which additional environment variables can be set for the boefje.
+There are two ways to do this.
+Firstly, using this schema as an example, you could set the `BOEFJE_MESSAGE` environment variable in the boefje runtime.
+Prepending the key with `BOEFJE_` provides an extra safeguard.
+Note that setting an environment variable means this configuration is applied to _all_ organisations.
+Secondly, if you want to avoid setting environment variables or configure it for just one organisation,
+it is also possible to set the API key through the KAT-alogus.
+Navigate to the boefje detail page of Shodan to find the schema as a form.
+These values take precedence over the environment variables.
+This is also a way to test whether the schema is properly understood for your boefje.
+If encryption has been set up for the KATalogus, all keys provided through this form are stored encrypted in the database.
+
+Although the Shodan boefje defines an API key, the schema could contain anything your boefje needs.
+However, OpenKAT currently officially only supports "string" and "integer" properties that are one level deep.
+Because keys may be passed through environment variables,
+schema validation does not happen right away when settings are added or boefjes enabled.
+Schema validation happens right before spawning a boefje, meaning your tasks will fail if is missing a required variable.
+
 - `title`: This should always contain a string containing 'Arguments'.
 - `type`: This should always contain a string containing 'object'.
 - `description`: A description of the boefje explaining in short what it can do. This will both be displayed inside the KAT-alogus and on the boefje's page.
@@ -87,7 +142,7 @@ This is an example of a `schema.json` file:
   - `NUMBER`: For this property we ask the user to send us an integer between 0 and 9.
 - `required`: In here we need to give a list of the objects' names that the user has to provide to run our boefje. For this example, we will only require the user to give us the `MESSAGE` variable. We do this by adding `"MESSAGE"` to the `required` list.
 
-## `main.py`
+### `main.py`
 
 This is the file where the boefje's meowgic happens. This file has to contain a run method that accepts a dictionary and returns a `list[tuple[set, bytes | str]]`.
 This function will run whenever a new OOI gets created with one of the types mentioned in `consumes` inside `boefje.json`. :
diff --git a/docs/source/developer_documentation/development_tutorial/creating_a_normalizer.md b/docs/source/developer_documentation/development_tutorial/creating_a_normalizer.md
index e4d4ecf5295..49576d7ca15 100644
--- a/docs/source/developer_documentation/development_tutorial/creating_a_normalizer.md
+++ b/docs/source/developer_documentation/development_tutorial/creating_a_normalizer.md
@@ -29,6 +29,7 @@ Here is an example of how our `normalizer.json` can look like:
 ```json
 {
   "id": "hello-katty-normalize",
+  "name": "hello katty normalizer",
   "consumes": ["boefje/hello-katty"],
   "produces": ["IPAddressV6", "IPAddressV4", "Network", "Greeting"]
 }
@@ -45,7 +46,6 @@ import json
 from collections.abc import Iterable
 from ipaddress import AddressValueError, IPv4Network, NetmaskValueError
 
-from boefjes.job_models import NormalizerMeta
 from octopoes.models import OOI
 from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, Network
 from octopoes.models.ooi.greeting import Greeting
@@ -58,13 +58,13 @@ def is_ipv4(string: str) -> bool:
     except (AddressValueError, NetmaskValueError, ValueError) as e:
         return False
 
-def run(normalizer_meta: NormalizerMeta, raw: bytes | str) -> Iterable[OOI]:
+def run(input_ooi: dict, raw: bytes) -> Iterable[OOI]:
     """Function that gets run to produce OOIs from the boefje it consumes"""
 
     data_string = str(raw, "utf-8")
     data: dict = json.loads(data_string)
 
-    network = Network(name=normalizer_meta.raw_data.boefje_meta.arguments["input"]["network"]["name"])
+    network = Network(name=input_ooi["network"]["name"])
     yield network
 
     ip = None
diff --git a/docs/source/developer_documentation/development_tutorial/creating_a_report.md b/docs/source/developer_documentation/development_tutorial/creating_a_report.md
index 86bbbb7eee2..21a1058b088 100644
--- a/docs/source/developer_documentation/development_tutorial/creating_a_report.md
+++ b/docs/source/developer_documentation/development_tutorial/creating_a_report.md
@@ -50,7 +50,7 @@ class GreetingsReport(Report):
     id = "greetings-report"
     name = _("Greetings report")
     description = _("Makes a nice report about the selected greeting objects")
-    plugins = {"required": [], "optional": []}
+    plugins = {"required": set(), "optional": set()}
     input_ooi_types = {Greeting, IPAddressV4, IPAddressV6}
     template_path = "greetings_report/report.html"
 
diff --git a/docs/source/introduction/makeyourown.rst b/docs/source/introduction/makeyourown.rst
index 226b2dfcb5c..04d9979b694 100644
--- a/docs/source/introduction/makeyourown.rst
+++ b/docs/source/introduction/makeyourown.rst
@@ -15,7 +15,7 @@ What types of plugins are available?
 
 There are three types of plugins, deployed by OpenKAT to collect information, translate it into objects for the data model and then analyze it. Boefjes gather facts, Whiskers structure the information for the data model and Bits determine what you want to think about it; they are the business rules. Each action is cut into the smallest possible pieces.
 
-- Boefjes gather factual information, such as by calling an external scanning tool like nmap or using a database like shodan.
+- Boefjes gather factual information, such as by calling an external scanning tool like nmap or using a database like Shodan.
 
 - Whiskers analyze the information and turn it into objects for the data model in Octopoes.
 
@@ -51,7 +51,7 @@ To make a finding about a CVE to a software version, you need multiple objects:
 Existing boefjes
 ================
 
-The existing boefjes can be viewed via the KATalog in OpenKAT and are on `GitHUB in the boefjes repository. <https://github.com/minvws/nl-kat-boefjes/tree/main/boefjes>`_
+The existing boefjes can be viewed via the KATalog in OpenKAT and are on `GitHub in the boefjes repository. <https://github.com/minvws/nl-kat-boefjes/tree/main/boefjes>`_
 
 Object-types, classes and objects.
 ----------------------------------
@@ -65,7 +65,7 @@ When we talk about objects, we usually mean instance of such a class, or a 'reco
 Example: the boefje for shodan
 ------------------------------
 
-The boefje calling shodan gives a good first impression of its capabilities. The boefje includes the following files.
+The boefje calling Shodan gives a good first impression of its capabilities. The boefje includes the following files.
 
 - __init.py__, which remains empty
 - boefje.json, containing the normalizers and object-types in the data model
@@ -75,7 +75,7 @@ The boefje calling shodan gives a good first impression of its capabilities. The
 - normalize.py, the normalizer (whiskers)
 - normalizer.json, which accepts and supplies the normalizer
 - requirements.txt, with the requirements for this boefje
-- schema.json, settings for the web interface
+- schema.json, settings for the web interface formatted as JSON Schema
 
 boefje.json
 ***********
@@ -99,7 +99,6 @@ An example:
             "IPPort",
             "CVEFindingType"
         ],
-        "environment_keys": ["SHODAN_API"],
         "scan_level": 1
     }
 
@@ -111,15 +110,15 @@ Using the template as a base, you can create a boefje.json for your own boefje.
 
 NOTE: If your boefje needs object-types that do not exist, you will need to create those. This will be described later in the document.
 
-The boefje also uses variables from the web interface, like the Shodan the API key. There are more possibilities, you can be creative with this and let the end user bring settings from the web interface. Use *environment_keys* for this. The schema.json file defines the metadata for these fields.
+The boefje also uses variables from the web interface, like the Shodan the API key. There are more possibilities, you can be creative with this and let the end user bring settings from the web interface. Use environment variables or KATalogus settings for this. The schema.json file defines the metadata for these fields.
 
 
 schema.json
 ***********
 
-To allow the user to add information through the web interface, add the schema.json file to the folder where your boefje is located. This json is used as the basis for a form for the user. In this case, it can contain an API key, but it can also be something else that your boefje responds to. This Schema must conform to the https://json-schema.org/ standard.
-
-Currently, however, OpenKAT only understands fairly shallow structures. For example, not all field types are supported, nor does OpenKAT understand references. You can test whether your Schema is neatly understood by checking the settings form in Rocky's KAT catalog for your boefje.
+To allow the user to pass information to a boefje runtime, add a schema.json file to the folder where your boefje is located.
+This can be used, for example, to add an API key that the script requires.
+It must conform to the https://json-schema.org/ standard, see for example the schema.json for Shodan:
 
 .. code-block:: json
 
@@ -139,6 +138,24 @@ Currently, however, OpenKAT only understands fairly shallow structures. For exam
   ]
  }
 
+This JSON defines which additional environment variables can be set for the boefje.
+There are two ways to do this.
+Firstly, using the Shodan schema as an example, you could set the ``BOEFJE_SHODAN_API`` environment variable in the boefje runtime.
+Prepending the key with ``BOEFJE_`` provides an extra safeguard.
+Note that setting an environment variable means this configuration is applied to _all_ organisations.
+Secondly, if you want to avoid setting environment variables or configure it for just one organisation,
+it is also possible to set the API key through the KAT-alogus.
+Navigate to the boefje detail page of Shodan to find the schema as a form.
+These values take precedence over the environment variables.
+This is also a way to test whether the schema is properly understood for your boefje.
+If encryption has been set up for the KATalogus, all keys provided through this form are stored encrypted in the database.
+
+Although the Shodan boefje defines an API key, the schema could contain anything your boefje needs.
+However, OpenKAT currently only officially supports "string" and "integer" properties that are one level deep.
+Because keys may be passed through environment variables,
+schema validation does not happen right away when settings are added or boefjes enabled.
+Schema validation happens right before spawning a boefje, meaning your tasks will fail if is missing a required variable.
+
 main.py
 *******
 
@@ -190,8 +207,8 @@ normalizer.json
 
 The normalizers translate the output of a boefje into objects that fit the data model.
 Each normalizer defines what input it accepts and what object-types it provides.
-In the case of the shodan normalizer,
-it involves the entire output of the shodan boefje (created based on IP address),
+In the case of the Shodan normalizer,
+it involves the entire output of the Shodan boefje (created based on IP address),
 where findings and ports come out. The `normalizer.json` defines these:
 
 .. code-block:: json
@@ -295,7 +312,7 @@ If you want to add an object-type, you need to know with which other object-type
 
 Adding object-types to the data model requires an addition in octopus. Here, an object-type can be added if it is connected to other object-types. Visually this is well understood using the `Graph explorer <https://mispo.es/model-explorer/model-explorer.html>`_. The actual code is `in the Octopoes repo <https://github.com/minvws/nl-kat-octopoes/tree/main/octopoes/models/ooi>`_.
 
-As with the boefje for shodan, here we again use the example from the functional documentation. A description of an object-type in the data model, in this case an IPPort, looks like this:
+As with the boefje for Shodan, here we again use the example from the functional documentation. A description of an object-type in the data model, in this case an IPPort, looks like this:
 
 
 .. code-block:: python
@@ -521,4 +538,4 @@ There are a number of ways to add your new boefje to OpenKAT.
 - Do a commit of your code, after review it can be included
 - Add an image server in the KAT catalog config file ``*``
 
-``*`` If you want to add an image server, join the ongoing project to standardize and describe it. The idea is to add an image server in the KAT catalog config file that has artifacts from your boefjes and normalizers as outputted by the Github CI.
+``*`` If you want to add an image server, join the ongoing project to standardize and describe it. The idea is to add an image server in the KAT catalog config file that has artifacts from your boefjes and normalizers as outputted by the GitHub CI.
diff --git a/keiko/keiko/keiko.py b/keiko/keiko/keiko.py
index 8526113a34b..e4efe4c9422 100644
--- a/keiko/keiko/keiko.py
+++ b/keiko/keiko/keiko.py
@@ -92,7 +92,7 @@ def generate_report(
 
     # load data shape and validate
     data_shape_class = get_data_shape(template_name, settings)
-    data = data_shape_class.parse_obj(report_data.dict())
+    data = data_shape_class.model_validate(report_data.model_dump())
     current_span.add_event("Data shape validation successful")
     logger.info(
         "Data shape validation successful. [report_id=%s] [template=%s]",
@@ -136,7 +136,7 @@ def generate_report(
                 if bare_word in glossary_entries:
                     found_entries.add(bare_word)
 
-    context = data.dict()
+    context = data.model_dump()
 
     # build and merge glossary
     glossary_items = []
diff --git a/keiko/poetry.lock b/keiko/poetry.lock
index 41d2ffd2026..739c91176d3 100644
--- a/keiko/poetry.lock
+++ b/keiko/poetry.lock
@@ -52,13 +52,13 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -255,61 +255,61 @@ grpc = ["grpcio (>=1.44.0,<2.0.0.dev0)"]
 
 [[package]]
 name = "grpcio"
-version = "1.65.4"
+version = "1.66.1"
 description = "HTTP/2-based RPC framework"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "grpcio-1.65.4-cp310-cp310-linux_armv7l.whl", hash = "sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c"},
-    {file = "grpcio-1.65.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d"},
-    {file = "grpcio-1.65.4-cp310-cp310-win32.whl", hash = "sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1"},
-    {file = "grpcio-1.65.4-cp310-cp310-win_amd64.whl", hash = "sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec"},
-    {file = "grpcio-1.65.4-cp311-cp311-linux_armv7l.whl", hash = "sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef"},
-    {file = "grpcio-1.65.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5"},
-    {file = "grpcio-1.65.4-cp311-cp311-win32.whl", hash = "sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b"},
-    {file = "grpcio-1.65.4-cp311-cp311-win_amd64.whl", hash = "sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558"},
-    {file = "grpcio-1.65.4-cp312-cp312-linux_armv7l.whl", hash = "sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56"},
-    {file = "grpcio-1.65.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28"},
-    {file = "grpcio-1.65.4-cp312-cp312-win32.whl", hash = "sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0"},
-    {file = "grpcio-1.65.4-cp312-cp312-win_amd64.whl", hash = "sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416"},
-    {file = "grpcio-1.65.4-cp38-cp38-linux_armv7l.whl", hash = "sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021"},
-    {file = "grpcio-1.65.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7"},
-    {file = "grpcio-1.65.4-cp38-cp38-win32.whl", hash = "sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a"},
-    {file = "grpcio-1.65.4-cp38-cp38-win_amd64.whl", hash = "sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f"},
-    {file = "grpcio-1.65.4-cp39-cp39-linux_armv7l.whl", hash = "sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733"},
-    {file = "grpcio-1.65.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257"},
-    {file = "grpcio-1.65.4-cp39-cp39-win32.whl", hash = "sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d"},
-    {file = "grpcio-1.65.4-cp39-cp39-win_amd64.whl", hash = "sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9"},
-    {file = "grpcio-1.65.4.tar.gz", hash = "sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39"},
+    {file = "grpcio-1.66.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492"},
+    {file = "grpcio-1.66.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d"},
+    {file = "grpcio-1.66.1-cp310-cp310-win32.whl", hash = "sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c"},
+    {file = "grpcio-1.66.1-cp310-cp310-win_amd64.whl", hash = "sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858"},
+    {file = "grpcio-1.66.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a"},
+    {file = "grpcio-1.66.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd"},
+    {file = "grpcio-1.66.1-cp311-cp311-win32.whl", hash = "sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791"},
+    {file = "grpcio-1.66.1-cp311-cp311-win_amd64.whl", hash = "sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb"},
+    {file = "grpcio-1.66.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a"},
+    {file = "grpcio-1.66.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524"},
+    {file = "grpcio-1.66.1-cp312-cp312-win32.whl", hash = "sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759"},
+    {file = "grpcio-1.66.1-cp312-cp312-win_amd64.whl", hash = "sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734"},
+    {file = "grpcio-1.66.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2"},
+    {file = "grpcio-1.66.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d"},
+    {file = "grpcio-1.66.1-cp38-cp38-win32.whl", hash = "sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3"},
+    {file = "grpcio-1.66.1-cp38-cp38-win_amd64.whl", hash = "sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce"},
+    {file = "grpcio-1.66.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503"},
+    {file = "grpcio-1.66.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c"},
+    {file = "grpcio-1.66.1-cp39-cp39-win32.whl", hash = "sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45"},
+    {file = "grpcio-1.66.1-cp39-cp39-win_amd64.whl", hash = "sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8"},
+    {file = "grpcio-1.66.1.tar.gz", hash = "sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.65.4)"]
+protobuf = ["grpcio-tools (>=1.66.1)"]
 
 [[package]]
 name = "h11"
@@ -345,13 +345,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -366,6 +366,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
@@ -765,18 +766,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -784,103 +785,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -888,13 +890,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.3.4"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -902,6 +904,7 @@ pydantic = ">=2.7.0"
 python-dotenv = ">=0.21.0"
 
 [package.extras]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
@@ -1166,13 +1169,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.2"
+version = "2.2.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
-    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
+    {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
+    {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 ]
 
 [package.extras]
@@ -1292,18 +1295,22 @@ files = [
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [metadata]
 lock-version = "2.0"
diff --git a/keiko/requirements-dev.txt b/keiko/requirements-dev.txt
index fe6eaf46f5b..c5d00b26c98 100644
--- a/keiko/requirements-dev.txt
+++ b/keiko/requirements-dev.txt
@@ -7,9 +7,9 @@ anyio==4.3.0 ; python_version >= "3.10" and python_version < "4.0" \
 asgiref==3.7.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e \
     --hash=sha256:9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -119,62 +119,62 @@ fastapi-slim==0.111.1 ; python_version >= "3.10" and python_version < "4.0" \
 googleapis-common-protos==1.62.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07 \
     --hash=sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -308,102 +308,102 @@ protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
     --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
     --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pygments==2.17.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c \
     --hash=sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367
@@ -452,9 +452,9 @@ tomli==2.0.1 ; python_version >= "3.10" and python_version < "4.0" \
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -532,6 +532,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/keiko/requirements.txt b/keiko/requirements.txt
index e597f6fd8bc..3640a1b39f9 100644
--- a/keiko/requirements.txt
+++ b/keiko/requirements.txt
@@ -25,53 +25,53 @@ fastapi-slim==0.111.1 ; python_version >= "3.10" and python_version < "4.0" \
 googleapis-common-protos==1.62.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4750113612205514f9f6aa4cb00d523a94f3e8c06c5ad2fee466387dc4875f07 \
     --hash=sha256:83f0ece9f94e5672cced82f592d2a5edf527a96ed1794f0bab36d5735c996277
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
@@ -187,102 +187,102 @@ protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
     --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
     --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 python-dotenv==1.0.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca \
     --hash=sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a
@@ -372,6 +372,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/mula/poetry.lock b/mula/poetry.lock
index 1746a6b2ec4..e75ea82fd4c 100644
--- a/mula/poetry.lock
+++ b/mula/poetry.lock
@@ -71,13 +71,13 @@ tests = ["mypy (>=0.800)", "pytest", "pytest-asyncio"]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -391,61 +391,61 @@ test = ["objgraph", "psutil"]
 
 [[package]]
 name = "grpcio"
-version = "1.65.4"
+version = "1.66.1"
 description = "HTTP/2-based RPC framework"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "grpcio-1.65.4-cp310-cp310-linux_armv7l.whl", hash = "sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c"},
-    {file = "grpcio-1.65.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d"},
-    {file = "grpcio-1.65.4-cp310-cp310-win32.whl", hash = "sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1"},
-    {file = "grpcio-1.65.4-cp310-cp310-win_amd64.whl", hash = "sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec"},
-    {file = "grpcio-1.65.4-cp311-cp311-linux_armv7l.whl", hash = "sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef"},
-    {file = "grpcio-1.65.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5"},
-    {file = "grpcio-1.65.4-cp311-cp311-win32.whl", hash = "sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b"},
-    {file = "grpcio-1.65.4-cp311-cp311-win_amd64.whl", hash = "sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558"},
-    {file = "grpcio-1.65.4-cp312-cp312-linux_armv7l.whl", hash = "sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56"},
-    {file = "grpcio-1.65.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28"},
-    {file = "grpcio-1.65.4-cp312-cp312-win32.whl", hash = "sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0"},
-    {file = "grpcio-1.65.4-cp312-cp312-win_amd64.whl", hash = "sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416"},
-    {file = "grpcio-1.65.4-cp38-cp38-linux_armv7l.whl", hash = "sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021"},
-    {file = "grpcio-1.65.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7"},
-    {file = "grpcio-1.65.4-cp38-cp38-win32.whl", hash = "sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a"},
-    {file = "grpcio-1.65.4-cp38-cp38-win_amd64.whl", hash = "sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f"},
-    {file = "grpcio-1.65.4-cp39-cp39-linux_armv7l.whl", hash = "sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733"},
-    {file = "grpcio-1.65.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257"},
-    {file = "grpcio-1.65.4-cp39-cp39-win32.whl", hash = "sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d"},
-    {file = "grpcio-1.65.4-cp39-cp39-win_amd64.whl", hash = "sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9"},
-    {file = "grpcio-1.65.4.tar.gz", hash = "sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39"},
+    {file = "grpcio-1.66.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492"},
+    {file = "grpcio-1.66.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d"},
+    {file = "grpcio-1.66.1-cp310-cp310-win32.whl", hash = "sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c"},
+    {file = "grpcio-1.66.1-cp310-cp310-win_amd64.whl", hash = "sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858"},
+    {file = "grpcio-1.66.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a"},
+    {file = "grpcio-1.66.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd"},
+    {file = "grpcio-1.66.1-cp311-cp311-win32.whl", hash = "sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791"},
+    {file = "grpcio-1.66.1-cp311-cp311-win_amd64.whl", hash = "sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb"},
+    {file = "grpcio-1.66.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a"},
+    {file = "grpcio-1.66.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524"},
+    {file = "grpcio-1.66.1-cp312-cp312-win32.whl", hash = "sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759"},
+    {file = "grpcio-1.66.1-cp312-cp312-win_amd64.whl", hash = "sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734"},
+    {file = "grpcio-1.66.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2"},
+    {file = "grpcio-1.66.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d"},
+    {file = "grpcio-1.66.1-cp38-cp38-win32.whl", hash = "sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3"},
+    {file = "grpcio-1.66.1-cp38-cp38-win_amd64.whl", hash = "sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce"},
+    {file = "grpcio-1.66.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503"},
+    {file = "grpcio-1.66.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c"},
+    {file = "grpcio-1.66.1-cp39-cp39-win32.whl", hash = "sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45"},
+    {file = "grpcio-1.66.1-cp39-cp39-win_amd64.whl", hash = "sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8"},
+    {file = "grpcio-1.66.1.tar.gz", hash = "sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.65.4)"]
+protobuf = ["grpcio-tools (>=1.66.1)"]
 
 [[package]]
 name = "h11"
@@ -481,13 +481,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -502,6 +502,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
@@ -1071,18 +1072,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -1090,103 +1091,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -1194,13 +1196,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.4.0"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.4.0-py3-none-any.whl", hash = "sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315"},
-    {file = "pydantic_settings-2.4.0.tar.gz", hash = "sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -1585,18 +1587,22 @@ files = [
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [metadata]
 lock-version = "2.0"
diff --git a/mula/requirements-dev.txt b/mula/requirements-dev.txt
index eda3abc1dc0..19acac25555 100644
--- a/mula/requirements-dev.txt
+++ b/mula/requirements-dev.txt
@@ -10,9 +10,9 @@ anyio==4.4.0 ; python_version >= "3.10" and python_version < "4.0" \
 asgiref==3.8.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
     --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
@@ -175,62 +175,62 @@ greenlet==3.0.3 ; python_version < "3.13" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -479,102 +479,102 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024 \
     --hash=sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913 \
     --hash=sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.4.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315 \
-    --hash=sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pytest-cov==5.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:4f0764a1219df53214206bf1feea4633c3b558a2925c8b59f144f682861ce652 \
     --hash=sha256:5837b58e9f6ebd335b0f8060eecce69b662415b16dc503883a02f45dfeb14857
@@ -737,6 +737,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/mula/requirements.txt b/mula/requirements.txt
index 79db726f657..d78029486ae 100644
--- a/mula/requirements.txt
+++ b/mula/requirements.txt
@@ -10,9 +10,9 @@ anyio==4.4.0 ; python_version >= "3.10" and python_version < "4.0" \
 asgiref==3.8.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
     --hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 click==8.1.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28 \
     --hash=sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de
@@ -96,62 +96,62 @@ greenlet==3.0.3 ; python_version < "3.13" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -374,102 +374,102 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024 \
     --hash=sha256:de80739447af31525feddeb8effd640782cf5998e1a4e9192ebdf829717e3913 \
     --hash=sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.4.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bb6849dc067f1687574c12a639e231f3a6feeed0a12d710c1382045c5db1c315 \
-    --hash=sha256:ed81c3a0f46392b4d7c0a565c05884e6e54b3456e6f0fe4d8814981172dc9a88
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 python-dateutil==2.9.0.post0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3 \
     --hash=sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427
@@ -623,6 +623,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/mula/scheduler/app.py b/mula/scheduler/app.py
index 4e0836bed12..833cb3ec2f5 100644
--- a/mula/scheduler/app.py
+++ b/mula/scheduler/app.py
@@ -60,7 +60,10 @@ def __init__(self, ctx: context.AppContext) -> None:
 
         self.schedulers: dict[
             str,
-            schedulers.Scheduler | schedulers.BoefjeScheduler | schedulers.NormalizerScheduler,
+            schedulers.Scheduler
+            | schedulers.BoefjeScheduler
+            | schedulers.NormalizerScheduler
+            | schedulers.ReportScheduler,
         ] = {}
         self.server: server.Server | None = None
 
@@ -136,12 +139,21 @@ def monitor_organisations(self) -> None:
                 callback=self.remove_scheduler,
             )
 
+            scheduler_report = schedulers.ReportScheduler(
+                ctx=self.ctx,
+                scheduler_id=f"report-{org.id}",
+                organisation=org,
+                callback=self.remove_scheduler,
+            )
+
             with self.lock:
                 self.schedulers[scheduler_boefje.scheduler_id] = scheduler_boefje
                 self.schedulers[scheduler_normalizer.scheduler_id] = scheduler_normalizer
+                self.schedulers[scheduler_report.scheduler_id] = scheduler_report
 
             scheduler_normalizer.run()
             scheduler_boefje.run()
+            scheduler_report.run()
 
         if additions:
             # Flush katalogus caches when new organisations are added
@@ -201,6 +213,14 @@ def start_schedulers(self) -> None:
             )
             self.schedulers[normalizer_scheduler.scheduler_id] = normalizer_scheduler
 
+            report_scheduler = schedulers.ReportScheduler(
+                ctx=self.ctx,
+                scheduler_id=f"report-{org.id}",
+                organisation=org,
+                callback=self.remove_scheduler,
+            )
+            self.schedulers[report_scheduler.scheduler_id] = report_scheduler
+
         # Start schedulers
         for scheduler in self.schedulers.values():
             scheduler.run()
diff --git a/mula/scheduler/models/__init__.py b/mula/scheduler/models/__init__.py
index ed1a7fa177a..a5390ad6ede 100644
--- a/mula/scheduler/models/__init__.py
+++ b/mula/scheduler/models/__init__.py
@@ -9,4 +9,4 @@
 from .queue import Queue
 from .schedule import Schedule, ScheduleDB
 from .scheduler import Scheduler
-from .task import BoefjeTask, NormalizerTask, Task, TaskDB, TaskStatus
+from .task import BoefjeTask, NormalizerTask, ReportTask, Task, TaskDB, TaskStatus
diff --git a/mula/scheduler/models/plugin.py b/mula/scheduler/models/plugin.py
index f51c4952972..83d79c5791b 100644
--- a/mula/scheduler/models/plugin.py
+++ b/mula/scheduler/models/plugin.py
@@ -12,9 +12,10 @@ class Plugin(BaseModel):
     authors: list[str] | None = None
     created: datetime.datetime | None = None
     description: str | None = None
-    environment_keys: list[str] | None = None
     related: list[str] | None = None
     scan_level: int | None = None
     consumes: str | list[str]
     options: list[str] | None = None
     produces: list[str]
+    cron: str | None = None
+    interval: int | None = None
diff --git a/mula/scheduler/models/task.py b/mula/scheduler/models/task.py
index cf0c9a95834..76c51ad2e79 100644
--- a/mula/scheduler/models/task.py
+++ b/mula/scheduler/models/task.py
@@ -59,7 +59,7 @@ class Task(BaseModel):
 
     hash: str | None = Field(None, max_length=32)
 
-    data: dict | None = None
+    data: dict = Field(default_factory=dict)
 
     created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     modified_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
@@ -143,3 +143,14 @@ def hash(self) -> str:
             return mmh3.hash_bytes(f"{self.input_ooi}-{self.boefje.id}-{self.organization}").hex()
 
         return mmh3.hash_bytes(f"{self.boefje.id}-{self.organization}").hex()
+
+
+class ReportTask(BaseModel):
+    type: ClassVar[str] = "report"
+
+    organisation_id: str
+    report_recipe_id: str
+
+    @property
+    def hash(self) -> str:
+        return mmh3.hash_bytes(f"{self.report_recipe_id}-{self.organisation_id}").hex()
diff --git a/mula/scheduler/schedulers/__init__.py b/mula/scheduler/schedulers/__init__.py
index 5614508b532..4c82914aee5 100644
--- a/mula/scheduler/schedulers/__init__.py
+++ b/mula/scheduler/schedulers/__init__.py
@@ -1,3 +1,4 @@
 from .boefje import BoefjeScheduler
 from .normalizer import NormalizerScheduler
+from .report import ReportScheduler
 from .scheduler import Scheduler
diff --git a/mula/scheduler/schedulers/boefje.py b/mula/scheduler/schedulers/boefje.py
index 16aa5022832..5d2d19ffa5a 100644
--- a/mula/scheduler/schedulers/boefje.py
+++ b/mula/scheduler/schedulers/boefje.py
@@ -8,7 +8,7 @@
 import structlog
 from opentelemetry import trace
 
-from scheduler import context, queues, rankers, storage
+from scheduler import context, queues, rankers, storage, utils
 from scheduler.connectors import listeners
 from scheduler.connectors.errors import ExternalServiceError
 from scheduler.models import (
@@ -139,7 +139,7 @@ def push_tasks_for_scan_profile_mutations(self, body: bytes) -> None:
             mutation: The mutation that was received.
         """
         # Convert body into a ScanProfileMutation
-        mutation = ScanProfileMutation.parse_raw(body)
+        mutation = ScanProfileMutation.model_validate_json(body)
 
         self.logger.debug(
             "Received scan level mutation %s for: %s",
@@ -215,7 +215,7 @@ def push_tasks_for_scan_profile_mutations(self, body: bytes) -> None:
                     continue
 
                 boefje_task = BoefjeTask(
-                    boefje=Boefje.parse_obj(boefje.dict()),
+                    boefje=Boefje.model_validate(boefje.model_dump()),
                     input_ooi=ooi.primary_key if ooi else None,
                     organization=self.organisation.id,
                 )
@@ -301,7 +301,7 @@ def push_tasks_for_new_boefjes(self) -> None:
                         continue
 
                     boefje_task = BoefjeTask(
-                        boefje=Boefje.parse_obj(boefje.dict()),
+                        boefje=Boefje.model_validate(boefje.dict()),
                         input_ooi=ooi.primary_key,
                         organization=self.organisation.id,
                     )
@@ -368,7 +368,7 @@ def push_tasks_for_rescheduling(self):
             thread_name_prefix=f"BoefjeScheduler-TPE-{self.scheduler_id}-rescheduling"
         ) as executor:
             for schedule in schedules:
-                boefje_task = BoefjeTask.parse_obj(schedule.data)
+                boefje_task = BoefjeTask.model_validate(schedule.data)
 
                 # Plugin still exists?
                 try:
@@ -486,7 +486,7 @@ def push_tasks_for_rescheduling(self):
                         continue
 
                 new_boefje_task = BoefjeTask(
-                    boefje=Boefje.parse_obj(plugin.dict()),
+                    boefje=Boefje.model_validate(plugin.dict()),
                     input_ooi=ooi.primary_key if ooi else None,
                     organization=self.organisation.id,
                 )
@@ -659,7 +659,7 @@ def push_boefje_task(
     def push_item_to_queue(self, item: Task) -> Task:
         """Some boefje scheduler specific logic before pushing the item to the
         queue."""
-        boefje_task = BoefjeTask.parse_obj(item.data)
+        boefje_task = BoefjeTask.model_validate(item.data)
 
         # Check if id's are unique and correctly set. Same id's are necessary
         # for the task runner.
@@ -893,6 +893,16 @@ def has_boefje_task_grace_period_passed(self, task: BoefjeTask) -> bool:
         Returns:
             True if the grace period has passed, False otherwise.
         """
+        # Does boefje have an interval specified?
+        plugin = self.ctx.services.katalogus.get_plugin_by_id_and_org_id(
+            task.boefje.id,
+            self.organisation.id,
+        )
+        if plugin is not None and plugin.interval is not None and plugin.interval > 0:
+            timeout = timedelta(minutes=plugin.interval)
+        else:
+            timeout = timedelta(seconds=self.ctx.config.pq_grace_period)
+
         try:
             task_db = self.ctx.datastores.task_store.get_latest_task_by_hash(task.hash)
         except Exception as exc_db:
@@ -907,9 +917,7 @@ def has_boefje_task_grace_period_passed(self, task: BoefjeTask) -> bool:
             raise exc_db
 
         # Has grace period passed according to datastore?
-        if task_db is not None and datetime.now(timezone.utc) - task_db.modified_at < timedelta(
-            seconds=self.ctx.config.pq_grace_period
-        ):
+        if task_db is not None and datetime.now(timezone.utc) - task_db.modified_at < timeout:
             self.logger.debug(
                 "Task has not passed grace period, according to the datastore",
                 task_id=task_db.id,
@@ -939,7 +947,7 @@ def has_boefje_task_grace_period_passed(self, task: BoefjeTask) -> bool:
         if (
             task_bytes is not None
             and task_bytes.ended_at is not None
-            and datetime.now(timezone.utc) - task_bytes.ended_at < timedelta(seconds=self.ctx.config.pq_grace_period)
+            and datetime.now(timezone.utc) - task_bytes.ended_at < timeout
         ):
             self.logger.debug(
                 "Task has not passed grace period, according to bytes",
@@ -997,3 +1005,29 @@ def get_boefjes_for_ooi(self, ooi) -> list[Plugin]:
         )
 
         return boefjes
+
+    def set_cron(self, item: Task) -> str | None:
+        """Override Schedule.set_cron() when a boefje specifies a schedule for
+        execution (cron expression) we schedule for its execution"""
+        # Does a boefje have a schedule defined?
+        plugin = self.ctx.services.katalogus.get_plugin_by_id_and_org_id(
+            utils.deep_get(item.data, ["boefje", "id"]),
+            self.organisation.id,
+        )
+        if plugin is None or plugin.cron is None:
+            return super().set_cron(item)
+
+        return plugin.cron
+
+    def calculate_deadline(self, task: Task) -> datetime:
+        """Override Scheduler.calculate_deadline() to calculate the deadline
+        for a task and based on the boefje interval."""
+        # Does the boefje have an interval defined?
+        plugin = self.ctx.services.katalogus.get_plugin_by_id_and_org_id(
+            utils.deep_get(task.data, ["boefje", "id"]),
+            self.organisation.id,
+        )
+        if plugin is not None and plugin.interval is not None and plugin.interval > 0:
+            return datetime.now(timezone.utc) + timedelta(minutes=plugin.interval)
+
+        return super().calculate_deadline(task)
diff --git a/mula/scheduler/schedulers/normalizer.py b/mula/scheduler/schedulers/normalizer.py
index 9c9465c08c3..3e25c85ca4f 100644
--- a/mula/scheduler/schedulers/normalizer.py
+++ b/mula/scheduler/schedulers/normalizer.py
@@ -101,7 +101,7 @@ def push_tasks_for_received_raw_data(self, body: bytes) -> None:
             message queue.
         """
         # Convert body into a RawDataReceivedEvent
-        latest_raw_data = RawDataReceivedEvent.parse_raw(body)
+        latest_raw_data = RawDataReceivedEvent.model_validate_json(body)
 
         self.logger.debug(
             "Received raw data %s",
@@ -158,7 +158,7 @@ def push_tasks_for_received_raw_data(self, body: bytes) -> None:
                     continue
 
                 normalizer_task = NormalizerTask(
-                    normalizer=Normalizer.parse_obj(normalizer.dict()),
+                    normalizer=Normalizer.model_validate(normalizer.model_dump()),
                     raw_data=latest_raw_data.raw_data,
                 )
 
@@ -292,7 +292,7 @@ def push_normalizer_task(self, normalizer_task: models.NormalizerTask, caller: s
     def push_item_to_queue(self, item: Task) -> Task:
         """Some normalizer scheduler specific logic before pushing the item to the
         queue."""
-        normalizer_task = NormalizerTask.parse_obj(item.data)
+        normalizer_task = NormalizerTask.model_validate(item.data)
 
         # Check if id's are unique and correctly set. Same id's are necessary
         # for the task runner.
diff --git a/mula/scheduler/schedulers/report.py b/mula/scheduler/schedulers/report.py
new file mode 100644
index 00000000000..175df872a94
--- /dev/null
+++ b/mula/scheduler/schedulers/report.py
@@ -0,0 +1,161 @@
+from collections.abc import Callable
+from concurrent import futures
+from datetime import datetime, timezone
+from typing import Any
+
+import structlog
+from opentelemetry import trace
+
+from scheduler import context, queues, storage
+from scheduler.models import Organisation, ReportTask, Task
+from scheduler.storage import filters
+
+from .scheduler import Scheduler
+
+tracer = trace.get_tracer(__name__)
+
+
+class ReportScheduler(Scheduler):
+    ITEM_TYPE: Any = ReportTask
+
+    def __init__(
+        self,
+        ctx: context.AppContext,
+        scheduler_id: str,
+        organisation: Organisation,
+        queue: queues.PriorityQueue | None = None,
+        callback: Callable[..., None] | None = None,
+    ):
+        self.logger: structlog.BoundLogger = structlog.get_logger(__name__)
+        self.organisation = organisation
+        self.queue = queue or queues.PriorityQueue(
+            pq_id=scheduler_id,
+            maxsize=ctx.config.pq_maxsize,
+            item_type=self.ITEM_TYPE,
+            allow_priority_updates=True,
+            pq_store=ctx.datastores.pq_store,
+        )
+
+        super().__init__(
+            ctx=ctx,
+            queue=self.queue,
+            scheduler_id=scheduler_id,
+            callback=callback,
+            create_schedule=True,
+        )
+
+    def run(self) -> None:
+        # Rescheduling
+        self.run_in_thread(
+            name=f"scheduler-{self.scheduler_id}-reschedule",
+            target=self.push_tasks_for_rescheduling,
+            interval=60.0,
+        )
+
+    @tracer.start_as_current_span(name="report_push_tasks_for_rescheduling")
+    def push_tasks_for_rescheduling(self):
+        if self.queue.full():
+            self.logger.warning(
+                "Report queue is full, not populating with new tasks",
+                queue_qsize=self.queue.qsize(),
+                organisation_id=self.organisation.id,
+                scheduler_id=self.scheduler_id,
+            )
+            return
+
+        try:
+            schedules, _ = self.ctx.datastores.schedule_store.get_schedules(
+                filters=filters.FilterRequest(
+                    filters=[
+                        filters.Filter(
+                            column="scheduler_id",
+                            operator="eq",
+                            value=self.scheduler_id,
+                        ),
+                        filters.Filter(
+                            column="deadline_at",
+                            operator="lt",
+                            value=datetime.now(timezone.utc),
+                        ),
+                        filters.Filter(
+                            column="enabled",
+                            operator="eq",
+                            value=True,
+                        ),
+                    ]
+                )
+            )
+        except storage.errors.StorageError as exc_db:
+            self.logger.error(
+                "Could not get schedules for rescheduling %s",
+                self.scheduler_id,
+                scheduler_id=self.scheduler_id,
+                organisation_id=self.organisation.id,
+                exc_info=exc_db,
+            )
+            raise exc_db
+
+        with futures.ThreadPoolExecutor(
+            thread_name_prefix=f"ReportScheduler-TPE-{self.scheduler_id}-rescheduling"
+        ) as executor:
+            for schedule in schedules:
+                report_task = ReportTask.model_validate(schedule.data)
+                executor.submit(
+                    self.push_report_task,
+                    report_task,
+                    self.push_tasks_for_rescheduling.__name__,
+                )
+
+    def push_report_task(self, report_task: ReportTask, caller: str = "") -> None:
+        self.logger.debug(
+            "Pushing report task",
+            task_hash=report_task.hash,
+            organisation_id=self.organisation.id,
+            scheduler_id=self.scheduler_id,
+            caller=caller,
+        )
+
+        if self.is_item_on_queue_by_hash(report_task.hash):
+            self.logger.debug(
+                "Report task already on queue",
+                task_hash=report_task.hash,
+                organisation_id=self.organisation.id,
+                scheduler_id=self.scheduler_id,
+                caller=caller,
+            )
+            return
+
+        task = Task(
+            scheduler_id=self.scheduler_id,
+            priority=int(datetime.now().timestamp()),
+            type=self.ITEM_TYPE.type,
+            hash=report_task.hash,
+            data=report_task.model_dump(),
+        )
+
+        try:
+            self.push_item_to_queue_with_timeout(
+                task,
+                self.max_tries,
+            )
+        except queues.QueueFullError:
+            self.logger.warning(
+                "Could not add task %s to queue, queue was full",
+                report_task.hash,
+                task_hash=report_task.hash,
+                queue_qsize=self.queue.qsize(),
+                queue_maxsize=self.queue.maxsize,
+                organisation_id=self.organisation.id,
+                scheduler_id=self.scheduler_id,
+                caller=caller,
+            )
+            return
+
+        self.logger.info(
+            "Report task pushed to queue",
+            task_id=task.id,
+            task_hash=report_task.hash,
+            organisation_id=self.organisation.id,
+            scheduler_id=self.scheduler_id,
+            caller=caller,
+        )
diff --git a/mula/scheduler/schedulers/scheduler.py b/mula/scheduler/schedulers/scheduler.py
index 90c535b328f..dc60af345e9 100644
--- a/mula/scheduler/schedulers/scheduler.py
+++ b/mula/scheduler/schedulers/scheduler.py
@@ -301,30 +301,28 @@ def post_push(self, item: models.Task) -> models.Task:
             return item
 
         schedule_db = None
-        if item.schedule_id is None:
+        if item.schedule_id is not None:
+            schedule_db = self.ctx.datastores.schedule_store.get_schedule(item.schedule_id)
+        else:
             schedule_db = self.ctx.datastores.schedule_store.get_schedule_by_hash(item.hash)
-            if schedule_db is None:
-                deadline_at = self.calculate_deadline(item)
-                cron_expression = f"{deadline_at.minute} {deadline_at.hour} * * *"
 
-                schedule = models.Schedule(
-                    scheduler_id=self.scheduler_id,
-                    hash=item.hash,
-                    schedule=cron_expression,
-                    deadline_at=deadline_at,
-                    data=item.data,
-                )
-                schedule_db = self.ctx.datastores.schedule_store.create_schedule(schedule)
-                item.schedule_id = schedule_db.id
-                self.ctx.datastores.task_store.update_task(item)
-                return item
+        if schedule_db is None:
+            schedule = models.Schedule(
+                scheduler_id=self.scheduler_id,
+                hash=item.hash,
+                data=item.data,
+            )
+            schedule_db = self.ctx.datastores.schedule_store.create_schedule(schedule)
 
-            item.schedule_id = schedule_db.id
-            self.ctx.datastores.task_store.update_task(item)
-        else:
-            schedule_db = self.ctx.datastores.schedule_store.get_schedule(item.schedule_id)
-            if schedule_db is None:
-                raise ValueError(f"Schedule with id {item.schedule_id} not found for item {item.id}")
+        if schedule_db is None:
+            self.logger.debug(
+                "No schedule found for item %s",
+                item.id,
+                item_id=item.id,
+                queue_id=self.queue.pq_id,
+                scheduler_id=self.scheduler_id,
+            )
+            return item
 
         if not schedule_db.enabled:
             self.logger.debug(
@@ -337,8 +335,26 @@ def post_push(self, item: models.Task) -> models.Task:
             )
             return item
 
-        schedule_db.deadline_at = cron.next_run(schedule_db.schedule)
+        item.schedule_id = schedule_db.id
+
+        # Set the cron schedule based on the item, default this is None.
+        # We do this because we want to explicitly set the cron schedule. When
+        # a schedule already has a cron expression, this will not be updated
+        # unless this is specifically overridden in a subclass.
+        cron_expr = self.set_cron(item)
+        if cron_expr is not None:
+            schedule_db.schedule = cron_expr
+
+        # If the schedule has a cron schedule, we calculate the next run
+        # based on the cron schedule, otherwise we calculate the deadline
+        # based on the item.
+        if schedule_db.schedule is not None:
+            schedule_db.deadline_at = cron.next_run(schedule_db.schedule)
+        else:
+            schedule_db.deadline_at = self.calculate_deadline(item)
+
         self.ctx.datastores.schedule_store.update_schedule(schedule_db)
+        self.ctx.datastores.task_store.update_task(item)
 
         return item
 
@@ -392,18 +408,11 @@ def post_pop(self, item: models.Task) -> None:
         """
         self.last_activity = datetime.now(timezone.utc)
 
-    def calculate_deadline(self, task: models.Task) -> datetime:
-        """Calculate the deadline for a task.
-
-        NOTE: This is a simple implementation, you can override this method
-        to implement a more complex logic.
-
-        Args:
-            task: The task to calculate the deadline for.
+    def set_cron(self, task: models.Task) -> str | None:
+        """Set the cron schedule for the task."""
+        return None
 
-        Returns:
-            The deadline for the task.
-        """
+    def calculate_deadline(self, task: models.Task) -> datetime:
         # We at least delay a job by the grace period
         minimum = self.ctx.config.pq_grace_period
         deadline = datetime.now(timezone.utc) + timedelta(seconds=minimum)
diff --git a/mula/scheduler/server/handlers/schedules.py b/mula/scheduler/server/handlers/schedules.py
index 33bd17b5aa3..29e50b30312 100644
--- a/mula/scheduler/server/handlers/schedules.py
+++ b/mula/scheduler/server/handlers/schedules.py
@@ -63,6 +63,7 @@ def __init__(
     def list(
         self,
         request: fastapi.Request,
+        scheduler_id: str | None = None,
         schedule_hash: str | None = None,
         enabled: bool | None = None,
         offset: int = 0,
@@ -86,6 +87,7 @@ def list(
 
         try:
             results, count = self.ctx.datastores.schedule_store.get_schedules(
+                scheduler_id=scheduler_id,
                 schedule_hash=schedule_hash,
                 enabled=enabled,
                 min_deadline_at=min_deadline_at,
@@ -116,7 +118,7 @@ def list(
 
     def create(self, schedule: serializers.ScheduleCreate) -> Any:
         try:
-            new_schedule = models.Schedule(**schedule.dict())
+            new_schedule = models.Schedule(**schedule.model_dump())
         except pydantic.ValidationError as exc:
             raise fastapi.HTTPException(
                 status_code=fastapi.status.HTTP_400_BAD_REQUEST,
diff --git a/mula/scheduler/server/handlers/tasks.py b/mula/scheduler/server/handlers/tasks.py
index db3391dc2d6..6912e7023ab 100644
--- a/mula/scheduler/server/handlers/tasks.py
+++ b/mula/scheduler/server/handlers/tasks.py
@@ -139,12 +139,16 @@ def list(
                     ]
                 }
             elif task_type == "normalizer":
-                f_plugin = storage.filters.Filter(
-                    column="data",
-                    field="normalizer__id",
-                    operator="eq",
-                    value=plugin_id,
-                )
+                f_plugin = {
+                    "and": [
+                        storage.filters.Filter(
+                            column="data",
+                            field="normalizer__id",
+                            operator="eq",
+                            value=plugin_id,
+                        )
+                    ]
+                }
             else:
                 f_plugin = {
                     "or": [
@@ -182,6 +186,7 @@ def list(
                 detail=f"invalid filter(s) [exception: {exc}]",
             ) from exc
         except storage.errors.StorageError as exc:
+            self.logger.exception(exc)
             raise fastapi.HTTPException(
                 status_code=fastapi.status.HTTP_500_INTERNAL_SERVER_ERROR,
                 detail=f"error occurred while accessing the database [exception: {exc}]",
diff --git a/mula/scheduler/server/serializers/schedule.py b/mula/scheduler/server/serializers/schedule.py
index 4333f36e672..acbd1d7ab05 100644
--- a/mula/scheduler/server/serializers/schedule.py
+++ b/mula/scheduler/server/serializers/schedule.py
@@ -12,6 +12,8 @@ class ScheduleCreate(BaseModel):
 
     schedule: str
 
+    deadline_at: datetime | None = None
+
 
 # NOTE: model added for support of partial updates
 class SchedulePatch(BaseModel):
diff --git a/mula/tests/factories/plugin.py b/mula/tests/factories/plugin.py
index 23f07e1778f..187ec980a2c 100644
--- a/mula/tests/factories/plugin.py
+++ b/mula/tests/factories/plugin.py
@@ -15,3 +15,6 @@ class Meta:
     produces: list[str] = LazyFunction(lambda: [])
 
     enabled: bool = True
+
+    cron: str | None = None
+    interval: int | None = None
diff --git a/mula/tests/integration/test_api.py b/mula/tests/integration/test_api.py
index 0511c200f52..f72c67705c4 100644
--- a/mula/tests/integration/test_api.py
+++ b/mula/tests/integration/test_api.py
@@ -706,6 +706,13 @@ def test_get_tasks_min_created_at_future(self):
         self.assertEqual(200, response.status_code)
         self.assertEqual(0, len(response.json()["results"]))
 
+    def test_get_normalizer_filtered(self):
+        # This used to be a bug where the normalizer filter was missing a nesting on the operator
+        params = {"task_type": "normalizer", "plugin_id": "kat_nmap_normalize"}
+        response = self.client.get("/tasks", params=params)
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(0, len(response.json()["results"]))
+
     def test_get_tasks_filtered(self):
         response = self.client.post(
             "/tasks",
@@ -830,6 +837,17 @@ def test_list_schedules(self):
         self.assertEqual(2, response.json()["count"])
         self.assertEqual(2, len(response.json()["results"]))
 
+    def test_list_schedules_scheduler_id(self):
+        response = self.client.get(f"/schedules?scheduler_id={self.scheduler.scheduler_id}")
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(2, response.json()["count"])
+        self.assertEqual(2, len(response.json()["results"]))
+
+        response = self.client.get(f"/schedules?scheduler_id={uuid.uuid4()}")
+        self.assertEqual(200, response.status_code)
+        self.assertEqual(0, response.json()["count"])
+        self.assertEqual(0, len(response.json()["results"]))
+
     def test_list_schedules_enabled(self):
         response = self.client.get("/schedules?enabled=true")
         self.assertEqual(200, response.status_code)
diff --git a/mula/tests/integration/test_app.py b/mula/tests/integration/test_app.py
index 4fd380ca3ee..0c5ae739c76 100644
--- a/mula/tests/integration/test_app.py
+++ b/mula/tests/integration/test_app.py
@@ -50,9 +50,9 @@ def test_monitor_orgs_add(self):
         # Act
         self.app.monitor_organisations()
 
-        # Assert: four schedulers should have been created for two organisations
-        self.assertEqual(4, len(self.app.schedulers.keys()))
-        self.assertEqual(4, len(self.app.server.schedulers.keys()))
+        # Assert: six schedulers should have been created for two organisations
+        self.assertEqual(6, len(self.app.schedulers.keys()))
+        self.assertEqual(6, len(self.app.server.schedulers.keys()))
 
         scheduler_org_ids = {s.organisation.id for s in self.app.schedulers.values()}
         self.assertEqual({"org-1", "org-2"}, scheduler_org_ids)
@@ -68,9 +68,9 @@ def test_monitor_orgs_remove(self):
         # Act
         self.app.monitor_organisations()
 
-        # Assert: four schedulers should have been created for two organisations
-        self.assertEqual(4, len(self.app.schedulers.keys()))
-        self.assertEqual(4, len(self.app.server.schedulers.keys()))
+        # Assert: six schedulers should have been created for two organisations
+        self.assertEqual(6, len(self.app.schedulers.keys()))
+        self.assertEqual(6, len(self.app.server.schedulers.keys()))
 
         scheduler_org_ids = {s.organisation.id for s in self.app.schedulers.values()}
         self.assertEqual({"org-1", "org-2"}, scheduler_org_ids)
@@ -100,9 +100,9 @@ def test_monitor_orgs_add_and_remove(self):
         # Act
         self.app.monitor_organisations()
 
-        # Assert: four schedulers should have been created for two organisations
-        self.assertEqual(4, len(self.app.schedulers.keys()))
-        self.assertEqual(4, len(self.app.server.schedulers.keys()))
+        # Assert: six schedulers should have been created for two organisations
+        self.assertEqual(6, len(self.app.schedulers.keys()))
+        self.assertEqual(6, len(self.app.server.schedulers.keys()))
 
         scheduler_org_ids = {s.organisation.id for s in self.app.schedulers.values()}
         self.assertEqual({"org-1", "org-2"}, scheduler_org_ids)
@@ -117,8 +117,8 @@ def test_monitor_orgs_add_and_remove(self):
         self.app.monitor_organisations()
 
         # Assert
-        self.assertEqual(4, len(self.app.schedulers.keys()))
-        self.assertEqual(4, len(self.app.server.schedulers.keys()))
+        self.assertEqual(6, len(self.app.schedulers.keys()))
+        self.assertEqual(6, len(self.app.server.schedulers.keys()))
 
         scheduler_org_ids = {s.organisation.id for s in self.app.schedulers.values()}
         self.assertEqual({"org-1", "org-3"}, scheduler_org_ids)
diff --git a/mula/tests/integration/test_boefje_scheduler.py b/mula/tests/integration/test_boefje_scheduler.py
index 06589ac749c..faf8899628a 100644
--- a/mula/tests/integration/test_boefje_scheduler.py
+++ b/mula/tests/integration/test_boefje_scheduler.py
@@ -375,6 +375,7 @@ def test_has_boefje_task_started_running_stalled_before_grace_period(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         self.assertFalse(self.scheduler.has_boefje_task_stalled(boefje_task))
@@ -403,6 +404,7 @@ def test_has_boefje_task_started_running_stalled_after_grace_period(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         self.assertTrue(self.scheduler.has_boefje_task_stalled(boefje_task))
@@ -434,6 +436,7 @@ def test_has_boefje_task_started_running_mismatch_before_grace_period(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         with self.assertRaises(RuntimeError):
@@ -468,6 +471,7 @@ def test_has_boefje_task_started_running_mismatch_after_grace_period(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         self.assertFalse(self.scheduler.has_boefje_task_started_running(boefje_task))
@@ -497,6 +501,7 @@ def test_has_boefje_task_grace_period_passed_datastore_passed(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         has_passed = self.scheduler.has_boefje_task_grace_period_passed(boefje_task)
@@ -529,6 +534,7 @@ def test_has_boefje_task_grace_period_passed_datastore_not_passed(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = None
 
         # Act
         has_passed = self.scheduler.has_boefje_task_grace_period_passed(boefje_task)
@@ -567,6 +573,7 @@ def test_has_boefje_task_grace_period_passed_bytes_passed(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = last_run_boefje
+        self.mock_get_plugin.return_value = None
 
         # Act
         has_passed = self.scheduler.has_boefje_task_grace_period_passed(boefje_task)
@@ -605,6 +612,7 @@ def test_has_boefje_task_grace_period_passed_bytes_not_passed(self):
         # Mock
         self.mock_get_latest_task_by_hash.return_value = task_db
         self.mock_get_last_run_boefje.return_value = last_run_boefje
+        self.mock_get_plugin.return_value = None
 
         # Act
         has_passed = self.scheduler.has_boefje_task_grace_period_passed(boefje_task)
@@ -619,7 +627,7 @@ def test_push_task(self):
         boefje = BoefjeFactory()
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(boefje.dict()),
+            boefje=models.Boefje.model_validate(boefje.dict()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -627,6 +635,10 @@ def test_push_task(self):
         # Mocks
         self.mock_get_latest_task_by_hash.return_value = None
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
 
         # Act
         self.scheduler.push_boefje_task(boefje_task)
@@ -639,7 +651,7 @@ def test_push_task_no_ooi(self):
         boefje = BoefjeFactory()
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(boefje.dict()),
+            boefje=models.Boefje.model_validate(boefje.dict()),
             input_ooi=None,
             organization=self.organisation.id,
         )
@@ -647,6 +659,9 @@ def test_push_task_no_ooi(self):
         # Mocks
         self.mock_get_latest_task_by_hash.return_value = None
         self.mock_get_last_run_boefje.return_value = None
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+        )
 
         # Act
         self.scheduler.push_boefje_task(boefje_task)
@@ -674,7 +689,7 @@ def test_push_task_queue_full(
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.dict()),
+            boefje=models.Boefje.model_validate(plugin.dict()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -688,6 +703,10 @@ def test_push_task_queue_full(
         mock_has_boefje_task_grace_period_passed.return_value = True
         mock_is_item_on_queue_by_hash.return_value = False
         mock_get_tasks_by_hash.return_value = None
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
 
         # Act
         self.scheduler.push_boefje_task(boefje_task)
@@ -744,6 +763,12 @@ def test_push_task_stalled(
             task=task,
         )
 
+        # Mocks
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
+
         # Act
         self.scheduler.push_item_to_queue(item)
 
@@ -816,6 +841,70 @@ def test_post_push(self):
             task=task,
         )
 
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
+
+        # Act
+        self.scheduler.push_item_to_queue(item)
+
+        # Task should be on priority queue
+        task_pq = models.BoefjeTask(**self.scheduler.queue.peek(0).data)
+        self.assertEqual(1, self.scheduler.queue.qsize())
+        self.assertEqual(ooi.primary_key, task_pq.input_ooi)
+        self.assertEqual(boefje_task.boefje.id, task_pq.boefje.id)
+
+        # Task should be in datastore, and queued
+        task_db = self.mock_ctx.datastores.task_store.get_task(item.id)
+        self.assertEqual(task_db.id, item.id)
+        self.assertEqual(task_db.status, models.TaskStatus.QUEUED)
+
+        # Schedule should be in datastore
+        schedule_db = self.mock_ctx.datastores.schedule_store.get_schedule(task_db.schedule_id)
+        self.assertIsNotNone(schedule_db)
+        self.assertEqual(schedule_db.id, task_db.schedule_id)
+
+        # Schedule deadline should be set
+        self.assertIsNotNone(schedule_db.deadline_at)
+
+        # Schedule cron should NOT be set
+        self.assertIsNone(schedule_db.schedule)
+
+    def test_post_push_boefje_cron(self):
+        """When a boefje specifies a cron schedule, the schedule should be set"""
+        # Arrange
+        cron = "0 0 * * *"
+        scan_profile = ScanProfileFactory(level=0)
+        ooi = OOIFactory(scan_profile=scan_profile)
+        boefje_task = models.BoefjeTask(
+            boefje=BoefjeFactory(),
+            input_ooi=ooi.primary_key,
+            organization=self.organisation.id,
+        )
+
+        task = models.Task(
+            scheduler_id=self.scheduler.scheduler_id,
+            priority=1,
+            type=models.BoefjeTask.type,
+            hash=boefje_task.hash,
+            data=boefje_task.model_dump(),
+            created_at=datetime.now(timezone.utc),
+            modified_at=datetime.now(timezone.utc),
+        )
+
+        item = functions.create_item(
+            scheduler_id=self.organisation.id,
+            priority=1,
+            task=task,
+        )
+
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+            cron=cron,
+        )
+
         # Act
         self.scheduler.push_item_to_queue(item)
 
@@ -830,6 +919,89 @@ def test_post_push(self):
         self.assertEqual(task_db.id, item.id)
         self.assertEqual(task_db.status, models.TaskStatus.QUEUED)
 
+        # Schedule should be in datastore
+        schedule_db = self.mock_ctx.datastores.schedule_store.get_schedule(task_db.schedule_id)
+        self.assertIsNotNone(schedule_db)
+        self.assertEqual(schedule_db.id, task_db.schedule_id)
+
+        # Schedule deadline should be set
+        self.assertIsNotNone(schedule_db.deadline_at)
+
+        # Schedule cron should be set
+        self.assertIsNotNone(schedule_db.schedule)
+        self.assertEqual(schedule_db.schedule, cron)
+
+        # Check if the deadline_at is set correctly, to the next
+        # day at midnight
+        self.assertEqual(
+            schedule_db.deadline_at,
+            datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0) + timedelta(days=1),
+        )
+
+    def test_post_push_boefje_interval(self):
+        # Arrange
+        scan_profile = ScanProfileFactory(level=0)
+        ooi = OOIFactory(scan_profile=scan_profile)
+        boefje_task = models.BoefjeTask(
+            boefje=BoefjeFactory(),
+            input_ooi=ooi.primary_key,
+            organization=self.organisation.id,
+        )
+
+        task = models.Task(
+            scheduler_id=self.scheduler.scheduler_id,
+            priority=1,
+            type=models.BoefjeTask.type,
+            hash=boefje_task.hash,
+            data=boefje_task.model_dump(),
+            created_at=datetime.now(timezone.utc),
+            modified_at=datetime.now(timezone.utc),
+        )
+
+        item = functions.create_item(
+            scheduler_id=self.organisation.id,
+            priority=1,
+            task=task,
+        )
+
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+            interval=1500,
+        )
+
+        # Act
+        self.scheduler.push_item_to_queue(item)
+
+        # Task should be on priority queue
+        task_pq = models.BoefjeTask(**self.scheduler.queue.peek(0).data)
+        self.assertEqual(1, self.scheduler.queue.qsize())
+        self.assertEqual(ooi.primary_key, task_pq.input_ooi)
+        self.assertEqual(boefje_task.boefje.id, task_pq.boefje.id)
+
+        # Task should be in datastore, and queued
+        task_db = self.mock_ctx.datastores.task_store.get_task(item.id)
+        self.assertEqual(task_db.id, item.id)
+        self.assertEqual(task_db.status, models.TaskStatus.QUEUED)
+
+        # Schedule should be in datastore
+        schedule_db = self.mock_ctx.datastores.schedule_store.get_schedule(task_db.schedule_id)
+        self.assertIsNotNone(schedule_db)
+        self.assertEqual(schedule_db.id, task_db.schedule_id)
+
+        # Schedule deadline should be set
+        self.assertIsNotNone(schedule_db.deadline_at)
+
+        # Schedule cron should NOT be set
+        self.assertIsNone(schedule_db.schedule)
+
+        # Check if the deadline_at is set correctly with the interval
+        # set to 1500 minutes (25 hours) to at least the next day
+        self.assertGreater(
+            schedule_db.deadline_at,
+            datetime.now(timezone.utc) + timedelta(days=1),
+        )
+
     def test_post_pop(self):
         """When a task is removed from the queue, its status should be updated"""
         # Arrange
@@ -857,6 +1029,12 @@ def test_post_pop(self):
             task=task,
         )
 
+        # Mocks
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
+
         # Act
         self.scheduler.push_item_to_queue(item)
 
@@ -891,6 +1069,14 @@ def test_disable_scheduler(self):
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
+
+        # Mocks
+        self.mock_get_plugin.return_value = PluginFactory(
+            scan_level=0,
+            consumes=[ooi.object_type],
+        )
+
+        # Act
         task = functions.create_task(
             scheduler_id=self.scheduler.scheduler_id,
             data=boefje_task,
@@ -1524,7 +1710,7 @@ def test_push_tasks_for_rescheduling(self):
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1567,7 +1753,7 @@ def test_push_tasks_for_rescheduling_no_ooi(self):
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1608,7 +1794,7 @@ def test_push_tasks_for_rescheduling_ooi_not_found(self):
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1644,7 +1830,7 @@ def test_push_tasks_for_rescheduling_boefje_not_found(self):
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1680,7 +1866,7 @@ def test_push_tasks_for_rescheduling_boefje_disabled(self):
         plugin = PluginFactory(scan_level=0, consumes=[ooi.object_type], enabled=False)
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1716,7 +1902,7 @@ def test_push_tasks_for_rescheduling_boefje_doesnt_consume_ooi(self):
         plugin = PluginFactory(scan_level=0, consumes=[])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
@@ -1752,7 +1938,7 @@ def test_push_tasks_for_rescheduling_boefje_cannot_scan_ooi(self):
         plugin = PluginFactory(scan_level=1, consumes=[ooi.object_type])
 
         boefje_task = models.BoefjeTask(
-            boefje=models.Boefje.parse_obj(plugin.model_dump()),
+            boefje=models.Boefje.model_validate(plugin.model_dump()),
             input_ooi=ooi.primary_key,
             organization=self.organisation.id,
         )
diff --git a/mula/tests/integration/test_report_scheduler.py b/mula/tests/integration/test_report_scheduler.py
new file mode 100644
index 00000000000..ab5651895bf
--- /dev/null
+++ b/mula/tests/integration/test_report_scheduler.py
@@ -0,0 +1,162 @@
+import unittest
+from types import SimpleNamespace
+from unittest import mock
+
+from scheduler import config, models, schedulers, storage
+
+from tests.factories import OrganisationFactory
+
+
+class ReportSchedulerBaseTestCase(unittest.TestCase):
+    def setUp(self):
+        # Application Context
+        self.mock_ctx = mock.patch("scheduler.context.AppContext").start()
+        self.mock_ctx.config = config.settings.Settings()
+
+        # Database
+        self.dbconn = storage.DBConn(str(self.mock_ctx.config.db_uri))
+        self.dbconn.connect()
+        models.Base.metadata.drop_all(self.dbconn.engine)
+        models.Base.metadata.create_all(self.dbconn.engine)
+
+        self.mock_ctx.datastores = SimpleNamespace(
+            **{
+                storage.TaskStore.name: storage.TaskStore(self.dbconn),
+                storage.PriorityQueueStore.name: storage.PriorityQueueStore(self.dbconn),
+                storage.ScheduleStore.name: storage.ScheduleStore(self.dbconn),
+            }
+        )
+
+        # Scheduler
+        self.organisation = OrganisationFactory()
+        self.scheduler = schedulers.ReportScheduler(
+            ctx=self.mock_ctx,
+            scheduler_id=self.organisation.id,
+            organisation=self.organisation,
+        )
+
+    def tearDown(self):
+        self.scheduler.stop()
+        models.Base.metadata.drop_all(self.dbconn.engine)
+        self.dbconn.engine.dispose()
+
+
+class ReportSchedulerTestCase(ReportSchedulerBaseTestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.mock_get_schedules = mock.patch(
+            "scheduler.context.AppContext.datastores.schedule_store.get_schedules",
+        ).start()
+
+    def tearDown(self):
+        mock.patch.stopall()
+
+    def test_enable_scheduler(self):
+        # Disable scheduler first
+        self.scheduler.disable()
+
+        # Threads should be stopped
+        self.assertEqual(0, len(self.scheduler.threads))
+
+        # Queue should be empty
+        self.assertEqual(0, self.scheduler.queue.qsize())
+
+        # Re-enable scheduler
+        self.scheduler.enable()
+
+        # Threads should be started
+        self.assertGreater(len(self.scheduler.threads), 0)
+
+        # Scheduler should be enabled
+        self.assertTrue(self.scheduler.is_enabled())
+
+        # Stop the scheduler
+        self.scheduler.stop()
+
+    def test_disable_scheduler(self):
+        # Disable scheduler
+        self.scheduler.disable()
+
+        # Threads should be stopped
+        self.assertEqual(0, len(self.scheduler.threads))
+
+        # Queue should be empty
+        self.assertEqual(0, self.scheduler.queue.qsize())
+
+        # Scheduler should be disabled
+        self.assertFalse(self.scheduler.is_enabled())
+
+    def test_push_tasks_for_rescheduling(self):
+        """When the deadline of schedules have passed, the resulting task should be added to the queue"""
+        # Arrange
+        report_task = models.ReportTask(
+            organisation_id=self.organisation.id,
+            report_recipe_id="123",
+        )
+
+        schedule = models.Schedule(
+            scheduler_id=self.scheduler.scheduler_id,
+            hash=report_task.hash,
+            data=report_task.model_dump(),
+        )
+
+        schedule_db = self.mock_ctx.datastores.schedule_store.create_schedule(schedule)
+
+        # Mocks
+        self.mock_get_schedules.return_value = ([schedule_db], 1)
+
+        # Act
+        self.scheduler.push_tasks_for_rescheduling()
+
+        # Assert: new item should be on queue
+        self.assertEqual(1, self.scheduler.queue.qsize())
+
+        # Assert: new item is created with a similar task
+        peek = self.scheduler.queue.peek(0)
+        self.assertEqual(schedule.hash, peek.hash)
+
+        # Assert: task should be created, and should be the one that is queued
+        task_db = self.mock_ctx.datastores.task_store.get_task(peek.id)
+        self.assertIsNotNone(task_db)
+        self.assertEqual(peek.id, task_db.id)
+
+    def test_push_tasks_for_rescheduling_item_on_queue(self):
+        """When the deadline of schedules have passed, the resulting task should be added to the queue"""
+        # Arrange
+        report_task = models.ReportTask(
+            organisation_id=self.organisation.id,
+            report_recipe_id="123",
+        )
+
+        schedule = models.Schedule(
+            scheduler_id=self.scheduler.scheduler_id,
+            hash=report_task.hash,
+            data=report_task.model_dump(),
+        )
+
+        schedule_db = self.mock_ctx.datastores.schedule_store.create_schedule(schedule)
+
+        # Mocks
+        self.mock_get_schedules.return_value = ([schedule_db], 1)
+
+        # Act
+        self.scheduler.push_tasks_for_rescheduling()
+
+        # Assert: new item should be on queue
+        self.assertEqual(1, self.scheduler.queue.qsize())
+
+        # Assert: new item is created with a similar task
+        peek = self.scheduler.queue.peek(0)
+        self.assertEqual(schedule.hash, peek.hash)
+
+        # Assert: task should be created, and should be the one that is queued
+        task_db = self.mock_ctx.datastores.task_store.get_task(peek.id)
+        self.assertIsNotNone(task_db)
+        self.assertEqual(peek.id, task_db.id)
+
+        # Act: push again
+        self.scheduler.push_tasks_for_rescheduling()
+
+        # Should only be one task on queue
+        self.assertEqual(1, self.scheduler.queue.qsize())
diff --git a/mula/tests/integration/test_scheduler.py b/mula/tests/integration/test_scheduler.py
index 3f347045fe3..d8e784a24e9 100644
--- a/mula/tests/integration/test_scheduler.py
+++ b/mula/tests/integration/test_scheduler.py
@@ -1,6 +1,6 @@
 import unittest
 import uuid
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from types import SimpleNamespace
 from unittest import mock
 
@@ -221,7 +221,9 @@ def test_post_push(self):
 
         # Assert: schedule should have a deadline
         self.assertIsNotNone(schedule_db.deadline_at)
-        self.assertIsNotNone(schedule_db.schedule)
+
+        # Assert Schedule cron should NOT be set
+        self.assertIsNone(schedule_db.schedule)
 
         # Assert: deadline should be in the future, at least later than the
         # grace period
@@ -257,7 +259,9 @@ def test_post_push_schedule_enabled(self):
 
         # Assert: schedule should have a deadline
         self.assertIsNotNone(schedule_db.deadline_at)
-        self.assertIsNotNone(schedule_db.schedule)
+
+        # Assert Schedule cron should NOT be set
+        self.assertIsNone(schedule_db.schedule)
 
         # Assert: deadline should be in the future, at least later than the
         # grace period
@@ -288,7 +292,7 @@ def test_post_push_schedule_disabled(self):
         )
 
         # Act
-        second_item = first_item_db.copy()
+        second_item = first_item_db.model_copy()
         second_item.id = uuid.uuid4()
         second_item_db = self.scheduler.push_item_to_queue(second_item)
 
@@ -313,7 +317,7 @@ def test_post_push_schedule_update_schedule(self):
         self.scheduler.pop_item_from_queue()
 
         # Act
-        second_item = first_item_db.copy()
+        second_item = first_item_db.model_copy()
         second_item.id = uuid.uuid4()
         second_item_db = self.scheduler.push_item_to_queue(second_item)
 
@@ -328,6 +332,35 @@ def test_post_push_schedule_update_schedule(self):
 
         self.assertEqual(1, len(schedules))
 
+    def test_post_push_schedule_is_not_none(self):
+        """When a schedule is provided, it should be used to set the deadline"""
+        # Arrange
+        first_item = functions.create_item(
+            scheduler_id=self.scheduler.scheduler_id,
+            priority=1,
+        )
+
+        schedule = models.Schedule(
+            scheduler_id=self.scheduler.scheduler_id,
+            schedule="0 0 * * *",
+            hash=first_item.hash,
+            data=first_item.data,
+        )
+        schedule_db = self.mock_ctx.datastores.schedule_store.create_schedule(schedule)
+
+        first_item.schedule_id = schedule_db.id
+        self.mock_ctx.datastores.task_store.update_task(first_item)
+
+        # Act
+        self.scheduler.push_item_to_queue(first_item)
+
+        # Assert: Check if the deadline_at is set correctly, to the next
+        # day at midnight
+        self.assertEqual(
+            schedule_db.deadline_at,
+            datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0) + timedelta(days=1),
+        )
+
     def test_post_pop(self):
         """When a task is popped from the queue, it should be removed from the database"""
         # Arrange
diff --git a/mula/tests/utils/functions.py b/mula/tests/utils/functions.py
index 6fc7f13cf82..5d03b984fab 100644
--- a/mula/tests/utils/functions.py
+++ b/mula/tests/utils/functions.py
@@ -57,7 +57,7 @@ def create_item(scheduler_id: str, priority: int, task: models.Task | None = Non
         task = create_task(scheduler_id)
 
     item = models.Task(
-        **task.dict(),
+        **task.model_dump(),
     )
 
     if priority is not None:
diff --git a/octopoes/.ci/docker-compose.yml b/octopoes/.ci/docker-compose.yml
index 6b4d0205f6a..d4e33b42e13 100644
--- a/octopoes/.ci/docker-compose.yml
+++ b/octopoes/.ci/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - ".ci/ci.env"
 
   xtdb:
-    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.0.8"
+    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.1.0"
     ports:
       - "127.0.0.1:29002:3000"
 
diff --git a/octopoes/bits/default_findingtype_risk/bit.py b/octopoes/bits/default_findingtype_risk/bit.py
deleted file mode 100644
index 2a4301f7333..00000000000
--- a/octopoes/bits/default_findingtype_risk/bit.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from bits.definitions import BitDefinition
-from octopoes.models.ooi.findings import FindingType
-
-BIT = BitDefinition(
-    id="default-findingtype-risk",
-    consumes=FindingType,
-    parameters=[],
-    module="bits.default_findingtype_risk.default_findingtype_risk",
-    min_scan_level=0,
-)
diff --git a/octopoes/bits/default_findingtype_risk/default_findingtype_risk.py b/octopoes/bits/default_findingtype_risk/default_findingtype_risk.py
deleted file mode 100644
index 7acca28d705..00000000000
--- a/octopoes/bits/default_findingtype_risk/default_findingtype_risk.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from collections.abc import Iterator
-from typing import Any
-
-from octopoes.models import OOI
-from octopoes.models.ooi.findings import FindingType, RiskLevelSeverity
-
-
-def run(input_ooi: FindingType, additional_oois: list, config: dict[str, Any]) -> Iterator[OOI]:
-    value_set = False
-    if not input_ooi.risk_severity:
-        input_ooi.risk_severity = RiskLevelSeverity.PENDING
-        value_set = True
-    if not input_ooi.risk_score:
-        input_ooi.risk_score = 0
-        value_set = True
-    if value_set:
-        yield input_ooi
diff --git a/octopoes/bits/definitions.py b/octopoes/bits/definitions.py
index 8c6dac010b9..e57d07471ca 100644
--- a/octopoes/bits/definitions.py
+++ b/octopoes/bits/definitions.py
@@ -1,17 +1,17 @@
 import importlib
 import pkgutil
 from functools import cache
-from logging import getLogger
 from pathlib import Path
 from types import ModuleType
 
+import structlog
 from pydantic import BaseModel
 
 from octopoes.models.types import OOIType
 
 BITS_DIR = Path(__file__).parent
 BIT_ATTR_NAME = "BIT"
-logger = getLogger(__name__)
+logger = structlog.get_logger(__name__)
 
 
 class BitParameterDefinition(BaseModel):
diff --git a/octopoes/bits/disallowed_csp_hostnames/disallowed_csp_hostnames.py b/octopoes/bits/disallowed_csp_hostnames/disallowed_csp_hostnames.py
index 9df38e24c13..4c0cf02fdfc 100644
--- a/octopoes/bits/disallowed_csp_hostnames/disallowed_csp_hostnames.py
+++ b/octopoes/bits/disallowed_csp_hostnames/disallowed_csp_hostnames.py
@@ -1,4 +1,3 @@
-import logging
 from collections.abc import Iterator
 from typing import Any
 
@@ -10,8 +9,6 @@
 
 LINK_SHORTENERS = link_shorteners_list()
 
-logger = logging.getLogger(__name__)
-
 
 def get_disallowed_hostnames_from_config(config, config_key, default):
     disallowed_hostnames = config.get(config_key, None)
diff --git a/octopoes/bits/default_findingtype_risk/__init__.py b/octopoes/bits/domain_owner_verification/__init__.py
similarity index 100%
rename from octopoes/bits/default_findingtype_risk/__init__.py
rename to octopoes/bits/domain_owner_verification/__init__.py
diff --git a/octopoes/bits/domain_owner_verification/bit.py b/octopoes/bits/domain_owner_verification/bit.py
new file mode 100644
index 00000000000..98a6d63f87a
--- /dev/null
+++ b/octopoes/bits/domain_owner_verification/bit.py
@@ -0,0 +1,9 @@
+from bits.definitions import BitDefinition
+from octopoes.models.ooi.dns.records import DNSNSRecord
+
+BIT = BitDefinition(
+    id="domain-owner-verification",
+    consumes=DNSNSRecord,
+    parameters=[],
+    module="bits.domain_owner_verification.domain_owner_verification",
+)
diff --git a/octopoes/bits/domain_owner_verification/domain_owner_verification.py b/octopoes/bits/domain_owner_verification/domain_owner_verification.py
new file mode 100644
index 00000000000..e0142442caf
--- /dev/null
+++ b/octopoes/bits/domain_owner_verification/domain_owner_verification.py
@@ -0,0 +1,25 @@
+from collections.abc import Iterator
+
+from octopoes.models import OOI
+from octopoes.models.ooi.dns.records import DNSNSRecord
+from octopoes.models.ooi.findings import Finding, KATFindingType
+
+INDICATORS = [
+    "NS1.REGISTRANT-VERIFICATION.ISPAPI.NET",
+    "NS2.REGISTRANT-VERIFICATION.ISPAPI.NET",
+    "NS3.REGISTRANT-VERIFICATION.ISPAPI.NET",
+]
+
+
+def run(nameserver_record: DNSNSRecord, additional_oois, config: dict[str, str]) -> Iterator[OOI]:
+    """Checks to see if a domain has a specific set of dns servers which would indicate domain registrant verification.
+    https://support.dnsimple.com/articles/icann-domain-validation/
+    """
+    if nameserver_record.name_server_hostname.tokenized.name.rstrip(".").upper() in INDICATORS:
+        finding_type = KATFindingType(id="KAT-DOMAIN-OWNERSHIP-PENDING")
+        yield finding_type
+        yield Finding(
+            finding_type=finding_type.reference,
+            ooi=nameserver_record.hostname,
+            description="This domain requires ownership verification and is currently pending.",
+        )
diff --git a/octopoes/logging.yml b/octopoes/logging.yml
index e1be93bdf2e..607da62b3f6 100644
--- a/octopoes/logging.yml
+++ b/octopoes/logging.yml
@@ -3,8 +3,7 @@ disable_existing_loggers: 0
 
 formatters:
   default:
-    format: "%(asctime)s [%(process)d] [%(levelname)s] [%(module)s] %(message)s"
-    datefmt: "[%Y-%m-%d %H:%M:%S %z]"
+    format: "%(message)s"
 
 handlers:
   console:
diff --git a/octopoes/octopoes/api/router.py b/octopoes/octopoes/api/router.py
index cb907f2c650..bfe86724d0d 100644
--- a/octopoes/octopoes/api/router.py
+++ b/octopoes/octopoes/api/router.py
@@ -3,10 +3,10 @@
 from collections import Counter
 from collections.abc import Generator
 from datetime import datetime
-from logging import getLogger
 from operator import itemgetter
 from typing import Any, Literal
 
+import structlog
 from asgiref.sync import sync_to_async
 from fastapi import APIRouter, Body, Depends, HTTPException, Path, Query, Request, status
 from httpx import HTTPError
@@ -41,7 +41,7 @@
 from octopoes.xtdb.query import Aliased
 from octopoes.xtdb.query import Query as XTDBQuery
 
-logger = getLogger(__name__)
+logger = structlog.get_logger(__name__)
 router = APIRouter(prefix="/{client}")
 
 
@@ -224,7 +224,7 @@ def get_object_history(
     has_doc: bool | None = None,
     offset: int = 0,
     limit: int | None = None,
-    indices: list[int] | None = None,
+    indices: list[int] | None = Query(None),
     octopoes: OctopoesService = Depends(octopoes_service),
 ) -> list[TransactionRecord]:
     return octopoes.get_ooi_history(
diff --git a/octopoes/octopoes/connector/octopoes.py b/octopoes/octopoes/connector/octopoes.py
index 0b346164d1e..f94f1606c5d 100644
--- a/octopoes/octopoes/connector/octopoes.py
+++ b/octopoes/octopoes/connector/octopoes.py
@@ -27,6 +27,7 @@
 from octopoes.models.transaction import TransactionRecord
 from octopoes.models.tree import ReferenceTree
 from octopoes.models.types import OOIType
+from octopoes.types import DECLARATION_CREATED, OBJECT_DELETED, OBSERVATION_CREATED, ORIGIN_DELETED
 
 
 class OctopoesAPIConnector:
@@ -176,6 +177,8 @@ def delete_origin(self, origin_id: str, valid_time: datetime) -> None:
 
         self.session.delete(f"/{self.client}/origins", params=params)
 
+        self.logger.info("Deleted origin", origin_id=origin_id, valid_time=valid_time, event_code=ORIGIN_DELETED)
+
     def save_observation(self, observation: Observation) -> None:
         self.session.post(
             f"/{self.client}/observations",
@@ -183,7 +186,7 @@ def save_observation(self, observation: Observation) -> None:
             content=observation.model_dump_json(),
         )
 
-        self.logger.info("Saved observation", observation=observation)
+        self.logger.info("Saved observation", observation=observation, event_code=OBSERVATION_CREATED)
 
     def save_declaration(self, declaration: Declaration) -> None:
         self.session.post(
@@ -192,7 +195,7 @@ def save_declaration(self, declaration: Declaration) -> None:
             content=declaration.model_dump_json(),
         )
 
-        self.logger.info("Saved declaration", declaration=declaration)
+        self.logger.info("Saved declaration", declaration=declaration, event_code=DECLARATION_CREATED)
 
     def save_affirmation(self, affirmation: Affirmation) -> None:
         self.session.post(
@@ -201,7 +204,7 @@ def save_affirmation(self, affirmation: Affirmation) -> None:
             content=affirmation.model_dump_json(),
         )
 
-        self.logger.info("Saved affirmation", affirmation=affirmation)
+        self.logger.info("Saved affirmation", affirmation=affirmation, event_code=DECLARATION_CREATED)
 
     def save_scan_profile(self, scan_profile: ScanProfile, valid_time: datetime):
         params = {"valid_time": str(valid_time)}
@@ -224,7 +227,7 @@ def delete(self, reference: Reference, valid_time: datetime) -> None:
         params = {"reference": str(reference), "valid_time": str(valid_time)}
         self.session.delete(f"/{self.client}/", params=params)
 
-        self.logger.info("Deleted object", reference=reference, valid_time=valid_time)
+        self.logger.info("Deleted object", reference=reference, valid_time=valid_time, event_code=OBJECT_DELETED)
 
     def delete_many(self, references: list[Reference], valid_time: datetime) -> None:
         params = {"valid_time": str(valid_time)}
diff --git a/octopoes/octopoes/core/service.py b/octopoes/octopoes/core/service.py
index cc7f64e00af..338af316ecb 100644
--- a/octopoes/octopoes/core/service.py
+++ b/octopoes/octopoes/core/service.py
@@ -2,10 +2,10 @@
 from collections import Counter
 from collections.abc import Callable, ValuesView
 from datetime import datetime, timezone
-from logging import getLogger
 from time import perf_counter
 from typing import Literal, overload
 
+import structlog
 from bits.definitions import get_bit_definitions
 from bits.runner import BitRunner
 from pydantic import TypeAdapter
@@ -47,7 +47,7 @@
 from octopoes.repositories.scan_profile_repository import ScanProfileRepository
 from octopoes.xtdb.client import Operation, OperationType, XTDBSession
 
-logger = getLogger(__name__)
+logger = structlog.get_logger("octopoes-core-service")
 settings = Settings()
 
 
@@ -162,7 +162,14 @@ def get_ooi_tree(
 
     def _delete_ooi(self, reference: Reference, valid_time: datetime) -> None:
         referencing_origins = self.origin_repository.list_origins(valid_time, result=reference)
-        if not referencing_origins:
+        if not any(
+            origin
+            for origin in referencing_origins
+            if not (
+                origin.origin_type == OriginType.AFFIRMATION
+                or (origin.origin_type == OriginType.INFERENCE and origin.source == reference)
+            )
+        ):
             self.ooi_repository.delete(reference, valid_time)
 
     def save_origin(
@@ -171,19 +178,26 @@ def save_origin(
         origin.result = [ooi.reference for ooi in oois]
 
         # When an Origin is saved while the source OOI does not exist, reject saving the results
-        if (
-            origin.origin_type not in [OriginType.DECLARATION, OriginType.AFFIRMATION]
-            and origin.source not in origin.result
-        ):
-            try:
-                self.ooi_repository.get(origin.source, valid_time)
-            except ObjectNotFoundException:
+        try:
+            self.ooi_repository.get(origin.source, valid_time)
+        except ObjectNotFoundException:
+            if (
+                origin.origin_type not in [OriginType.DECLARATION, OriginType.AFFIRMATION]
+                and origin.source not in origin.result
+            ):
                 raise ValueError("Origin source of observation does not exist")
+            elif origin.origin_type == OriginType.AFFIRMATION:
+                logger.debug("Affirmation source %s already deleted", origin.source)
+                return
 
         for ooi in oois:
             self.ooi_repository.save(ooi, valid_time=valid_time, end_valid_time=end_valid_time)
         self.origin_repository.save(origin, valid_time=valid_time)
 
+        # Origins that are stale need to be deleted. #3561
+        if not origin.result and origin.origin_type != OriginType.INFERENCE:
+            self.origin_repository.delete(origin, valid_time=valid_time)
+
     def _run_inference(self, origin: Origin, valid_time: datetime) -> None:
         bit_definition = get_bit_definitions().get(origin.method, None)
 
diff --git a/octopoes/octopoes/events/manager.py b/octopoes/octopoes/events/manager.py
index 3bd3cfa9102..dc935b4c8a4 100644
--- a/octopoes/octopoes/events/manager.py
+++ b/octopoes/octopoes/events/manager.py
@@ -81,7 +81,7 @@ def _publish(self, event: DBEvent) -> None:
         # schedule celery event processor
         self.celery_app.send_task(
             "octopoes.tasks.tasks.handle_event",
-            (json.loads(event.json()),),
+            (json.loads(event.model_dump_json()),),
             queue=self.celery_queue_name,
             task_id=str(uuid.uuid4()),
         )
@@ -108,7 +108,7 @@ def _publish(self, event: DBEvent) -> None:
                 {
                     "primary_key": event.reference,
                     "object_type": event.reference.class_,
-                    "scan_profile": event.new_data.dict(),  # type: ignore[union-attr]
+                    "scan_profile": event.new_data.model_dump(),  # type: ignore[union-attr]
                 }
             )
 
@@ -138,7 +138,7 @@ def _publish(self, event: DBEvent) -> None:
         self.channel.basic_publish(
             "",
             f"{event.client}__scan_profile_mutations",
-            mutation.json().encode(),
+            mutation.model_dump_json().encode(),
             properties=pika.BasicProperties(delivery_mode=pika.DeliveryMode.Persistent),
         )
 
diff --git a/octopoes/octopoes/models/__init__.py b/octopoes/octopoes/models/__init__.py
index bb126e24f66..44153335a2c 100644
--- a/octopoes/octopoes/models/__init__.py
+++ b/octopoes/octopoes/models/__init__.py
@@ -203,7 +203,7 @@ def hydrate(node) -> dict | str:
                     node[key] = natural_key_parts.pop(0)
             return node
 
-        return PrimaryKeyToken.parse_obj(hydrate(token_tree))
+        return PrimaryKeyToken.model_validate(hydrate(token_tree))
 
     @classmethod
     def format_reference_human_readable(cls, reference: Reference) -> str:
diff --git a/octopoes/octopoes/models/ooi/findings.py b/octopoes/octopoes/models/ooi/findings.py
index ba3b30f4556..6149715ae08 100644
--- a/octopoes/octopoes/models/ooi/findings.py
+++ b/octopoes/octopoes/models/ooi/findings.py
@@ -47,8 +47,8 @@ class FindingType(OOI):
     impact: str | None = None
     recommendation: str | None = None
 
-    risk_score: float | None = None
-    risk_severity: RiskLevelSeverity | None = None
+    risk_score: float | None = 0.0
+    risk_severity: RiskLevelSeverity | None = RiskLevelSeverity.PENDING
 
     _natural_key_attrs = ["id"]
     _traversable = False
diff --git a/octopoes/octopoes/models/ooi/reports.py b/octopoes/octopoes/models/ooi/reports.py
index 3066778ef08..462dd0bb02d 100644
--- a/octopoes/octopoes/models/ooi/reports.py
+++ b/octopoes/octopoes/models/ooi/reports.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Literal
+from typing import Any, Literal
 from uuid import UUID
 
 from octopoes.models import OOI, Reference
@@ -39,6 +39,7 @@ class Report(OOI):
 
     observed_at: datetime
     parent_report: Reference | None = ReferenceField("Report", default=None)
+    report_recipe: Reference | None = ReferenceField("ReportRecipe", default=None)
     has_parent: bool
 
     _natural_key_attrs = ["report_id"]
@@ -46,3 +47,19 @@ class Report(OOI):
     @classmethod
     def format_reference_human_readable(cls, reference: Reference) -> str:
         return f"Report {reference.tokenized.report_id}"
+
+
+class ReportRecipe(OOI):
+    object_type: Literal["ReportRecipe"] = "ReportRecipe"
+
+    recipe_id: UUID
+
+    report_name_format: str
+    subreport_name_format: str
+
+    input_recipe: dict[str, Any]  # can contain a query which maintains a live set of OOIs or manually picked OOIs.
+    report_types: list[str]
+
+    cron_expression: str
+
+    _natural_key_attrs = ["recipe_id"]
diff --git a/octopoes/octopoes/models/persistence.py b/octopoes/octopoes/models/persistence.py
index d10ff1bf03a..7c28805e807 100644
--- a/octopoes/octopoes/models/persistence.py
+++ b/octopoes/octopoes/models/persistence.py
@@ -15,11 +15,11 @@ def ReferenceField(
 ) -> FieldInfo:
     if not isinstance(object_type, str):
         object_type = object_type.get_object_type()
-    kwargs.update(
-        {
-            "object_type": object_type,
-            "max_issue_scan_level": max_issue_scan_level,
-            "max_inherit_scan_level": max_inherit_scan_level,
-        }
-    )
-    return Field(**kwargs)
+
+    json_schema_extra = {
+        "object_type": object_type,
+        "max_issue_scan_level": max_issue_scan_level,
+        "max_inherit_scan_level": max_inherit_scan_level,
+    }
+
+    return Field(**kwargs, json_schema_extra=json_schema_extra)
diff --git a/octopoes/octopoes/models/types.py b/octopoes/octopoes/models/types.py
index 2bc1acc9af9..871620eb47d 100644
--- a/octopoes/octopoes/models/types.py
+++ b/octopoes/octopoes/models/types.py
@@ -59,7 +59,7 @@
     Network,
 )
 from octopoes.models.ooi.question import Question
-from octopoes.models.ooi.reports import Report, ReportData
+from octopoes.models.ooi.reports import Report, ReportData, ReportRecipe
 from octopoes.models.ooi.scans import ExternalScan
 from octopoes.models.ooi.service import IPService, Service, TLSCipher
 from octopoes.models.ooi.software import Software, SoftwareInstance
@@ -163,6 +163,7 @@
     | ScanType
     | Report
     | GeographicPoint
+    | ReportRecipe
 )
 
 OOIType = ConcreteOOIType | NetworkType | FindingTypeType
diff --git a/octopoes/octopoes/repositories/ooi_repository.py b/octopoes/octopoes/repositories/ooi_repository.py
index 40f05bc4fba..147effb8e5b 100644
--- a/octopoes/octopoes/repositories/ooi_repository.py
+++ b/octopoes/octopoes/repositories/ooi_repository.py
@@ -41,8 +41,8 @@
 
 
 def merge_ooi(ooi_new: OOI, ooi_old: OOI) -> tuple[OOI, bool]:
-    data_old = ooi_old.dict()
-    data_new = ooi_new.dict()
+    data_old = ooi_old.model_dump()
+    data_new = ooi_new.model_dump()
 
     # Trim new None values
     clean_new = {key: val for key, val in data_new.items() if val is not None}
@@ -54,7 +54,7 @@ def merge_ooi(ooi_new: OOI, ooi_old: OOI) -> tuple[OOI, bool]:
             break
 
     data_old.update(clean_new)
-    return ooi_new.__class__.parse_obj(data_old), changed
+    return ooi_new.__class__.model_validate(data_old), changed
 
 
 class OOIRepository(Repository):
@@ -857,9 +857,11 @@ def list_reports(self, valid_time, offset, limit) -> Paginated[tuple[Report, lis
         results = [
             (
                 self.simplify_keys(x[0]),
-                [self.simplify_keys(y) for y in x[0]["Report/_parent_report"]]
-                if "Report/_parent_report" in x[0]
-                else [],
+                (
+                    [self.simplify_keys(y) for y in x[0]["Report/_parent_report"]]
+                    if "Report/_parent_report" in x[0]
+                    else []
+                ),
             )
             for x in self.session.client.query(query)
         ]
diff --git a/octopoes/octopoes/repositories/origin_parameter_repository.py b/octopoes/octopoes/repositories/origin_parameter_repository.py
index 76c601cb09b..e23af531104 100644
--- a/octopoes/octopoes/repositories/origin_parameter_repository.py
+++ b/octopoes/octopoes/repositories/origin_parameter_repository.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 from http import HTTPStatus
-from logging import getLogger
 from typing import Any
 
 from httpx import HTTPStatusError
@@ -16,8 +15,6 @@
 from octopoes.xtdb.client import XTDBSession
 from octopoes.xtdb.query_builder import generate_pull_query
 
-logger = getLogger(__name__)
-
 
 class OriginParameterRepository(Repository):
     def __init__(self, event_manager: EventManager):
@@ -51,14 +48,14 @@ def commit(self):
 
     @classmethod
     def serialize(cls, origin_parameter: OriginParameter) -> dict[str, Any]:
-        data = origin_parameter.dict()
+        data = origin_parameter.model_dump()
         data[cls.pk_prefix] = origin_parameter.id
         data["type"] = origin_parameter.__class__.__name__
         return data
 
     @classmethod
     def deserialize(cls, data: dict[str, Any]) -> OriginParameter:
-        return OriginParameter.parse_obj(data)
+        return OriginParameter.model_validate(data)
 
     def get(self, origin_parameter_id: str, valid_time: datetime) -> OriginParameter:
         try:
diff --git a/octopoes/octopoes/repositories/origin_repository.py b/octopoes/octopoes/repositories/origin_repository.py
index 0706e27ff4b..769bce2af93 100644
--- a/octopoes/octopoes/repositories/origin_repository.py
+++ b/octopoes/octopoes/repositories/origin_repository.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 from http import HTTPStatus
-from logging import getLogger
 from typing import Any
 from uuid import UUID
 
@@ -17,8 +16,6 @@
 from octopoes.xtdb.client import XTDBSession
 from octopoes.xtdb.query_builder import generate_pull_query
 
-logger = getLogger(__name__)
-
 
 class OriginRepository(Repository):
     def __init__(self, event_manager: EventManager):
@@ -63,6 +60,7 @@ def serialize(cls, origin: Origin) -> dict[str, Any]:
         data = origin.model_dump()
         data[cls.pk_prefix] = origin.id
         data["type"] = origin.__class__.__name__
+        data["result"] = list(dict.fromkeys(data["result"]))
         return data
 
     @classmethod
diff --git a/octopoes/octopoes/repositories/scan_profile_repository.py b/octopoes/octopoes/repositories/scan_profile_repository.py
index 8211e061103..38270e99e42 100644
--- a/octopoes/octopoes/repositories/scan_profile_repository.py
+++ b/octopoes/octopoes/repositories/scan_profile_repository.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 from http import HTTPStatus
-from logging import getLogger
 from typing import Any
 
 from httpx import HTTPStatusError
@@ -16,8 +15,6 @@
 from octopoes.xtdb.client import XTDBSession
 from octopoes.xtdb.query_builder import generate_pull_query
 
-logger = getLogger(__name__)
-
 
 class ScanProfileRepository(Repository):
     def __init__(self, event_manager: EventManager):
diff --git a/octopoes/octopoes/types.py b/octopoes/octopoes/types.py
new file mode 100644
index 00000000000..ff88a48d4e4
--- /dev/null
+++ b/octopoes/octopoes/types.py
@@ -0,0 +1,6 @@
+# Event codes for certain actions
+OBSERVATION_CREATED = 100101
+DECLARATION_CREATED = 100201
+AFFIRMATION_CREATED = 100301
+ORIGIN_DELETED = 100403
+OBJECT_DELETED = 100503
diff --git a/octopoes/poetry.lock b/octopoes/poetry.lock
index 2fa635345fc..1e90e2a09e6 100644
--- a/octopoes/poetry.lock
+++ b/octopoes/poetry.lock
@@ -173,13 +173,13 @@ zstd = ["zstandard (==0.22.0)"]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -599,61 +599,61 @@ test = ["objgraph", "psutil"]
 
 [[package]]
 name = "grpcio"
-version = "1.65.4"
+version = "1.66.1"
 description = "HTTP/2-based RPC framework"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "grpcio-1.65.4-cp310-cp310-linux_armv7l.whl", hash = "sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c"},
-    {file = "grpcio-1.65.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82"},
-    {file = "grpcio-1.65.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de"},
-    {file = "grpcio-1.65.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d"},
-    {file = "grpcio-1.65.4-cp310-cp310-win32.whl", hash = "sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1"},
-    {file = "grpcio-1.65.4-cp310-cp310-win_amd64.whl", hash = "sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec"},
-    {file = "grpcio-1.65.4-cp311-cp311-linux_armv7l.whl", hash = "sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef"},
-    {file = "grpcio-1.65.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17"},
-    {file = "grpcio-1.65.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e"},
-    {file = "grpcio-1.65.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5"},
-    {file = "grpcio-1.65.4-cp311-cp311-win32.whl", hash = "sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b"},
-    {file = "grpcio-1.65.4-cp311-cp311-win_amd64.whl", hash = "sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558"},
-    {file = "grpcio-1.65.4-cp312-cp312-linux_armv7l.whl", hash = "sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56"},
-    {file = "grpcio-1.65.4-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74"},
-    {file = "grpcio-1.65.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a"},
-    {file = "grpcio-1.65.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28"},
-    {file = "grpcio-1.65.4-cp312-cp312-win32.whl", hash = "sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0"},
-    {file = "grpcio-1.65.4-cp312-cp312-win_amd64.whl", hash = "sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416"},
-    {file = "grpcio-1.65.4-cp38-cp38-linux_armv7l.whl", hash = "sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021"},
-    {file = "grpcio-1.65.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864"},
-    {file = "grpcio-1.65.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524"},
-    {file = "grpcio-1.65.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7"},
-    {file = "grpcio-1.65.4-cp38-cp38-win32.whl", hash = "sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a"},
-    {file = "grpcio-1.65.4-cp38-cp38-win_amd64.whl", hash = "sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f"},
-    {file = "grpcio-1.65.4-cp39-cp39-linux_armv7l.whl", hash = "sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733"},
-    {file = "grpcio-1.65.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1"},
-    {file = "grpcio-1.65.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2"},
-    {file = "grpcio-1.65.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257"},
-    {file = "grpcio-1.65.4-cp39-cp39-win32.whl", hash = "sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d"},
-    {file = "grpcio-1.65.4-cp39-cp39-win_amd64.whl", hash = "sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9"},
-    {file = "grpcio-1.65.4.tar.gz", hash = "sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39"},
+    {file = "grpcio-1.66.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492"},
+    {file = "grpcio-1.66.1-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f"},
+    {file = "grpcio-1.66.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a"},
+    {file = "grpcio-1.66.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d"},
+    {file = "grpcio-1.66.1-cp310-cp310-win32.whl", hash = "sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c"},
+    {file = "grpcio-1.66.1-cp310-cp310-win_amd64.whl", hash = "sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858"},
+    {file = "grpcio-1.66.1-cp311-cp311-linux_armv7l.whl", hash = "sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a"},
+    {file = "grpcio-1.66.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_aarch64.whl", hash = "sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22"},
+    {file = "grpcio-1.66.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e"},
+    {file = "grpcio-1.66.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd"},
+    {file = "grpcio-1.66.1-cp311-cp311-win32.whl", hash = "sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791"},
+    {file = "grpcio-1.66.1-cp311-cp311-win_amd64.whl", hash = "sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb"},
+    {file = "grpcio-1.66.1-cp312-cp312-linux_armv7l.whl", hash = "sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a"},
+    {file = "grpcio-1.66.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_aarch64.whl", hash = "sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0"},
+    {file = "grpcio-1.66.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815"},
+    {file = "grpcio-1.66.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524"},
+    {file = "grpcio-1.66.1-cp312-cp312-win32.whl", hash = "sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759"},
+    {file = "grpcio-1.66.1-cp312-cp312-win_amd64.whl", hash = "sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734"},
+    {file = "grpcio-1.66.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2"},
+    {file = "grpcio-1.66.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b"},
+    {file = "grpcio-1.66.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb"},
+    {file = "grpcio-1.66.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d"},
+    {file = "grpcio-1.66.1-cp38-cp38-win32.whl", hash = "sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3"},
+    {file = "grpcio-1.66.1-cp38-cp38-win_amd64.whl", hash = "sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce"},
+    {file = "grpcio-1.66.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503"},
+    {file = "grpcio-1.66.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44"},
+    {file = "grpcio-1.66.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb"},
+    {file = "grpcio-1.66.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c"},
+    {file = "grpcio-1.66.1-cp39-cp39-win32.whl", hash = "sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45"},
+    {file = "grpcio-1.66.1-cp39-cp39-win_amd64.whl", hash = "sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8"},
+    {file = "grpcio-1.66.1.tar.gz", hash = "sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2"},
 ]
 
 [package.extras]
-protobuf = ["grpcio-tools (>=1.65.4)"]
+protobuf = ["grpcio-tools (>=1.66.1)"]
 
 [[package]]
 name = "h11"
@@ -689,13 +689,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -710,6 +710,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
@@ -1151,18 +1152,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -1170,103 +1171,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -1274,13 +1276,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.3.4"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -1288,6 +1290,7 @@ pydantic = ">=2.7.0"
 python-dotenv = ">=0.21.0"
 
 [package.extras]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
@@ -1910,13 +1913,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.2"
+version = "2.2.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
-    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
+    {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
+    {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 ]
 
 [package.extras]
@@ -2097,18 +2100,22 @@ files = [
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [metadata]
 lock-version = "2.0"
diff --git a/octopoes/requirements-dev.txt b/octopoes/requirements-dev.txt
index 3ff6d499064..b9f40f68f42 100644
--- a/octopoes/requirements-dev.txt
+++ b/octopoes/requirements-dev.txt
@@ -22,9 +22,9 @@ billiard==4.2.0 ; python_version >= "3.10" and python_version < "4.0" \
 celery==5.4.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:369631eb580cf8c51a82721ec538684994f8277637edde2dfc0dacd73ed97f64 \
     --hash=sha256:504a19140e8d3029d5acad88330c541d4c3f64c789d85f94756762d8bca7e706
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -261,62 +261,62 @@ greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -406,102 +406,102 @@ protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
     --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
     --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pyparsing==3.1.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad \
     --hash=sha256:f9db75911801ed778fe61bb643079ff86601aca99fcae6345aa67292038fb742
@@ -768,9 +768,9 @@ typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
 tzdata==2024.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \
     --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -860,6 +860,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/octopoes/requirements.txt b/octopoes/requirements.txt
index 189ab9f5d88..4238ee2c50f 100644
--- a/octopoes/requirements.txt
+++ b/octopoes/requirements.txt
@@ -19,9 +19,9 @@ billiard==4.2.0 ; python_version >= "3.10" and python_version < "4.0" \
 celery==5.4.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:369631eb580cf8c51a82721ec538684994f8277637edde2dfc0dacd73ed97f64 \
     --hash=sha256:504a19140e8d3029d5acad88330c541d4c3f64c789d85f94756762d8bca7e706
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -205,62 +205,62 @@ greenlet==3.0.3 ; python_version >= "3.10" and (platform_machine == "aarch64" or
     --hash=sha256:fcd2469d6a2cf298f198f0487e0a5b1a47a42ca0fa4dfd1b6862c999f018ebbf \
     --hash=sha256:fd096eb7ffef17c456cfa587523c5f92321ae02427ff955bebe9e3c63bc9f0da \
     --hash=sha256:fe754d231288e1e64323cfad462fcee8f0288654c10bdf4f603a39ed923bef33
-grpcio==1.65.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:075f3903bc1749ace93f2b0664f72964ee5f2da5c15d4b47e0ab68e4f442c257 \
-    --hash=sha256:0a0720299bdb2cc7306737295d56e41ce8827d5669d4a3cd870af832e3b17c4d \
-    --hash=sha256:0cef8c919a3359847c357cb4314e50ed1f0cca070f828ee8f878d362fd744d52 \
-    --hash=sha256:0e85c8766cf7f004ab01aff6a0393935a30d84388fa3c58d77849fcf27f3e98c \
-    --hash=sha256:17de4fda50967679677712eec0a5c13e8904b76ec90ac845d83386b65da0ae1e \
-    --hash=sha256:18c10f0d054d2dce34dd15855fcca7cc44ec3b811139437543226776730c0f28 \
-    --hash=sha256:24a2246e80a059b9eb981e4c2a6d8111b1b5e03a44421adbf2736cc1d4988a8a \
-    --hash=sha256:280e93356fba6058cbbfc6f91a18e958062ef1bdaf5b1caf46c615ba1ae71b5b \
-    --hash=sha256:2a1d4c84d9e657f72bfbab8bedf31bdfc6bfc4a1efb10b8f2d28241efabfaaf2 \
-    --hash=sha256:2a4f476209acffec056360d3e647ae0e14ae13dcf3dfb130c227ae1c594cbe39 \
-    --hash=sha256:2bd672e005afab8bf0d6aad5ad659e72a06dd713020554182a66d7c0c8f47e18 \
-    --hash=sha256:3d1bbf7e1dd1096378bd83c83f554d3b93819b91161deaf63e03b7022a85224a \
-    --hash=sha256:3dee50c1b69754a4228e933696408ea87f7e896e8d9797a3ed2aeed8dbd04b74 \
-    --hash=sha256:4482a44ce7cf577a1f8082e807a5b909236bce35b3e3897f839f2fbd9ae6982d \
-    --hash=sha256:4934077b33aa6fe0b451de8b71dabde96bf2d9b4cb2b3187be86e5adebcba021 \
-    --hash=sha256:5764237d751d3031a36fafd57eb7d36fd2c10c658d2b4057c516ccf114849a3e \
-    --hash=sha256:626319a156b1f19513156a3b0dbfe977f5f93db63ca673a0703238ebd40670d7 \
-    --hash=sha256:644a783ce604a7d7c91412bd51cf9418b942cf71896344b6dc8d55713c71ce82 \
-    --hash=sha256:66bb051881c84aa82e4f22d8ebc9d1704b2e35d7867757f0740c6ef7b902f9b1 \
-    --hash=sha256:74c34fc7562bdd169b77966068434a93040bfca990e235f7a67cdf26e1bd5c63 \
-    --hash=sha256:7656376821fed8c89e68206a522522317787a3d9ed66fb5110b1dff736a5e416 \
-    --hash=sha256:85e9c69378af02e483bc626fc19a218451b24a402bdf44c7531e4c9253fb49ef \
-    --hash=sha256:870370524eff3144304da4d1bbe901d39bdd24f858ce849b7197e530c8c8f2ec \
-    --hash=sha256:874acd010e60a2ec1e30d5e505b0651ab12eb968157cd244f852b27c6dbed733 \
-    --hash=sha256:886b45b29f3793b0c2576201947258782d7e54a218fe15d4a0468d9a6e00ce17 \
-    --hash=sha256:88fcabc332a4aef8bcefadc34a02e9ab9407ab975d2c7d981a8e12c1aed92aa1 \
-    --hash=sha256:8dc9ddc4603ec43f6238a5c95400c9a901b6d079feb824e890623da7194ff11e \
-    --hash=sha256:8eb485801957a486bf5de15f2c792d9f9c897a86f2f18db8f3f6795a094b4bb2 \
-    --hash=sha256:926a0750a5e6fb002542e80f7fa6cab8b1a2ce5513a1c24641da33e088ca4c56 \
-    --hash=sha256:a146bc40fa78769f22e1e9ff4f110ef36ad271b79707577bf2a31e3e931141b9 \
-    --hash=sha256:a925446e6aa12ca37114840d8550f308e29026cdc423a73da3043fd1603a6385 \
-    --hash=sha256:a99e6dffefd3027b438116f33ed1261c8d360f0dd4f943cb44541a2782eba72f \
-    --hash=sha256:abccc5d73f5988e8f512eb29341ed9ced923b586bb72e785f265131c160231d8 \
-    --hash=sha256:ade1256c98cba5a333ef54636095f2c09e6882c35f76acb04412f3b1aa3c29a5 \
-    --hash=sha256:b07f36faf01fca5427d4aa23645e2d492157d56c91fab7e06fe5697d7e171ad4 \
-    --hash=sha256:b81711bf4ec08a3710b534e8054c7dcf90f2edc22bebe11c1775a23f145595fe \
-    --hash=sha256:be952436571dacc93ccc7796db06b7daf37b3b56bb97e3420e6503dccfe2f1b4 \
-    --hash=sha256:c9ba3e63108a8749994f02c7c0e156afb39ba5bdf755337de8e75eb685be244b \
-    --hash=sha256:cdb34278e4ceb224c89704cd23db0d902e5e3c1c9687ec9d7c5bb4c150f86816 \
-    --hash=sha256:cf53e6247f1e2af93657e62e240e4f12e11ee0b9cef4ddcb37eab03d501ca864 \
-    --hash=sha256:d2b819f9ee27ed4e3e737a4f3920e337e00bc53f9e254377dd26fc7027c4d558 \
-    --hash=sha256:d72962788b6c22ddbcdb70b10c11fbb37d60ae598c51eb47ec019db66ccfdff0 \
-    --hash=sha256:d7b984a8dd975d949c2042b9b5ebcf297d6d5af57dcd47f946849ee15d3c2fb8 \
-    --hash=sha256:e4a795c02405c7dfa8affd98c14d980f4acea16ea3b539e7404c645329460e5a \
-    --hash=sha256:e6cbdd107e56bde55c565da5fd16f08e1b4e9b0674851d7749e7f32d8645f524 \
-    --hash=sha256:ee40d058cf20e1dd4cacec9c39e9bce13fedd38ce32f9ba00f639464fcb757de
+grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
+    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
+    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
+    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
+    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
+    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
+    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
+    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
+    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
+    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
+    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
+    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
+    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
+    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
+    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
+    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
+    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
+    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
+    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
+    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
+    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
+    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
+    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
+    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
+    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
+    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
+    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
+    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
+    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
+    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
+    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
+    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
+    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
+    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
+    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
+    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
+    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
+    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
+    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
+    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
+    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
+    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
+    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
+    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
+    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
+    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
 h11==0.14.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d \
     --hash=sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -338,102 +338,102 @@ protobuf==4.25.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f0700d54bcf45424477e46a9f0944155b46fb0639d69728739c0e47bab83f2b9 \
     --hash=sha256:f1279ab38ecbfae7e456a108c5c0681e4956d5b1090027c1de0f934dfdb4b35c \
     --hash=sha256:f4f118245c4a087776e0a8408be33cf09f6c547442c00395fbfb116fac2f8ac2
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pyparsing==3.1.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:a1bac0ce561155ecc3ed78ca94d3c9378656ad4c94c1270de543f621420f94ad \
     --hash=sha256:f9db75911801ed778fe61bb643079ff86601aca99fcae6345aa67292038fb742
@@ -668,9 +668,9 @@ typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0"
 tzdata==2024.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd \
     --hash=sha256:9068bc196136463f5245e51efda838afa15aaeca9903f49050dfa2679db4d252
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
 uvicorn==0.29.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:2c2aac7ff4f4365c206fd773a39bf4ebd1047c238f8b8268ad996829323473de \
     --hash=sha256:6a69214c0b6a087462412670b3ef21224fa48cae0e452b5883e8e8bdfdd11dd0
@@ -751,6 +751,6 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
diff --git a/octopoes/tests/integration/test_api_connector.py b/octopoes/tests/integration/test_api_connector.py
index 34c28224f77..58ae6099075 100644
--- a/octopoes/tests/integration/test_api_connector.py
+++ b/octopoes/tests/integration/test_api_connector.py
@@ -104,7 +104,7 @@ def test_history(octopoes_api_connector: OctopoesAPIConnector):
     assert len(octopoes_api_connector.get_history(network.reference, offset=1)) == 2
     assert len(octopoes_api_connector.get_history(network.reference, limit=2)) == 2
 
-    first_and_last = octopoes_api_connector.get_history(network.reference, has_doc=True, indices=[1, -1])
+    first_and_last = octopoes_api_connector.get_history(network.reference, has_doc=True, indices=[0, -1])
     assert len(first_and_last) == 2
     assert first_and_last[0].valid_time == first_seen
     assert first_and_last[1].valid_time == last_seen
diff --git a/octopoes/tests/integration/test_io.py b/octopoes/tests/integration/test_io.py
index 9ce2cf10e37..816555da95f 100644
--- a/octopoes/tests/integration/test_io.py
+++ b/octopoes/tests/integration/test_io.py
@@ -1,12 +1,13 @@
 import json
 import os
 import time
+import uuid
 from datetime import datetime
 from operator import itemgetter
 
 import pytest
 
-from octopoes.api.models import Declaration
+from octopoes.api.models import Declaration, Observation
 from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.models.ooi.network import Network
 
@@ -78,3 +79,28 @@ def test_io(octopoes_api_connector: OctopoesAPIConnector, valid_time: datetime):
     time.sleep(3)
 
     assert len(list(map(itemgetter("txOps"), octopoes_api_connector.export_all()))) > len(transactions)
+
+
+def test_duplicate_origin_result_filter(octopoes_api_connector: OctopoesAPIConnector, valid_time: datetime):
+    network1 = Network(name="1")
+    network2 = Network(name="2")
+    octopoes_api_connector.save_observation(
+        Observation(
+            method="normalizer_id",
+            source=network1.reference,
+            source_method=None,
+            task_id=uuid.uuid4(),
+            valid_time=valid_time,
+            result=[
+                network1,
+                network1,
+                network2,
+                network2,
+            ],
+        )
+    )
+    origin = octopoes_api_connector.list_origins(task_id={}, valid_time=valid_time)
+    assert len(origin) == 1
+    assert len(origin[0].result) == 2
+    assert origin[0].result[0] == network1.reference
+    assert origin[0].result[1] == network2.reference
diff --git a/octopoes/tests/integration/test_ooi_deletion.py b/octopoes/tests/integration/test_ooi_deletion.py
index ad52fbe1b98..86e40eda52b 100644
--- a/octopoes/tests/integration/test_ooi_deletion.py
+++ b/octopoes/tests/integration/test_ooi_deletion.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from octopoes.api.models import Declaration, Observation
+from octopoes.api.models import Affirmation, Declaration, Observation
 from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.core.service import OctopoesService
 from octopoes.events.events import OOIDBEvent, OriginDBEvent
@@ -429,3 +429,99 @@ def chain(source, results):
 
     assert xtdb_octopoes_service.ooi_repository.list_oois({OOI}, valid_time).count == 0
     assert len(list(filter(lambda x: x.operation_type.value == "delete", event_manager.queue))) > 0
+
+
+def test_affirming_ooi_delete(octopoes_api_connector: OctopoesAPIConnector, valid_time: datetime):
+    # Make an object A
+    network = Network(name="internet")
+    octopoes_api_connector.save_declaration(Declaration(ooi=network, valid_time=valid_time))
+
+    # Observe an object B "derived" by A
+    url = "mispo.es"
+    hostname = Hostname(network=network.reference, name=url)
+    hostname_origin = Observation(
+        method="",
+        source=network.reference,
+        source_method=None,
+        result=[hostname],
+        task_id=uuid.uuid4(),
+        valid_time=valid_time,
+    )
+    octopoes_api_connector.save_observation(hostname_origin)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 1
+
+    # Delete A and validate B is not present
+    octopoes_api_connector.delete(network.reference, valid_time)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 0
+
+    # Re-observe an object B "derived" by A
+    octopoes_api_connector.save_declaration(Declaration(ooi=network, valid_time=valid_time))
+    octopoes_api_connector.save_observation(hostname_origin)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 1
+
+    # Affirm object B
+    octopoes_api_connector.save_affirmation(
+        Affirmation(
+            ooi=hostname,
+            source_method=None,
+            task_id=uuid.uuid4(),
+            valid_time=valid_time,
+        )
+    )
+    time.sleep(1)
+
+    # Delete A and validate B is not present
+    octopoes_api_connector.delete(network.reference, valid_time)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 0
+
+
+def test_delecration_ooi_delete(octopoes_api_connector: OctopoesAPIConnector, valid_time: datetime):
+    # Make an object A
+    network = Network(name="internet")
+    octopoes_api_connector.save_declaration(Declaration(ooi=network, valid_time=valid_time))
+
+    # Observe an object B "derived" by A
+    url = "mispo.es"
+    hostname = Hostname(network=network.reference, name=url)
+    hostname_origin = Observation(
+        method="",
+        source=network.reference,
+        source_method=None,
+        result=[hostname],
+        task_id=uuid.uuid4(),
+        valid_time=valid_time,
+    )
+    octopoes_api_connector.save_observation(hostname_origin)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 1
+
+    # Delete A and validate B is not present
+    octopoes_api_connector.delete(network.reference, valid_time)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 0
+
+    # Re-observe an object B "derived" by A
+    octopoes_api_connector.save_declaration(Declaration(ooi=network, valid_time=valid_time))
+    octopoes_api_connector.save_observation(hostname_origin)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 1
+
+    # Infer object B
+    octopoes_api_connector.save_declaration(
+        Declaration(
+            ooi=hostname,
+            source_method=None,
+            task_id=uuid.uuid4(),
+            valid_time=valid_time,
+        )
+    )
+    time.sleep(1)
+
+    # Delete A and validate B is not present
+    octopoes_api_connector.delete(network.reference, valid_time)
+    time.sleep(1)
+    assert octopoes_api_connector.list_objects({Hostname}, valid_time).count == 1
diff --git a/octopoes/tests/test_bit_default_findingtype_risk.py b/octopoes/tests/test_bit_default_findingtype_risk.py
deleted file mode 100644
index 785d80fbdf1..00000000000
--- a/octopoes/tests/test_bit_default_findingtype_risk.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from bits.default_findingtype_risk.default_findingtype_risk import run as run_default_findingtype_risk
-
-from octopoes.models.ooi.findings import KATFindingType, RiskLevelSeverity
-
-
-def test_default_findingtype_risk_pending():
-    test_finding_type = KATFindingType(id="KAT-TEST")
-
-    assert test_finding_type.risk_severity is None
-    assert test_finding_type.risk_score is None
-
-    results = list(run_default_findingtype_risk(test_finding_type, [], {}))
-
-    expected_result = results[0]
-    assert isinstance(expected_result, KATFindingType)
-    assert expected_result.risk_severity == RiskLevelSeverity.PENDING, "Risk Severity None should default to pending"
-    assert expected_result.risk_score == 0, "Risk Score None should default to 0"
-
-
-def test_default_findingtype_risk_unkown():
-    test_finding_type = KATFindingType(id="KAT-TEST", risk_severity=RiskLevelSeverity.UNKNOWN, risk_score=5)
-
-    results = list(run_default_findingtype_risk(test_finding_type, [], {}))
-
-    assert results == [], "Bit should not output anything when risk_severity or risk_score are set"
diff --git a/octopoes/tests/test_bit_domain_verification.py b/octopoes/tests/test_bit_domain_verification.py
new file mode 100644
index 00000000000..1ad9bccc629
--- /dev/null
+++ b/octopoes/tests/test_bit_domain_verification.py
@@ -0,0 +1,25 @@
+from bits.domain_owner_verification.domain_owner_verification import run
+
+from octopoes.models.ooi.dns.records import DNSNSRecord
+from octopoes.models.ooi.dns.zone import Hostname
+from octopoes.models.ooi.network import Network
+
+
+def test_verification_pending():
+    network = Network(name="fake")
+    hostname = Hostname(name="example.com", network=network.reference)
+    ns_hostname = Hostname(name="ns1.registrant-verification.ispapi.net", network=network.reference)
+    ns_record = DNSNSRecord(hostname=hostname.reference, name_server_hostname=ns_hostname.reference, value="x")
+    results = list(run(ns_record, [], {}))
+
+    assert len(results) == 2
+
+
+def test_no_verification_pending():
+    network = Network(name="fake")
+    hostname = Hostname(name="example.com", network=network.reference)
+    ns_hostname = Hostname(name="ns1.example.com", network=network.reference)
+    ns_record = DNSNSRecord(hostname=hostname.reference, name_server_hostname=ns_hostname.reference, value="x")
+    results = list(run(ns_record, [], {}))
+
+    assert len(results) == 0
diff --git a/octopoes/tests/test_reference.py b/octopoes/tests/test_reference.py
index fccab06298a..775cc713b36 100644
--- a/octopoes/tests/test_reference.py
+++ b/octopoes/tests/test_reference.py
@@ -26,5 +26,5 @@ def test_ref_equality(self):
         self.assertEqual(a, b)
 
     def test_parse_obj(self):
-        ip = MockIPAddressV4.parse_obj({"address": "1.1.1.1", "network": "MockNetwork|internet"})
+        ip = MockIPAddressV4.model_validate({"address": "1.1.1.1", "network": "MockNetwork|internet"})
         self.assertEqual(Reference("MockNetwork|internet"), ip.network)
diff --git a/octopoes/tests/test_reference_node.py b/octopoes/tests/test_reference_node.py
index c3d616c108e..5dd3a2c2588 100644
--- a/octopoes/tests/test_reference_node.py
+++ b/octopoes/tests/test_reference_node.py
@@ -104,7 +104,7 @@ def test_filter_children(self):
         self.assertDictEqual({}, root_node.children["ip_addresses"][0].children)
 
     def test_xtdb_reference_node_to_reference_node(self):
-        root = XTDBReferenceNode.parse_obj(xtdb_sample)
+        root = XTDBReferenceNode.model_validate(xtdb_sample)
         reference_node = root.to_reference_node("xt/id")
         self.assertEqual(
             "IPAddressV6|internet|2001:1c00:2303:8f00:21c7:4dc2:5738:28af",
@@ -124,13 +124,13 @@ def test_collect_references(self):
             Reference.from_str("IPPort|internet|1.1.1.2|tcp|80"),
         }
 
-        root = XTDBReferenceNode.parse_obj(xtdb_sample)
+        root = XTDBReferenceNode.model_validate(xtdb_sample)
         reference_node = root.to_reference_node("xt/id")
 
         self.assertEqual(refs, reference_node.collect_references())
 
     def test_xtdb_data_to_reference_node_complext(self):
-        root = XTDBReferenceNode.parse_obj(xtdb_sample_2)
+        root = XTDBReferenceNode.model_validate(xtdb_sample_2)
         reference_node = root.to_reference_node("xt/id")
 
         self.assertEqual("DNSZone|internet|nl", str(reference_node.reference))
diff --git a/octopoes/tools/xtdb-cli.py b/octopoes/tools/xtdb-cli.py
index 74aad128407..49f6797b9ed 100755
--- a/octopoes/tools/xtdb-cli.py
+++ b/octopoes/tools/xtdb-cli.py
@@ -61,15 +61,24 @@ def status(ctx: click.Context):
 
 
 @cli.command(help='EDN Query (default: "{:query {:find [ ?var ] :where [[?var :xt/id ]]}}")')
+@click.option("--tx-id", type=int, help="In UTC, defaulting to latest transaction id (integer)")
+@click.option("--tx-time", type=click.DateTime(), help="In UTC, defaulting to latest transaction time (date)")
+@click.option("--valid-time", type=click.DateTime(), help="In UTC, defaulting to now (date)")
 @click.argument("edn", required=False)
 @click.pass_context
-def query(ctx: click.Context, edn: str):
+def query(
+    ctx: click.Context,
+    edn: str,
+    valid_time: datetime.datetime | None = None,
+    tx_time: datetime.datetime | None = None,
+    tx_id: int | None = None,
+):
     client: XTDBClient = ctx.obj["client"]
 
     if edn:
-        click.echo(json.dumps(client.query(edn)))
+        click.echo(json.dumps(client.query(edn, valid_time, tx_time, tx_id)))
     else:
-        click.echo(json.dumps(client.query()))
+        click.echo(json.dumps(client.query(valid_time=valid_time, tx_time=tx_time, tx_id=tx_id)))
 
 
 @cli.command(help="List all keys in node")
@@ -89,9 +98,9 @@ def list_values(ctx: click.Context):
 
 
 @cli.command(help="Returns the document map for a particular entity.")
-@click.option("--tx-id", type=int, help="Defaulting to latest transaction id (integer)")
-@click.option("--tx-time", type=click.DateTime(), help="Defaulting to latest transaction time (date)")
-@click.option("--valid-time", type=click.DateTime(), help="Defaulting to now (date)")
+@click.option("--tx-id", type=int, help="In UTC, defaulting to latest transaction id (integer)")
+@click.option("--tx-time", type=click.DateTime(), help="In UTC, defaulting to latest transaction time (date)")
+@click.option("--valid-time", type=click.DateTime(), help="In UTC, defaulting to now (date)")
 @click.argument("key")
 @click.pass_context
 def entity(
@@ -116,7 +125,7 @@ def entity(
     "--with-corrections",
     is_flag=True,
     help="""Includes bitemporal corrections in the response, inline,
-    sorted by valid-time then tx-id (boolean, default: false)""",
+    sorted by valid-time (in UTC) then tx-id (boolean, default: false)""",
 )
 @click.argument("key")
 @click.pass_context
@@ -127,9 +136,9 @@ def history(ctx: click.Context, key: str, with_corrections: bool, with_docs: boo
 
 
 @cli.command(help="Returns the transaction details for an entity - returns a map containing the tx-id and tx-time.")
-@click.option("--tx-id", type=int, help="Defaulting to the latest transaction id (integer)")
-@click.option("--tx-time", type=click.DateTime(), help="Defaulting to the latest transaction time (date)")
-@click.option("--valid-time", type=click.DateTime(), help="Defaulting to now (date)")
+@click.option("--tx-id", type=int, help="In UTC, defaulting to the latest transaction id (integer)")
+@click.option("--tx-time", type=click.DateTime(), help="In UTC, defaulting to the latest transaction time (date)")
+@click.option("--valid-time", type=click.DateTime(), help="In UTC, defaulting to now (date)")
 @click.argument("key")
 @click.pass_context
 def entity_tx(
diff --git a/octopoes/tools/xtdb_client.py b/octopoes/tools/xtdb_client.py
index 70c0530912f..ad58dc2af42 100644
--- a/octopoes/tools/xtdb_client.py
+++ b/octopoes/tools/xtdb_client.py
@@ -37,8 +37,22 @@ def status(self) -> JsonValue:
 
         return res.json()
 
-    def query(self, query: str = "{:query {:find [ ?var ] :where [[?var :xt/id ]]}}") -> JsonValue:
-        res = self._client.post("/query", content=query, headers={"Content-Type": "application/edn"})
+    def query(
+        self,
+        query: str = "{:query {:find [ ?var ] :where [[?var :xt/id ]]}}",
+        valid_time: datetime.datetime | None = None,
+        tx_time: datetime.datetime | None = None,
+        tx_id: int | None = None,
+    ) -> JsonValue:
+        params = {}
+        if valid_time is not None:
+            params["valid-time"] = valid_time.isoformat()
+        if tx_time is not None:
+            params["tx-time"] = tx_time.isoformat()
+        if tx_id is not None:
+            params["tx-id"] = str(tx_id)
+
+        res = self._client.post("/query", params=params, content=query, headers={"Content-Type": "application/edn"})
 
         return res.json()
 
diff --git a/poetry.lock b/poetry.lock
index 1733c92d963..609e4c1b73b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -61,13 +61,13 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"]
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -406,18 +406,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -425,103 +425,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -529,13 +530,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.3.4"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -543,6 +544,7 @@ pydantic = ">=2.7.0"
 python-dotenv = ">=0.21.0"
 
 [package.extras]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
@@ -932,13 +934,13 @@ files = [
 
 [[package]]
 name = "urllib3"
-version = "2.2.2"
+version = "2.2.3"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.2.2-py3-none-any.whl", hash = "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472"},
-    {file = "urllib3-2.2.2.tar.gz", hash = "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168"},
+    {file = "urllib3-2.2.3-py3-none-any.whl", hash = "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac"},
+    {file = "urllib3-2.2.3.tar.gz", hash = "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9"},
 ]
 
 [package.extras]
diff --git a/requirements.txt b/requirements.txt
index c8cfe26ac7a..9534c1e1af6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,9 +9,9 @@ autodoc-pydantic==2.2.0 ; python_version >= "3.10" and python_version < "4.0" \
 babel==2.15.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:08706bdad8d0a3413266ab61bd6c34d0c28d6e1e7badf40a2cebe67644e2e1fb \
     --hash=sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 charset-normalizer==3.3.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027 \
     --hash=sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087 \
@@ -197,102 +197,102 @@ myst-parser==4.0.0 ; python_version >= "3.10" and python_version < "4.0" \
 packaging==24.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002 \
     --hash=sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pygments==2.18.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199 \
     --hash=sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a
@@ -404,6 +404,6 @@ typer[all]==0.9.4 ; python_version >= "3.10" and python_version < "4.0" \
 typing-extensions==4.12.2 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \
     --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8
-urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472 \
-    --hash=sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168
+urllib3==2.2.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
+    --hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
diff --git a/rfd/0002-code-of-conduct.md b/rfd/0002-code-of-conduct.md
new file mode 100644
index 00000000000..217b066f374
--- /dev/null
+++ b/rfd/0002-code-of-conduct.md
@@ -0,0 +1,291 @@
+---
+authors: JP Bruins Slot <jpbruinsslot@gmail.com>
+state: published
+discussion: https://github.com/minvws/nl-kat-coordination/pull/3425
+labels: process
+---
+
+# RFD 0002: Code of Conduct: Code Review
+
+## Introduction
+
+Code reviews are an essential part of the software development process,
+ensuring that the codebase remains bug-free, clean, maintable and efficient. It
+helps to spot potential issues, while fostering collaboration and knowledge
+sharing among team members. For both authors and reviewers, approaching code
+reviews with the right mindset and strategies can significantly improve the
+quality of the code and the efficiency of the review process.
+
+By adhering to these best practices, both authors and reviewers can contribute
+to a more effective and enjoyable code review process, ultimately leading to
+higher-quality software and stronger team dynamics.
+
+Having a code of conduct for code reviews can help set expectations, establish
+a positive and respectful environment, and ensure that the review process is
+productive and beneficial for all team members.
+
+## Authors
+
+1. **Mind your reviewer**
+
+   Make choices or options that minimize time and cognitive load for the
+   reviewer, such as opting for multiple small independent PR's instead of a
+   massive one that covers a relatively large surface of the code base. Be
+   especially mindful of this with potential big refactorings.
+
+2. **Satisfy preconditions**
+
+   Ensure that your code is ready for review before you send it, and if you
+   feel that it is not entirely there yet please mark it as 'draft' to signal
+   this to potential reviewers. Things to check before putting your code up for
+   review:
+
+   - Validate your PR by doing a 'self-review' by checking your changes,
+   - It should work and is able to run,
+   - There should be no unresolved merge conflicts,
+   - Have adequate testing that pass,
+   - And respect the style and coding guidelines.
+
+   This is respectful of reviewer time and can sometimes save you a review
+   round trip. If you're looking for an early review then make this clear.
+
+   Try to make a habit to review early and often, and to ask for feedback
+   early. When you feel that you could use some input on your draft PR then ask
+   for it. This can help you to avoid costly mistakes and rework later on.
+
+3. **Provide context**
+
+   When opening a PR for review be clear to your reviewer about your
+   expectations. In terms of the review, this means specifying in the
+   description of the PR, the kind of reviewing as well as who should review
+   what, using which level of scrutiny and rigor.
+
+   Add comments or give explanations with your code about the thought process,
+   and show what choices you've made and why.
+
+   Be cognizant that enough context is provided for the reviewer to understand
+   the changes you've made.
+
+   When necessary schedule a call or a meeting to discuss the changes in more
+   detail, and walk the reviewer through the changes.
+
+4. **Remember that communication can be hard**
+
+   Difference in understanding or opinions are to be expected in the context of
+   code review. Always assume competence and goodwill from the reviewer, and
+   that the other person has your best interests (and those of your project) at
+   heart. As with giving feedback, receiving feedback requires that the author
+   is open to **constructive** criticism and feedback.
+
+## Reviewers
+
+1.  **Look for the following**
+
+    As a reviewer look for the following in a pull request[^1]. In no
+    particular order:
+
+    1.1 _Design_
+
+    Does this change integrate well with the rest of the system? Is it
+    consistent with the existing design and architecture?
+
+    1.2 _Functionality_
+
+    Does the code behave as the author likely intended? Is the way the code
+    behaves good for its users? This includes the users of the software as well
+    as the developers who will be working with the code. Think about edge
+    cases, look for concurrency problems, try to think like a user, and make
+    sure that there are no bugs that you see just by reading the code.
+
+    1.3 _Complexity_
+
+    Is the change more complex than it needs to be? **Too complex** usually
+    means: "can't be understood quickly by code readers". It can also mean
+    "developers are likely to introduce bugs when they try or modify this
+    code".
+
+    Be cautious of over-engineering, where developers make the code more
+    generalized than necessary or include features that aren't currently
+    required. Encourage developers to address the problem that needs solving
+    right now, rather than focusing on a potential issue that might arise in
+    the future.
+
+    1.4 _Tests_
+
+    Does the code have correct and well-designed automated tests? Ask for unit,
+    integration, or end-to-end tests as appropriate for the change.
+
+    Will the tests actually fail when the code is broken? If the code changes,
+    will they begin to produce false positives? Do the tests make clear and
+    meaningful assertions? Are they appropriately divided across different test
+    methods?
+
+    Keep in mind that tests are also code that needs maintenance. Avoid
+    allowing complexity in tests just because they aren't part of the main
+    codebase.
+
+    1.5 _Naming_
+
+    Did the developer choose clear names for variables, classes, methods, etc.?
+    Does the name accurately describe the purpose, behavior, and intent of the
+    code it represents?
+
+    1.6 _Style and Conventions_
+
+    Does the code follow our style and coding guidelines? Are there any
+    violations of the style guide?
+
+    1.7 _Consistency_
+
+    Preferably the author should maintain consistency with the existing code.
+    This includes consistency in naming, style, structure, and design patterns.
+
+    This makes sure that the codebase is easier to understand and maintain.
+    When a substantial change should be made to the existing code that would
+    cause inconsistencies, it should be discussed with the team, and be
+    addressed in a separate issue.
+
+    1.8 _Comments_
+
+    Are the comments clear and useful? Do they explain why the code is written
+    in a certain way? Do they explain the intent behind the code? Are they
+    up-to-date?
+
+    1.9 _Documentation_
+
+    Did the developer also update relevant documentation? This includes README
+    files, API documentation, and any other relevant documentation.
+
+2.  **Assume competence and goodwill**
+
+    Be positive, polite and respectful.
+
+3.  **Be mindful of the power dynamic**[^2]
+
+    As a reviewer be mindful of the inherent power dynamic between a reviewer
+    and reviewee. This arises from the temporary authority the reviewer holds.
+    When the reviewer holds gatekeeping authority the power dynamic is more
+    permanent. This dynamic can be beneficial, fostering collaboration and
+    improving code quality, but it can also lead to abuse of power if not
+    handled responsibly.
+
+    The reviewer has the power to delay or reject a PR, creating a potential
+    for misuse that might obstruct progress, or to exert unnecessary dominance
+    over the reviewee. Whether by nitpicking, imposing unnecessary demands, or
+    prolonging the review process.
+
+    This authority must by used judiciously and with respect for the
+    submitter’s time and effort. Abuse of this power, whether through trivial
+    criticisms or using the process to pursue personal agendas, can undermine
+    the collaborative goals of peer review.
+
+4.  **Keep your feedback constructive and actionable**
+
+    Be helpful and constructive in your feedback. If you see something that
+    could be improved, suggest a way to improve it. Don't only just point out
+    what's wrong, but also suggest how to fix it, for example by utilising the
+    "add suggestion" feature in review comments.
+
+    When there is the possibility to lend out a helping hand, do so. Schedule a
+    call or a meeting to discuss the feedback in more detail. This can help to
+    clarify the feedback and to make sure that the author understands the
+    feedback. It also helps to keep up the pace, and potentially avoid multiple
+    review round trips.
+
+5.  **Explain the why**
+
+    Some code might seem wrong to you, but it's likely not obvious to the
+    author, or they wouldn't have written it that way. So please don‘t say
+    "This is wrong".
+
+    Instead, explain at least what the right way looks like. Or even better,
+    explain why they should do things differently. And if you’re the slightest
+    bit uncertain, "Maybe I'm missing something, but..." is a helpful sentence.
+    Remember, assume competence.
+
+6.  **Find an end**
+
+    If you like things neat, it‘s tempting to go over a code review over and
+    over until it’s perfect, dragging it out for longer and taking more time
+    than necessary. It‘s soul-deadening for the recipient, though.
+
+    Keep in mind that "LGTM" does not mean "I vouch my immortal soul this will
+    never fail", but "looks good to me". If it looks good, move on. That
+    doesn’t mean you shouldn‘t be thorough. It’s a judgment call.
+
+    And if there are bigger refactorings to be done or new feature that need to
+    be addressed. Then move them to a new issue.
+
+    Especially when there are multiple reviewers, and multiple review rounds,
+    it's important to find an end to the review process. Different reviewers
+    may have different opinions, and it's important to find a balance between
+    the different viewpoints.
+
+7.  **Mention the positives**
+
+    It‘s easy to get into the mindset of "find ALL the flaws", but
+    acknowledging the positives both helps maintain civility and brightens the
+    recipient’s day.
+
+    No need to be all fake smiles, but if there's a good decision, or if
+    somebody takes on a really grungy task, acknowledging that is a nice thing
+    to do. And on the converse, a "thank you" to the reviewers is occasionally
+    a nice thing, too.
+
+    When you see something cool, when you see a good decision, or when made a
+    change that is interesting or innovative, mention it!
+
+8.  **Don't shame people**
+
+    "How could you not see this" is a very unhelpful thing to say. Assume that
+    your colleagues do their best, but occasionally make mistakes. That's why
+    we have code reviews - to spot those mistakes. While flawless PR's are
+    awesome, flawed ones are the norm.
+
+9.  **Don't use extreme or very negative language**
+
+    Please avoid saying things like "no sane person would ever do this" or
+    "this approach is terrible", "I can't imagine anyone would want to
+    implement it like this".
+
+    Thinly veiled insults or passive aggressive comments are not helpful and
+    can be damaging to the relationship. This is useless, petty and nearly
+    impossible to act on. While it might intimidate the reviewee into doing
+    what you want, it’s not helpful in the long run - they will feel incapable,
+    and be less inclined to collaborate with you in the future, and there is
+    not much info in there to help them improve.
+
+    "This is a good start, but it could use some work" or "This needs some
+    cleanup" are nicer ways of saying it. Discuss the code, not the person.
+
+10. **Don't bikeshed**
+
+    Always ask yourself if this decision really matters in the long run, or if
+    you‘re enforcing a subjective preference. It feels good to be right, but
+    only one of the two participants can win that game. If it’s not important,
+    agree to disagree, and move on. Remember that the goal of the code review
+    is to improve the code, not to enforce your personal preferences.
+
+## References
+
+### Books
+
+- [Winters] Software Engineering at Google: Lessons Learned from Programming
+  Over Time - Titus Winters, Tom Manshreck, Hyrum Wright
+- [Carullo] Implementing Effective Code Reviews: How to Build and Maintain
+  Clean Code - Guiliana Carullo
+- [Wiegers] Peer Reviews in Software: A Practical Guide - Karl Wiegers
+
+### Websites
+
+- [Deepsource] [deepsource.com - Code review best practices - DeepSource](https://deepsource.com/blog/code-review-best-practices)
+- [Wiegers2] [medium.com - The Soft Side of Peer Reviews - Karl Wiegers](https://medium.com/swlh/the-soft-side-of-peer-reviews-ced46d6d63ee)
+- [EngPractices] [google.github.io - Google Engineering Practices Documentation | eng-practices](https://google.github.io/eng-practices/)
+- [Chromium] [chromium.googlesource.com - Chromium Docs - Respectful Changes](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/cl_respect.md)
+- [GoogleTesting] [testing.googleblog.com - Google Testing Blog: Code Health: Respectful Reviews == Useful Reviews](https://testing.googleblog.com/2019/11/code-health-respectful-reviews-useful.html)
+- [Thatham] [chiark.greenend.org.uk - Code review antipatterns](https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/code-review-antipatterns/)
+
+[^1]: Adapted from [EngPractices]
+[^2]:
+    A humorous and insightful take on code review antipatterns can be found
+    in [Thatham]
diff --git a/rfd/README.md b/rfd/README.md
index 5709ce406ba..4394bfac833 100644
--- a/rfd/README.md
+++ b/rfd/README.md
@@ -7,6 +7,7 @@ on how to create and discuss RFDs.
 
 ## RFDs
 
-| Number | State     | Title                                                   |
-| ------ | --------- | ------------------------------------------------------- |
-| 0001   | Published | [RFD 0001: Request for Discussion Process](0001-rfd.md) |
+| Number | State     | Title                                                             |
+| ------ | --------- | ----------------------------------------------------------------- |
+| 0001   | Published | [RFD 0001: Request for Discussion Process](0001-rfd.md)           |
+| 0002   | Published | [RFD 0002: Code of Conduct: Code Review](0002-code-of-conduct.md) |
diff --git a/rocky/.ci/docker-compose.yml b/rocky/.ci/docker-compose.yml
index 130d3e59f20..03940ae2236 100644
--- a/rocky/.ci/docker-compose.yml
+++ b/rocky/.ci/docker-compose.yml
@@ -52,7 +52,7 @@ services:
       - .env.test
 
   xtdb:
-    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.0.8"
+    image: "ghcr.io/dekkers/xtdb-http-multinode:v1.1.0"
 
   rabbitmq:
     restart: on-failure
diff --git a/rocky/account/admin.py b/rocky/account/admin.py
index 564513931ac..e6fd575a9e5 100644
--- a/rocky/account/admin.py
+++ b/rocky/account/admin.py
@@ -18,7 +18,10 @@ class KATUserAdmin(UserAdmin):
     )
     fieldsets = (
         (None, {"fields": ("email", "password", "full_name")}),
-        (_("Permissions"), {"fields": ("is_active", "is_staff", "is_superuser", "groups", "user_permissions")}),
+        (
+            _("Permissions"),
+            {"fields": ("is_active", "is_staff", "is_superuser", "groups", "user_permissions", "clearance_level")},
+        ),
         (_("Important dates"), {"fields": ("last_login", "date_joined")}),
     )
     add_fieldsets = (
diff --git a/rocky/account/migrations/0005_katuser_clearance_level.py b/rocky/account/migrations/0005_katuser_clearance_level.py
new file mode 100644
index 00000000000..ed51c2223c6
--- /dev/null
+++ b/rocky/account/migrations/0005_katuser_clearance_level.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.0.8 on 2024-09-04 13:03
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("account", "0001_squashed_0004_authtoken_authtoken_unique_name"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="katuser",
+            name="clearance_level",
+            field=models.IntegerField(
+                default=-1,
+                help_text="The clearance level of the user for all organizations.",
+                validators=[django.core.validators.MinValueValidator(-1), django.core.validators.MaxValueValidator(4)],
+            ),
+        ),
+    ]
diff --git a/rocky/account/mixins.py b/rocky/account/mixins.py
index 549b9599b53..d439184a21f 100644
--- a/rocky/account/mixins.py
+++ b/rocky/account/mixins.py
@@ -86,15 +86,20 @@ def setup(self, request, *args, **kwargs):
                 user=self.request.user, organization=self.organization
             )
         except OrganizationMember.DoesNotExist:
-            if not self.request.user.is_superuser:
+            if self.request.user.is_superuser:
+                clearance_level = 4
+            elif self.request.user.has_perm("tools.can_access_all_organizations"):
+                clearance_level = -1
+            else:
                 raise Http404()
 
+            # Only the Python object is created, it is not saved to the database.
             self.organization_member = OrganizationMember(
                 user=self.request.user,
                 organization=self.organization,
                 status=OrganizationMember.STATUSES.ACTIVE,
-                trusted_clearance_level=4,
-                acknowledged_clearance_level=0,
+                trusted_clearance_level=clearance_level,
+                acknowledged_clearance_level=clearance_level,
             )
 
         if self.organization_member.blocked:
@@ -122,20 +127,20 @@ def indemnification_error(self):
     def may_update_clearance_level(self) -> bool:
         if not self.indemnification_present:
             return False
-        if self.organization_member.acknowledged_clearance_level < 0:
-            return False
-        if self.organization_member.trusted_clearance_level < 0:
-            return False
-        return True
+
+        return self.organization_member.has_clearance_level(0)
 
     def verify_raise_clearance_level(self, level: int) -> bool:
         if not self.indemnification_present:
             raise IndemnificationNotPresentException()
-        if self.organization_member.trusted_clearance_level < level:
-            raise TrustedClearanceLevelTooLowException()
-        if self.organization_member.acknowledged_clearance_level < level:
-            raise AcknowledgedClearanceLevelTooLowException()
-        return True
+
+        if self.organization_member.has_clearance_level(level):
+            return True
+        else:
+            if self.organization_member.trusted_clearance_level < level:
+                raise TrustedClearanceLevelTooLowException()
+            else:
+                raise AcknowledgedClearanceLevelTooLowException()
 
     def raise_clearance_level(self, ooi_reference: Reference, level: int) -> bool:
         self.verify_raise_clearance_level(level)
@@ -185,7 +190,7 @@ def can_raise_clearance_level(self, ooi: OOI, level: int) -> bool:
                 % (
                     ooi.reference.human_readable,
                     level,
-                    self.organization_member.acknowledged_clearance_level,
+                    self.organization_member.max_clearance_level,
                 ),
             )
         except AcknowledgedClearanceLevelTooLowException:
diff --git a/rocky/account/models.py b/rocky/account/models.py
index 38511691d03..4390bd67649 100644
--- a/rocky/account/models.py
+++ b/rocky/account/models.py
@@ -2,6 +2,7 @@
 
 from django.contrib.auth.base_user import BaseUserManager
 from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models.functions import Lower
 from django.utils import timezone
@@ -9,6 +10,7 @@
 from knox import crypto
 from knox.models import AbstractAuthToken
 from knox.settings import CONSTANTS
+from tools.enums import MAX_SCAN_LEVEL
 from tools.models import Organization, OrganizationMember
 
 
@@ -78,6 +80,11 @@ class KATUser(AbstractBaseUser, PermissionsMixin):
         ),
     )
     date_joined = models.DateTimeField(_("date joined"), default=timezone.now)
+    clearance_level = models.IntegerField(
+        default=-1,
+        help_text=_("The clearance level of the user for all organizations."),
+        validators=[MinValueValidator(-1), MaxValueValidator(MAX_SCAN_LEVEL)],
+    )
 
     USERNAME_FIELD = "email"
     REQUIRED_FIELDS = ["full_name"]
@@ -105,9 +112,10 @@ def organizations(self) -> list[Organization]:
         """
         Lists all organizations a user is a member of, excluding organizations to which access is blocked.
 
-        Superusers are considered to be members of all organizations.
+        Superusers and users with the permission can_access_all_organizations are considered to be members
+        of all organizations.
         """
-        if self.is_superuser:
+        if self.has_perm("tools.can_access_all_organizations"):
             return self.all_organizations
         return [m.organization for m in self.organization_members if not m.blocked]
 
@@ -116,9 +124,10 @@ def organizations_including_blocked(self) -> list[Organization]:
         """
         Lists all organizations a user is a member of, including organizations to which access is blocked.
 
-        Superusers are considered to be members of all organizations.
+        Superusers and users with the permission can_access_all_organizations are considered to be members
+        of all organizations.
         """
-        if self.is_superuser:
+        if self.has_perm("tools.can_access_all_organizations"):
             return self.all_organizations
         return [m.organization for m in self.organization_members]
 
diff --git a/rocky/assets/css/components/button-plain.scss b/rocky/assets/css/components/button-plain.scss
new file mode 100644
index 00000000000..50553d75978
--- /dev/null
+++ b/rocky/assets/css/components/button-plain.scss
@@ -0,0 +1,22 @@
+button,
+a.button,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  &.plain {
+    background-color: transparent;
+    border: 0;
+    color: var(--colors-blue-600);
+    padding: 0;
+
+    &:hover {
+      color: var(--colors-blue-700);
+    }
+
+    .icon {
+      &:hover {
+        color: var(--colors-blue-700);
+      }
+    }
+  }
+}
diff --git a/rocky/assets/css/components/destructive.scss b/rocky/assets/css/components/destructive.scss
new file mode 100644
index 00000000000..9620b8f66bf
--- /dev/null
+++ b/rocky/assets/css/components/destructive.scss
@@ -0,0 +1,44 @@
+@mixin destructive-text-element {
+  &.destructive {
+    color: var(--color-alert-negative);
+
+    &:hover {
+      color: var(--color-alert-negative-darker);
+    }
+  }
+}
+
+@mixin destructive-button {
+  &.destructive {
+    color: var(--colors-white);
+    background-color: var(--color-alert-negative);
+
+    &:hover {
+      background-color: var(--color-alert-negative-darker);
+    }
+
+    &.ghost {
+      color: var(--color-alert-negative);
+      background-color: var(--color-white);
+      border-color: var(--colors-grey-200);
+      border-width: 1px;
+
+      &:hover {
+        color: var(--color-alert-negative);
+        border-color: var(--color-alert-negative-darker);
+      }
+    }
+  }
+}
+
+a {
+  @include destructive-text-element;
+}
+
+button,
+a.button,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  @include destructive-button;
+}
diff --git a/rocky/assets/css/components/dropdown-form.scss b/rocky/assets/css/components/dropdown-form.scss
new file mode 100644
index 00000000000..8d3b1e91b09
--- /dev/null
+++ b/rocky/assets/css/components/dropdown-form.scss
@@ -0,0 +1,72 @@
+@use "destructive";
+
+.dropdown {
+  form {
+    $form-padding-sides: 1rem;
+
+    background-color: transparent;
+    padding: 0.75rem $form-padding-sides 0 $form-padding-sides;
+
+    .toolbar {
+      justify-content: space-between;
+
+      a {
+        font-weight: bold;
+        text-decoration: none;
+
+        @include destructive.destructive-text-element;
+      }
+
+      button,
+      a.button,
+      input[type="button"],
+      input[type="submit"],
+      input[type="reset"] {
+        background-color: transparent;
+        color: var(--link-text-color);
+        border: 0;
+        padding: 0;
+        min-width: 0;
+        margin: 0;
+        min-height: 0;
+        border-radius: 0;
+
+        &:hover {
+          color: var(--colors-blue-700);
+        }
+
+        @include destructive.destructive-button;
+
+        &.destructive {
+          color: var(--color-alert-negative);
+          background-color: transparent;
+
+          &:hover {
+            color: var(--color-alert-negative-darker);
+            background-color: transparent;
+          }
+        }
+      }
+    }
+
+    ul {
+      padding-left: 0;
+
+      /* Negative margin added to allow li background color to full width of the form */
+      margin-left: calc($form-padding-sides * -1);
+      margin-right: calc($form-padding-sides * -1);
+
+      li {
+        min-height: var(--collapsing-element-list-item-min-height);
+        display: flex;
+        align-items: center;
+        padding-left: $form-padding-sides;
+        padding-right: $form-padding-sides;
+
+        &:hover {
+          background-color: var(--colors-black-05);
+        }
+      }
+    }
+  }
+}
diff --git a/rocky/assets/css/components/dropdown.scss b/rocky/assets/css/components/dropdown.scss
index e226bbdb21e..dd80fa95389 100644
--- a/rocky/assets/css/components/dropdown.scss
+++ b/rocky/assets/css/components/dropdown.scss
@@ -25,6 +25,9 @@
     margin-block-start: 0;
     padding-inline-start: 0;
     gap: 0;
+    border-radius: var(--border-radius-s);
+    border: 1px solid var(--colors-grey-200);
+    background-color: var(--colors-white);
 
     &[aria-expanded="true"] {
       display: flex;
@@ -37,6 +40,7 @@
         background-color: var(--colors-white);
         list-style-type: disc;
         gap: 0;
+        border-radius: var(--border-radius-s);
 
         &:not(:last-child) {
           border-bottom: 1px solid var(--colors-grey-200);
diff --git a/rocky/assets/css/components/form-checkbox.scss b/rocky/assets/css/components/form-checkbox.scss
index 99da2f5a942..71787c7a939 100644
--- a/rocky/assets/css/components/form-checkbox.scss
+++ b/rocky/assets/css/components/form-checkbox.scss
@@ -1,5 +1,12 @@
 form {
   input[type="checkbox"] {
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    & + label {
+      font-weight: normal;
+    }
+
     &:disabled {
       opacity: 1;
     }
diff --git a/rocky/assets/css/components/form-inline.scss b/rocky/assets/css/components/form-inline.scss
index 10d071d4624..a7e6f8862a6 100644
--- a/rocky/assets/css/components/form-inline.scss
+++ b/rocky/assets/css/components/form-inline.scss
@@ -1,3 +1,4 @@
-form.inline.layout-wide {
+form.layout-wide {
   width: 100%;
+  max-width: 100%;
 }
diff --git a/rocky/assets/css/components/form.scss b/rocky/assets/css/components/form.scss
index d5a184cd9cb..cb741c63629 100644
--- a/rocky/assets/css/components/form.scss
+++ b/rocky/assets/css/components/form.scss
@@ -19,6 +19,27 @@ form {
     }
   }
 
+  .input-icon {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    input {
+      padding-right: 2.5rem;
+
+      &:hover {
+        border-color: var(--colors-grey-700);
+      }
+    }
+
+    .icon {
+      display: block;
+      margin-left: -1.25rem;
+      stroke: var(--colors-blue-600);
+    }
+  }
+
   @media (min-width: $breakpoint-filter) {
     .filter-fields-direction {
       &.row {
diff --git a/rocky/assets/css/components/messages.scss b/rocky/assets/css/components/messages.scss
index 3e45527104a..4ebc34df857 100644
--- a/rocky/assets/css/components/messages.scss
+++ b/rocky/assets/css/components/messages.scss
@@ -1,5 +1,6 @@
 .message {
   > div {
     margin-top: 0;
+    max-width: 100%;
   }
 }
diff --git a/rocky/assets/css/components/notifications.scss b/rocky/assets/css/components/notifications.scss
index a6e557fdcb1..a9f668e4e1e 100644
--- a/rocky/assets/css/components/notifications.scss
+++ b/rocky/assets/css/components/notifications.scss
@@ -1,3 +1,25 @@
+/* Block notification */
+div,
+section {
+  &.error,
+  &.warning,
+  &.explanation,
+  &.confirmation,
+  &.system {
+    flex-direction: row;
+
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+      font-size: var(--heading-small-font-size);
+    }
+  }
+}
+
+/* Help text */
 div {
   &.explanation {
     &.help-text {
@@ -10,3 +32,62 @@ div {
     margin-top: 0;
   }
 }
+
+/* Inline notification */
+p,
+span {
+  &.error,
+  &.warning,
+  &.explanation,
+  &.confirmation,
+  &.system {
+    &::before {
+      margin-left: -2rem;
+    }
+  }
+}
+
+/* Icons */
+p,
+span,
+section,
+div,
+form div,
+form section {
+  &.error {
+    &::before {
+      content: "\eac5";
+      color: var(--colors-red-600);
+    }
+  }
+
+  &.warning {
+    &::before {
+      content: "\ea06";
+      color: var(--colors-ochre-500);
+    }
+  }
+
+  &.explanation {
+    &::before {
+      content: "\eac5";
+      color: var(--colors-blue-600);
+    }
+  }
+
+  &.confirmation {
+    &::before {
+      content: "\ea5e";
+      color: var(--colors-green-600);
+    }
+  }
+
+  &.system {
+    background-color: var(--colors-black-05);
+
+    &::before {
+      content: "\ea06";
+      color: var(--colors-blue-600);
+    }
+  }
+}
diff --git a/rocky/assets/css/components/table-sortable.scss b/rocky/assets/css/components/table-sortable.scss
new file mode 100644
index 00000000000..3b3a1bf3770
--- /dev/null
+++ b/rocky/assets/css/components/table-sortable.scss
@@ -0,0 +1,36 @@
+/* Sortable table element */
+
+table thead th.sortable {
+  padding: 0;
+  border-radius: 0.25rem 0.25rem 0 0;
+
+  &:hover {
+    background-color: var(--colors-black-05);
+  }
+
+  &[aria-sort] {
+    background-color: var(--colors-purrple-100);
+
+    &:hover {
+      background-color: var(--colors-purrple-200);
+    }
+  }
+
+  button {
+    width: 100%;
+    height: 100%;
+    background-color: transparent;
+    border: 0;
+    padding: var(--table-head-cell-padding);
+    display: flex;
+    justify-content: flex-start;
+
+    .icon::before {
+      color: var(--colors-grey-500);
+    }
+
+    .icon.ti-direction::before {
+      font-size: 1.75rem;
+    }
+  }
+}
diff --git a/rocky/assets/css/components/toggle.scss b/rocky/assets/css/components/toggle.scss
new file mode 100644
index 00000000000..d2a1dc59717
--- /dev/null
+++ b/rocky/assets/css/components/toggle.scss
@@ -0,0 +1,70 @@
+button,
+a,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  $breakpoint: 24rem !default;
+
+  &.toggle-button {
+    /* Alignment */
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    align-self: flex-start;
+    gap: 0;
+    margin: 0;
+    box-sizing: border-box;
+
+    /* Styling */
+    border-radius: var(--border-radius-l);
+    padding: var(--spacing-grid-150);
+    width: 2.75rem;
+    height: 2.75rem;
+    border: 1px solid var(--colors-purrple-300);
+
+    /* Text and icon styling */
+    background-color: var(--colors-white);
+    color: var(--colors-purrple-500);
+    text-decoration: none;
+    font-size: 0;
+
+    &::before {
+      color: var(--colors-purrple-500);
+      padding: 0;
+    }
+
+    /* Behaviour */
+    cursor: pointer;
+    overflow-wrap: break-word;
+
+    /* States */
+    &[aria-current="page"] {
+      background-color: var(--colors-purrple-200);
+      border-color: var(--colors-purrple-200);
+
+      &::before {
+        color: var(--colors-purrple-700);
+      }
+    }
+
+    &:hover,
+    &:active {
+      border-color: var(--colors-purrple-500);
+    }
+
+    &:focus {
+      outline: 2px solid var(--colors-purrple-500);
+      outline-offset: 0.125rem;
+      z-index: 2;
+      position: relative;
+    }
+  }
+}
+
+a {
+  &.toggle-button {
+    &:visited {
+      color: var(--colors-purrple-500);
+    }
+  }
+}
diff --git a/rocky/assets/css/components/toolbar.scss b/rocky/assets/css/components/toolbar.scss
index ae148bb349c..f8c3e962c81 100644
--- a/rocky/assets/css/components/toolbar.scss
+++ b/rocky/assets/css/components/toolbar.scss
@@ -4,6 +4,7 @@
   justify-content: flex-end;
   align-items: center;
   width: 100%;
+  overflow: visible; /* Making sure outline is visible on focus */
 
   &.start {
     justify-content: flex-start;
diff --git a/rocky/assets/css/main.scss b/rocky/assets/css/main.scss
index 0e41f9ea21d..23fa9c7facb 100644
--- a/rocky/assets/css/main.scss
+++ b/rocky/assets/css/main.scss
@@ -29,9 +29,12 @@
 /* Components */
 @import "components/action-buttons";
 @import "components/block-indented";
+@import "components/button-plain";
 @import "components/cat-loader";
 @import "components/cat-paw-loader";
 @import "components/cytoscape";
+@import "components/destructive";
+@import "components/dropdown-form";
 @import "components/dropdown";
 @import "components/dropdown-list";
 @import "components/filter";
@@ -45,6 +48,7 @@
 @import "components/input-link";
 @import "components/language";
 @import "components/layout";
+@import "components/table-sortable";
 @import "components/table-state-icons";
 @import "components/messages";
 @import "components/chapter-numbering";
@@ -64,6 +68,7 @@
 @import "components/sticky";
 @import "components/state-tags";
 @import "components/table";
+@import "components/toggle";
 @import "components/toolbar";
 @import "components/tree-tables";
 @import "components/user-icon";
diff --git a/rocky/assets/css/themes/soft/fundamentals/border-radii.scss b/rocky/assets/css/themes/soft/fundamentals/border-radii.scss
index 6ca1b1c20b7..0ac5c9d7060 100644
--- a/rocky/assets/css/themes/soft/fundamentals/border-radii.scss
+++ b/rocky/assets/css/themes/soft/fundamentals/border-radii.scss
@@ -3,7 +3,8 @@
 :root {
   --border-radius-s: 0.25rem;
   --border-radius-m: 0.5rem;
-  --border-radius-l: 1.5rem;
+  --border-radius-l: 1rem;
+  --border-radius-xl: 1.5rem;
   --border-radius-round: 50%;
 }
 
diff --git a/rocky/assets/css/themes/soft/manon/button-destructive.scss b/rocky/assets/css/themes/soft/manon/button-destructive.scss
index 54a826c3e98..1ce089988b7 100644
--- a/rocky/assets/css/themes/soft/manon/button-destructive.scss
+++ b/rocky/assets/css/themes/soft/manon/button-destructive.scss
@@ -7,4 +7,7 @@
     --color-alert-negative-darker
   );
   --button-destructive-hover-text-color: white;
+
+  // --button-destructive-border-color: var(--colors-grey-200);
+  // --button-destructive-border-width: var(--button-ghost-border-width);
 }
diff --git a/rocky/assets/css/themes/soft/manon/button-ghost.scss b/rocky/assets/css/themes/soft/manon/button-ghost.scss
index f03ab8bc83b..39e02315e85 100644
--- a/rocky/assets/css/themes/soft/manon/button-ghost.scss
+++ b/rocky/assets/css/themes/soft/manon/button-ghost.scss
@@ -2,7 +2,7 @@
 
 :root {
   /* Button */
-  --button-ghost-background-color: transparent;
+  --button-ghost-background-color: var(--colors-white);
   --button-ghost-border-color: var(--colors-grey-200);
   --button-ghost-text-color: var(--colors-blue-600);
 
@@ -14,7 +14,7 @@
   /* States */
 
   /* Hover */
-  --button-ghost-hover-background-color: transparent;
+  --button-ghost-hover-background-color: var(--colors-white);
   --button-ghost-hover-border-color: var(--colors-blue-600);
   --button-ghost-hover-text-color: var(--colors-blue-700);
 
@@ -28,3 +28,17 @@
   --button-ghost-focus-border-color: var(--button-ghost-hover-border-color);
   --button-ghost-focus-text-color: var(--button-ghost-hover-text-color);
 }
+
+button,
+a.button,
+input[type="button"],
+input[type="submit"],
+input[type="reset"] {
+  &.ghost {
+    --link-icon-text-color: var(--button-ghost-text-color);
+
+    &:hover {
+      --link-icon-text-color: var(--button-ghost-hover-text-color);
+    }
+  }
+}
diff --git a/rocky/assets/css/themes/soft/manon/button-icon.scss b/rocky/assets/css/themes/soft/manon/button-icon.scss
index e814863f4a2..d8cff1a5e1e 100644
--- a/rocky/assets/css/themes/soft/manon/button-icon.scss
+++ b/rocky/assets/css/themes/soft/manon/button-icon.scss
@@ -2,7 +2,9 @@
 
 :root {
   --button-icon-min-width: 2.75rem;
+  --button-icon-width: 2.75rem;
   --button-icon-min-height: 2.75rem;
+  --button-icon-height: 2.75rem;
   --button-icon-icon-font-size: 0.8rem;
   --button-icon-icon-width: 0.75rem;
 }
diff --git a/rocky/assets/css/themes/soft/manon/button.scss b/rocky/assets/css/themes/soft/manon/button.scss
index 93c3c716d21..fd8d70b81e2 100644
--- a/rocky/assets/css/themes/soft/manon/button.scss
+++ b/rocky/assets/css/themes/soft/manon/button.scss
@@ -4,7 +4,7 @@
   /* Button */
   --button-base-background-color: var(--branding-color-2-background-color);
   --button-base-text-color: var(--branding-color-2-text-color);
-  --button-base-border-radius: 1rem;
+  --button-base-border-radius: var(--border-radius-l);
   --button-base-font-family: var(--application-base-font-family);
   --button-base-padding-top: var(--spacing-grid-150);
   --button-base-padding-right: var(--spacing-grid-200);
@@ -27,18 +27,18 @@
 
   /* Hover */
   --button-base-hover-background-color: var(--colors-yellow-300);
-  --button-base-hover-text-color: var(--application-base-text-color);
+  --button-base-hover-text-color: var(--colors-grey-900);
 
   /* Active */
   --button-base-active-background-color: var(--colors-yellow-300);
-  --button-base-active-text-color: var(--application-base-text-color);
+  --button-base-active-text-color: var(--colors-grey-900);
   --button-base-active-border-style: var(--button-base-border-style);
   --button-base-active-border-color: var(--button-base-active-background-color);
   --button-base-active-border-width: var(--button-base-border-width);
 
   /* Focus */
   --button-base-focus-background-color: var(--colors-yellow-300);
-  --button-base-focus-text-color: var(--application-base-text-color);
+  --button-base-focus-text-color: var(--colors-grey-900);
   --button-base-focus-border-style: var(--button-base-border-style);
   --button-base-focus-border-color: var(--button-base-focus-background-color);
   --button-base-focus-border-width: var(--button-base-border-width);
diff --git a/rocky/assets/css/themes/soft/manon/checkbox.scss b/rocky/assets/css/themes/soft/manon/checkbox.scss
index 7d58f541dc2..1e198264016 100644
--- a/rocky/assets/css/themes/soft/manon/checkbox.scss
+++ b/rocky/assets/css/themes/soft/manon/checkbox.scss
@@ -1,3 +1,4 @@
 :root {
   --checkbox-accent-color: var(--branding-color-2, initial);
+  --form-fieldset-checkbox-margin: 0.75rem 0;
 }
diff --git a/rocky/assets/css/themes/soft/manon/filter.scss b/rocky/assets/css/themes/soft/manon/filter.scss
index cc7c320b7b0..595d3ef8139 100644
--- a/rocky/assets/css/themes/soft/manon/filter.scss
+++ b/rocky/assets/css/themes/soft/manon/filter.scss
@@ -16,10 +16,12 @@
   --filter-button-icon-before-close-content: "\ea62";
 }
 
+.filter:has(form:not([hidden])) {
+  border-bottom: 1px solid var(--colors-grey-200);
+}
+
 .filter form {
-  background-color: transparent;
   padding: 1.5rem 2rem 2rem;
-  border-bottom: 1px solid var(--colors-grey-200);
 }
 
 /* Temporary fix, this needs to be updated after this issue has been solved in Manon */
diff --git a/rocky/assets/css/themes/soft/manon/form.scss b/rocky/assets/css/themes/soft/manon/form.scss
index cdfbe4649f3..2614b009378 100644
--- a/rocky/assets/css/themes/soft/manon/form.scss
+++ b/rocky/assets/css/themes/soft/manon/form.scss
@@ -2,6 +2,11 @@
 
 :root {
   --form-base-text-color: var(--application-base-text-color);
+  --form-base-background-color: transparent;
+  --form-base-padding-top: 0;
+  --form-base-padding-bottom: 0;
+  --form-base-padding-left: 0;
+  --form-base-max-width: 40rem;
 
   /* Accent color */
   --form-accent-color-color: var(--branding-color-2);
@@ -12,6 +17,7 @@
   --form-input-border-style: solid;
   --form-input-border-color: var(--colors-grey-200);
   --form-inline-gap: 1rem;
+  --form-input-border-radius: var(--border-radius-s);
 
   /* Help */
   --form-help-button-icon-content: "\ec9d";
@@ -31,5 +37,33 @@
 }
 
 form fieldset .checkbox input[type="checkbox"] + label {
-  max-width: 40rem;
+  max-width: var(--form-base-max-width);
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+form label {
+  font-weight: bold;
+}
+
+form.help fieldset {
+  &.column-2 {
+    gap: var(--layout-column-2-gap);
+  }
+
+  &.column-3 {
+    gap: var(--layout-column-3-gap);
+  }
+
+  &.column-4 {
+    gap: var(--layout-column-4-gap);
+  }
+}
+
+.checkbox-list {
+  row-gap: 0;
+}
+
+form textarea {
+  border-radius: var(--form-input-border-radius);
 }
diff --git a/rocky/assets/css/themes/soft/manon/language-selector-list.scss b/rocky/assets/css/themes/soft/manon/language-selector-list.scss
index 651c607f45b..4ad717484df 100644
--- a/rocky/assets/css/themes/soft/manon/language-selector-list.scss
+++ b/rocky/assets/css/themes/soft/manon/language-selector-list.scss
@@ -46,7 +46,7 @@
   /* List item */
   --language-selector-list-item-background-color: transparent;
   --language-selector-list-item-active-background-color: transparent;
-  --language-selector-list-item-hover-background-color: var(--colors-grey-100);
+  --language-selector-list-item-hover-background-color: var(--colors-black-05);
 
   /* List item link */
   --language-selector-list-item-link-border-width: 0;
diff --git a/rocky/assets/css/themes/soft/manon/link.scss b/rocky/assets/css/themes/soft/manon/link.scss
index 30a8a69fef0..ac27df86efc 100644
--- a/rocky/assets/css/themes/soft/manon/link.scss
+++ b/rocky/assets/css/themes/soft/manon/link.scss
@@ -2,8 +2,13 @@
 
 :root {
   --link-text-decoration: underline;
+  --link-font-weight: normal;
 }
 
 a {
   text-decoration-thickness: 0.045rem;
+
+  &:hover {
+    color: var(--colors-blue-700);
+  }
 }
diff --git a/rocky/assets/css/themes/soft/manon/notification-block.scss b/rocky/assets/css/themes/soft/manon/notification-block.scss
index 713d94abde7..45e75d01f6c 100644
--- a/rocky/assets/css/themes/soft/manon/notification-block.scss
+++ b/rocky/assets/css/themes/soft/manon/notification-block.scss
@@ -1,7 +1,9 @@
 /* Notification block - Variables */
 
 :root {
-  --notification-block-element-padding-right: 0.5rem;
-  --notification-block-element-padding-left: 0.5rem;
+  --notification-block-element-padding-top: var(--spacing-grid-300);
+  --notification-block-element-padding-right: var(--spacing-grid-200);
+  --notification-block-element-padding-left: var(--spacing-grid-200);
+  --notification-block-element-padding-bottom: var(--spacing-grid-300);
   --notification-block-element-gap: 0.5rem;
 }
diff --git a/rocky/assets/css/themes/soft/manon/notification-paragraph.scss b/rocky/assets/css/themes/soft/manon/notification-paragraph.scss
new file mode 100644
index 00000000000..61bf5d58846
--- /dev/null
+++ b/rocky/assets/css/themes/soft/manon/notification-paragraph.scss
@@ -0,0 +1,8 @@
+/* Notification paragraph - Variables */
+
+:root {
+  --notification-paragraph-padding-top: var(--spacing-grid-200);
+  --notification-paragraph-padding-right: var(--spacing-grid-200);
+  --notification-paragraph-padding-bottom: var(--spacing-grid-200);
+  --notification-paragraph-padding-left: var(--spacing-grid-600);
+}
diff --git a/rocky/assets/css/themes/soft/manon/tags.scss b/rocky/assets/css/themes/soft/manon/tags.scss
index 78e97397ca2..a6b2bd95fa9 100644
--- a/rocky/assets/css/themes/soft/manon/tags.scss
+++ b/rocky/assets/css/themes/soft/manon/tags.scss
@@ -2,4 +2,5 @@
 
 :root {
   --tag-font-size: var(--body-text-small-font-size);
+  --tag-font-weight: bold;
 }
diff --git a/rocky/assets/css/themes/soft/soft.scss b/rocky/assets/css/themes/soft/soft.scss
index 204b5a949c7..136fa00c2de 100644
--- a/rocky/assets/css/themes/soft/soft.scss
+++ b/rocky/assets/css/themes/soft/soft.scss
@@ -59,6 +59,7 @@
 @import "manon/header-navigation-link-active";
 @import "manon/notification-colors";
 @import "manon/notification-block";
+@import "manon/notification-paragraph";
 @import "manon/icon";
 @import "manon/layout-column-4";
 @import "manon/layout-form";
diff --git a/rocky/assets/css/vendor_overrides/manon/form-fieldset-required.scss b/rocky/assets/css/vendor_overrides/manon/form-fieldset-required.scss
index 5c795ff64f9..16b8a11b26c 100644
--- a/rocky/assets/css/vendor_overrides/manon/form-fieldset-required.scss
+++ b/rocky/assets/css/vendor_overrides/manon/form-fieldset-required.scss
@@ -1,11 +1,14 @@
 /* Form fieldset required */
 
 form.horizontal-view div.required {
+  --nota-bene-height: calc(
+    var(--form-horizontal-view-fieldset-nota-bene-required-margin-bottom) +
+      1.75rem /* Nota bene line height */
+  );
+  --input-height-quarter: calc(var(--form-input-min-height) * 0.25);
+
   label {
-    margin-top: calc(
-      var(--form-horizontal-view-fieldset-nota-bene-required-margin-bottom) +
-        var(--form-input-min-height) / 2
-    );
+    margin-top: calc(var(--nota-bene-height) + var(--input-height-quarter));
   }
 
   select + div + .help-button {
diff --git a/rocky/assets/css/vendor_overrides/manon/form-radio.scss b/rocky/assets/css/vendor_overrides/manon/form-radio.scss
index 9d8b4a1ec2a..cb84f5b90e7 100644
--- a/rocky/assets/css/vendor_overrides/manon/form-radio.scss
+++ b/rocky/assets/css/vendor_overrides/manon/form-radio.scss
@@ -2,4 +2,8 @@
 
 form input[type="radio"] {
   margin: var(--form-radio-margin);
+
+  & + label {
+    font-weight: normal;
+  }
 }
diff --git a/rocky/assets/css/vendor_overrides/manon/notification.scss b/rocky/assets/css/vendor_overrides/manon/notification.scss
index 03b895c8acf..4fa921bf464 100644
--- a/rocky/assets/css/vendor_overrides/manon/notification.scss
+++ b/rocky/assets/css/vendor_overrides/manon/notification.scss
@@ -7,12 +7,14 @@ h2,
 h3,
 h4,
 h5,
-h6 {
+h6,
+div {
   &.error,
   &.warning,
   &.explanation,
   &.confirmation,
   &.system {
     max-width: var(--max-line-length-max-width);
+    margin: 0;
   }
 }
diff --git a/rocky/components/modal/README.md b/rocky/components/modal/README.md
index 9dad3585dbe..b6f996e6dc4 100644
--- a/rocky/components/modal/README.md
+++ b/rocky/components/modal/README.md
@@ -20,22 +20,25 @@ First you need to add `{% load component_tags %}` at the top of your template. N
 {% endblock html_at_end_body %}
 ```
 
-After that, `{% component "modal" size="xx" %}` is enough to instantiate the dialog modal component where size should contain the appropriate class name to achieve the correct sizing. This can be either `dialog-small`, `dialog-medium` or `dialog-large`.
+After that, `{% component "modal" modal_id="xx" size="xx" %}` is enough to instantiate the dialog modal component where `modal_id` should contain a unique identifier that must be also used in the triggers `data-modal-id` attribute, and `size` should contain the appropriate class name to achieve the correct sizing. This can be either `dialog-small`, `dialog-medium` or `dialog-large`.
 
-### Slots and fills
+### The trigger element
 
-Each named `fill` corresponds with a placeholder/target `slot` in the component template. The contents between the `fill` tag will be passed to the corresponding `slot`. As shown in the below example it's possible to utilise Django template tags and `HTML` tags with these `fill` tags. This enables us to entirely build the contents of the modal in the template where we implement it. Because we can use `HTML` tags here, we can also use `forms` and leave the handling of said form up to the Django template that knows about the context and applicable data, where we implement the modal. The defaults are used when no `fill` tags are implemented for this slot at all.
+The trigger element needs some explaining. This will be the element that `on click` will show the modal dialog,
+the `element` gets assigned the click handler by JavaScript.
+It's essential to include the data attribute `data-modal-id="xx"`, where "xx" is the same as the `id` attribute on the intended modal. This is what defines the modal dialog that this trigger is meant to target. The only exception to this is when an `<a>` is used, with an `href` containing an anchor `"#xx"`, which points to `the modal-id` of the target modal.
+While it might seem obvious to use a `button` or a `a` as a trigger, the modal is set up in a way that allows for any HTML element to be used as a trigger.
+The trigger doesn't need to be part of the `{% component %}` itself and can be placed anywhere in the HTML template, though it makes sense to place them adjacent or as close as possible to each other.
 
-There's a total of four slots you can fill:
+### Slots and fills
 
-1.  `trigger`: call to action `button` by default, with the caption "Open modal".
-2.  `header`: empty by default
-3.  `content`: empty by default
-4.  `footer_buttons`: cancel `button` by default. To have _no buttons_ show at all, it's needed to implement empty `fill` tags for this `slot`.
+Each named `fill` corresponds with a placeholder/target `slot` in the component template. The contents between the `fill` tag will be passed to the corresponding `slot`. As shown in the below example it's possible to utilise Django template tags and `HTML` tags with these `fill` tags. This enables us to entirely build the contents of the modal in the template where we implement it. Because we can use `HTML` tags here, we can also use `forms` and leave the handling of said form up to the Django template that knows about the context and applicable data, where we implement the modal. The defaults are used when no `fill` tags are implemented for this slot at all.
 
-### The trigger element
+There's a total of three slots you can fill:
 
-The trigger `slot` is a special one. This needs to contain the HTML `element` that gets assigned the click handler by JavaScript. It's essential to include the `class="modal-trigger"` attribute, because this is what we target to assign the click handler, using JS. While it might seem obvious to use a `button` as a trigger, the modal is setup in a way that allows for any HTML element to be used as a trigger.
+1.  `header`: empty by default
+2.  `content`: empty by default
+3.  `footer_buttons`: cancel `button` by default. To have _no buttons_ show at all, it's needed to implement empty `fill` tags for this `slot`.
 
 ### CSS dependencies
 
@@ -44,10 +47,11 @@ Including `{% component_css_dependencies %}` is needed to inject the reference t
 ### Example implementation
 
 ```
-{% component "modal" size="dialog-small" %}
-  {% fill "trigger" %}
-		<button class="modal-trigger">Click here to open the modal.</button>
-	{% endfill %}
+  <a href="#" data-modal-id="rename-modal">
+```
+
+```
+{% component "modal" modal_id="rename-modal" size="dialog-small" %}
 	{% fill "header" %}
 		{% translate "This is an example header." %}
 	{% endfill %}
diff --git a/rocky/components/modal/modal.py b/rocky/components/modal/modal.py
index f3ad0d6dd6d..c2c55f668cb 100644
--- a/rocky/components/modal/modal.py
+++ b/rocky/components/modal/modal.py
@@ -8,6 +8,7 @@ class Modal(component.Component):
     def get_context_data(self, **kwargs):
         return {
             "size": kwargs["size"],
+            "modal_id": kwargs["modal_id"],
         }
 
     class Media:
diff --git a/rocky/components/modal/script.js b/rocky/components/modal/script.js
index 006c8cc8ccb..24e077f7b0a 100644
--- a/rocky/components/modal/script.js
+++ b/rocky/components/modal/script.js
@@ -1,6 +1,17 @@
 import { onDomReady } from "../js/imports/utils.js";
 
-onDomReady(initDialogs);
+onDomReady(function () {
+  initDialogs();
+  openDialogFromUrl();
+});
+
+export function openDialogFromUrl() {
+  // If ID is present in the URL on DomReady, open the dialog immediately.
+  let id = window.location.hash.slice(1);
+  if (id) {
+    showModalBasedOnAnchor(id);
+  }
+}
 
 export function initDialogs(element) {
   let root = element || document;
@@ -10,67 +21,52 @@ export function initDialogs(element) {
 }
 
 export function initDialog(modal) {
-  let input_elements = [];
+  let dialog_element = modal.querySelector("dialog");
+  if (!dialog_element) return;
 
-  modal.querySelector(".modal-trigger").addEventListener("click", (event) => {
-    // Get and clone input elements to be able to "reset" them on "cancel".
-    input_elements = modal.querySelectorAll("input, textarea");
+  let trigger = document.querySelector(
+    "[data-modal-id='" + dialog_element.id + "']:not(a)",
+  );
 
-    // Store the initial value in a data attribute
-    input_elements.forEach((element) => {
-      element.defaultvalue = element.value;
+  // Check if trigger element is <a>, if not, on click,
+  // alter the URL to open the dialog using the onhaschange event.
+  if (trigger) {
+    trigger.addEventListener("click", (event) => {
+      window.location.hash = "#" + dialog_element.id;
     });
+  }
 
-    // Used ".closest" instead of ".parentNode" to make sure we stay flexible in terms of
-    // HTML-structure when implementing the trigger.
-    event.target.closest(".modal-wrapper").querySelector("dialog").showModal();
-  });
-
-  modal.querySelector("dialog").addEventListener("click", (event) => {
+  dialog_element.addEventListener("click", (event) => {
     // The actual handling (like posting) of the input values should be done when implementing the component.
-    if (event.target.classList.contains("confirm-modal-button")) {
-      if (input_elements) {
-        // Closing is only allowed when the inputs are 'valid'.
-        if (checkValidity(input_elements)) {
-          event.target
-            .closest(".modal-wrapper")
-            .querySelector("dialog")
-            .close();
-        }
-        return;
-      }
-    }
     // event.target.nodeName === 'DIALOG' is needed to check if the ::backdrop is clicked.
     if (
+      event.target.classList.contains("confirm-modal-button") ||
       event.target.classList.contains("close-modal-button") ||
       event.target.nodeName === "DIALOG"
     ) {
-      // When canceling or closing using the 'x' remove the "error" styles.
-      input_elements.forEach((element) => {
-        element.classList.remove("error");
-      });
-
-      // When canceling or closing the modal, the inputs get reset to their initial value.
-      input_elements.forEach((element) => {
-        element.value = element.defaultvalue;
-      });
-
       event.target.closest(".modal-wrapper").querySelector("dialog").close();
     }
   });
-}
-
-export function checkValidity(elements) {
-  let valid = true;
 
-  elements.forEach((element) => {
-    if (!element.checkValidity()) {
-      valid = false;
-      element.classList.add("error");
-    } else {
-      element.classList.remove("error");
-    }
+  dialog_element.addEventListener("close", (event) => {
+    removeDialogAnchor();
   });
+}
 
-  return valid;
+export function removeDialogAnchor() {
+  // Remove the anchor from the URL when closing the modal
+  let baseUrl = window.location.toString().split("#")[0];
+  window.history.pushState("", "Base URL", baseUrl);
 }
+
+export function showModalBasedOnAnchor(id) {
+  if (id && document.querySelector("dialog#" + id + ".modal")) {
+    // Show modal, selected by ID
+    document.querySelector("#" + id).showModal();
+  }
+}
+
+addEventListener("hashchange", function () {
+  let id = window.location.toString().split("#")[1];
+  showModalBasedOnAnchor(id);
+});
diff --git a/rocky/components/modal/template.html b/rocky/components/modal/template.html
index 7e1235532f2..f0dc8be4356 100644
--- a/rocky/components/modal/template.html
+++ b/rocky/components/modal/template.html
@@ -3,13 +3,10 @@
 {% load compress %}
 
 <div class="modal-wrapper">
-    {% slot "trigger" %}
-        <button class="modal-trigger">Open modal</button>
-    {% endslot %}
-
     <dialog class="modal {{ size }}"
-            aria-modal="true"
-            role="dialog">
+        aria-modal="true"
+        role="dialog"
+        id="{{ modal_id }}">
         <div class="content-wrapper">
             <section class="header">
                 <h2>{% slot "header" %}{% endslot %}</h2>
diff --git a/rocky/katalogus/client.py b/rocky/katalogus/client.py
index 9c293a670ba..51c60439f17 100644
--- a/rocky/katalogus/client.py
+++ b/rocky/katalogus/client.py
@@ -1,9 +1,11 @@
+import json
 from io import BytesIO
 
 import httpx
 import structlog
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
+from httpx import codes
 from jsonschema.exceptions import SchemaError
 from jsonschema.validators import Draft202012Validator
 from pydantic import BaseModel, Field, field_serializer
@@ -24,7 +26,6 @@ class Plugin(BaseModel):
     authors: str | None = None
     created: str | None = None
     description: str | None = None
-    environment_keys: list[str] | None = None
     related: list[str] = Field(default_factory=list)
     enabled: bool
     type: str
@@ -39,10 +40,14 @@ def can_scan(self, member) -> bool:
 
 class Boefje(Plugin):
     scan_level: SCAN_LEVEL
-    consumes: set[type[OOI]]
+    consumes: set[type[OOI]] = Field(default_factory=set)
+    produces: set[str] = Field(default_factory=set)
     options: list[str] | None = None
     runnable_hash: str | None = None
-    produces: set[str]
+    interval: int | None = None
+    boefje_schema: dict | None = None
+    oci_image: str | None = None
+    oci_arguments: list[str] = Field(default_factory=list)
 
     # use a custom field_serializer for `consumes`
     @field_serializer("consumes")
@@ -50,7 +55,7 @@ def serialize_consumes(self, consumes: set[type[OOI]]):
         return {ooi_class.get_ooi_type() for ooi_class in consumes}
 
     def can_scan(self, member) -> bool:
-        return super().can_scan(member) and member.acknowledged_clearance_level >= self.scan_level.value
+        return super().can_scan(member) and member.has_clearance_level(self.scan_level.value)
 
 
 class Normalizer(Plugin):
@@ -64,19 +69,47 @@ def serialize_produces(self, produces: set[type[OOI]]):
 
 
 class KATalogusError(Exception):
-    message: str = _("The KATalogus has an unexpected error. Check the logs for further details.")
+    @property
+    def message(self):
+        return self._message
+
+    def __init__(self, message: str | None = None):
+        if message is None:
+            message = _("The KATalogus has an unexpected error. Check the logs for further details.")
+
+        self._message = message
+
+        super().__init__(message)
 
     def __str__(self):
-        return str(self.message)
+        return self._message
+
+
+class DuplicatePluginError(KATalogusError):
+    def __init__(self, error_message: str):
+        super().__init__(error_message)
+
+
+class DuplicateNameError(KATalogusError):
+    def __init__(self):
+        super().__init__(_("Boefje with this name already exists."))
+
+
+class DuplicateIdError(KATalogusError):
+    def __init__(self):
+        super().__init__(_("Boefje with this ID already exists."))
+
+
+class KATalogusNotAllowedError(KATalogusError):
+    def __init__(self):
+        super().__init__(_("Editing this boefje is not allowed because it is static."))
 
 
 class KATalogusHTTPStatusError(KATalogusError):
-    def __init__(self, *args: object, status_code: str | None = None) -> None:
-        super().__init__(*args)
-        status_message = ""
-        if status_code is not None:
-            status_message = f"{status_code}: "
-        self.message = status_message + _("A HTTP error occurred. Check logs for more info.")
+    def __init__(self, error: httpx.HTTPStatusError):
+        self.error = error
+
+        super().__init__(_("An HTTP %d error occurred. Check logs for more info.").format(error.response.status_code))
 
 
 class KATalogusClientV1:
@@ -102,12 +135,12 @@ def delete_organization(self):
 
         logger.info("Deleted organization", organization_code=self.organization)
 
-    def get_plugins(self, **params):
+    def get_plugins(self, **params) -> list[Plugin]:
         try:
             response = self.session.get(f"{self.organization_uri}/plugins", params=params)
             response.raise_for_status()
         except httpx.HTTPStatusError as error:
-            raise KATalogusHTTPStatusError(status_code=str(error.response.status_code))
+            raise KATalogusHTTPStatusError(error)
         return [parse_plugin(plugin) for plugin in response.json()]
 
     def get_plugin(self, plugin_id: str) -> Plugin:
@@ -170,14 +203,14 @@ def get_normalizers(self) -> list[Plugin]:
     def get_boefjes(self) -> list[Plugin]:
         return self.get_plugins(plugin_type="boefje")
 
-    def enable_boefje(self, plugin: Plugin) -> None:
-        self._patch_boefje_state(plugin.id, True)
+    def enable_plugin(self, plugin: Plugin) -> None:
+        self._patch_plugin_state(plugin.id, True)
 
     def enable_boefje_by_id(self, boefje_id: str) -> None:
-        self.enable_boefje(self.get_plugin(boefje_id))
+        self.enable_plugin(self.get_plugin(boefje_id))
 
-    def disable_boefje(self, plugin: Plugin) -> None:
-        self._patch_boefje_state(plugin.id, False)
+    def disable_plugin(self, plugin: Plugin) -> None:
+        self._patch_plugin_state(plugin.id, False)
 
     def get_enabled_boefjes(self) -> list[Plugin]:
         return [plugin for plugin in self.get_boefjes() if plugin.enabled]
@@ -185,7 +218,7 @@ def get_enabled_boefjes(self) -> list[Plugin]:
     def get_enabled_normalizers(self) -> list[Plugin]:
         return [plugin for plugin in self.get_normalizers() if plugin.enabled]
 
-    def _patch_boefje_state(self, boefje_id: str, enabled: bool) -> None:
+    def _patch_plugin_state(self, boefje_id: str, enabled: bool) -> None:
         logger.info("Toggle plugin state", plugin_id=boefje_id, enabled=enabled)
 
         response = self.session.patch(
@@ -205,6 +238,44 @@ def get_cover(self, boefje_id: str) -> BytesIO:
         response.raise_for_status()
         return BytesIO(response.content)
 
+    def create_plugin(self, plugin: Plugin) -> None:
+        try:
+            response = self.session.post(
+                f"{self.organization_uri}/plugins",
+                headers={"Content-Type": "application/json"},
+                content=plugin.model_dump_json(exclude_none=True),
+            )
+            response.raise_for_status()
+        except httpx.HTTPStatusError as error:
+            if error.response.status_code == codes.CREATED:
+                logger.info("Plugin %s created", plugin.name)
+            else:
+                logger.info("Plugin %s could not be created", plugin.name)
+            error_message = json.loads(error.response.text).get("detail")
+            if error.response.status_code == codes.BAD_REQUEST and "Duplicate plugin" in error_message:
+                raise DuplicatePluginError(error_message)
+            else:
+                raise error
+
+    def edit_plugin(self, plugin: Plugin) -> None:
+        try:
+            response = self.session.patch(
+                f"{self.organization_uri}/boefjes/{plugin.id}",
+                content=plugin.model_dump_json(exclude_none=True),
+            )
+            response.raise_for_status()
+        except httpx.HTTPStatusError as error:
+            if error.response.status_code == codes.CREATED:
+                logger.info("Plugin %s updated", plugin.name)
+            else:
+                logger.info("Plugin %s could not be updated", plugin.name)
+            if error.response.status_code == codes.BAD_REQUEST and "duplicate key" in error.response.text:
+                raise DuplicatePluginError("Duplicate plugin name")
+            if error.response.status_code in [codes.FORBIDDEN, codes.NOT_FOUND]:
+                raise KATalogusNotAllowedError
+            else:
+                raise error
+
 
 def parse_boefje(boefje: dict) -> Boefje:
     scan_level = SCAN_LEVEL(boefje["scan_level"])
@@ -220,12 +291,17 @@ def parse_boefje(boefje: dict) -> Boefje:
     return Boefje(
         id=boefje["id"],
         name=boefje.get("name") or boefje["id"],
-        description=boefje["description"],
+        created=boefje.get("created"),
+        description=boefje.get("description"),
+        interval=boefje.get("interval"),
         enabled=boefje["enabled"],
         type=boefje["type"],
         scan_level=scan_level,
         consumes=consumes,
         produces=boefje["produces"],
+        boefje_schema=boefje.get("boefje_schema"),
+        oci_image=boefje.get("oci_image"),
+        oci_arguments=boefje.get("oci_arguments", []),
     )
 
 
diff --git a/rocky/katalogus/templates/about_plugins.html b/rocky/katalogus/templates/about_plugins.html
index ac295f89512..94b1ee65957 100644
--- a/rocky/katalogus/templates/about_plugins.html
+++ b/rocky/katalogus/templates/about_plugins.html
@@ -23,8 +23,9 @@ <h1>{% translate "About plugins" %}</h1>
                     <h2>Boefjes</h2>
                     <p>
                         {% blocktranslate trimmed %}
-                            Boefjes gather factual information, such as by calling an external scanning
-                            tool like nmap or using a database like shodan.
+                            Boefjes are used to scan for objects. They detect vulnerabilities,
+                            security issues, and give insight. Each boefje is a separate scan that
+                            can run on a selection of objects.
                         {% endblocktranslate %}
                     </p>
                     <h2>Normalizers</h2>
diff --git a/rocky/katalogus/templates/boefje_detail.html b/rocky/katalogus/templates/boefje_detail.html
index 316262fd2bb..7b59666d1c5 100644
--- a/rocky/katalogus/templates/boefje_detail.html
+++ b/rocky/katalogus/templates/boefje_detail.html
@@ -12,17 +12,12 @@
             <div class="two-thirds-one-third">
                 <div>
                     <h1>{{ plugin.name }}</h1>
+                    {% if plugin.description %}<p class="emphasized">{{ plugin.description }}</p>{% endif %}
                     <div class="horizontal-view scan-intensity">
                         <span class="de-emphasized">{% translate "Scan level" %}</span>
                         {% include "partials/scan_level_indicator.html" with value=plugin.scan_level %}
 
                     </div>
-                    {% if plugin.description %}
-                        <p>
-                            <strong>{% translate "Description" %}</strong>
-                        </p>
-                        <p>{{ plugin.description }}</p>
-                    {% endif %}
                     <div class="horizontal-view">
                         {% include "partials/enable_disable_plugin.html" with plugin=plugin %}
 
@@ -37,9 +32,17 @@ <h1>{{ plugin.name }}</h1>
                 </div>
             </div>
         </section>
-        {% if perms.tools.can_view_katalogus_settings %}
-            {% include "plugin_settings_list.html" with object_list=plugin_settings plugin=plugin %}
+        {% if perms.tools.can_view_katalogus_settings and plugin_settings %}
+            <section>
+                {% include "plugin_settings_list.html" with object_list=plugin_settings plugin=plugin %}
 
+            </section>
+        {% endif %}
+        {% if plugin.oci_image %}
+            <section>
+                {% include "plugin_container_image.html" %}
+
+            </section>
         {% endif %}
         <section>
             <div>
@@ -61,24 +64,33 @@ <h2>{% translate "Consumes" %}</h2>
                         {{ plugin_name }} does not need any input objects.
                     {% endblocktranslate %}
                 {% endif %}
+            </div>
+        </section>
+        <section>
+            <div>
                 <h2>{% translate "Produces" %}</h2>
-                <p>
+                {% if plugin.produces %}
+                    <p>
+                        {% blocktranslate trimmed with plugin_name=plugin.name %}
+                            {{ plugin_name }} can produce the following output:
+                        {% endblocktranslate %}
+                    </p>
+                    <p>
+                        <ul>
+                            {% for mime_type in plugin.produces %}<li>{{ mime_type }}</li>{% endfor %}
+                        </ul>
+                    </p>
+                {% else %}
                     {% blocktranslate trimmed with plugin_name=plugin.name %}
-                        {{ plugin_name }} can produce the following output:
+                        {{ plugin_name }} doesn't produce any output mime types.
                     {% endblocktranslate %}
-                </p>
-                <p>
-                    {{ plugin.produce }}
-                    <ul>
-                        {% for mime_type in plugin.produces %}<li>{{ mime_type }}</li>{% endfor %}
-                    </ul>
-                </p>
-                <p>
-                    {% include "tasks/plugin_detail_task_list.html" %}
-
-                </p>
+                {% endif %}
             </div>
         </section>
+        <section>
+            {% include "tasks/plugin_detail_task_list.html" %}
+
+        </section>
         {% if perms.tools.can_scan_organization %}
             {% include "partials/objects_to_scan.html" with plugin=plugin %}
 
diff --git a/rocky/katalogus/templates/boefje_setup.html b/rocky/katalogus/templates/boefje_setup.html
new file mode 100644
index 00000000000..48c2d75c0fe
--- /dev/null
+++ b/rocky/katalogus/templates/boefje_setup.html
@@ -0,0 +1,48 @@
+{% extends "layouts/base.html" %}
+
+{% load i18n %}
+{% load static %}
+
+{% block content %}
+    {% include "header.html" %}
+
+    <main id="main-content">
+        <section>
+            <div class="layout-form">
+                {% if boefje_variant %}
+                    <h1>{% translate "Boefje variant setup" %}</h1>
+                {% elif edit_boefje_name %}
+                    <h1>{% translate "Edit" %} "{{ edit_boefje_name }}"</h1>
+                {% else %}
+                    <h1>{% translate "Boefje setup" %}</h1>
+                {% endif %}
+                <p>
+                    {% blocktranslate %}
+                        You can create a new Boefje. If you want more information on this,
+                        you can check out the <a href="https://docs.openkat.nl/developer_documentation/development_tutorial/creating_a_boefje.html">documentation</a>.
+                    {% endblocktranslate%}
+                </p>
+                <form action="" method="post" class="help">
+                    {% csrf_token %}
+                    {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
+
+                    <div class="button-container">
+                        {% if edit_boefje_name %}
+                            <button type="submit">{% translate "Save changes" %}</button>
+                            <a href="{% url "boefje_detail" organization_code=organization.code plugin_id=return_to_plugin_id %}"
+                               class="button ghost">{% translate "Discard changes" %}</a>
+                        {% elif boefje_variant %}
+                            <button type="submit">{% translate "Create variant" %}</button>
+                            <a href="{% url "boefje_detail" organization_code=organization.code plugin_id=return_to_plugin_id %}"
+                               class="button ghost">{% translate "Discard variant" %}</a>
+                        {% else %}
+                            <button type="submit">{% translate "Create new Boefje" %}</button>
+                            <a href="{% url "katalogus" organization_code=organization.code %}"
+                               class="button ghost">{% translate "Discard new Boefje" %}</a>
+                        {% endif %}
+                    </div>
+                </form>
+            </div>
+        </section>
+    </main>
+{% endblock content %}
diff --git a/rocky/katalogus/templates/boefjes.html b/rocky/katalogus/templates/boefjes.html
index 91c55b0eb4b..5976329f4cd 100644
--- a/rocky/katalogus/templates/boefjes.html
+++ b/rocky/katalogus/templates/boefjes.html
@@ -16,14 +16,21 @@
                     <h2>Boefjes</h2>
                     <p>
                         {% blocktranslate trimmed %}
-                            Boefjes gather factual information, such as by calling an
-                            external scanning tool like nmap or using a database like shodan.
+                            Boefjes are used to scan for objects. They detect vulnerabilities,
+                            security issues, and give insight. Each boefje is a separate scan that
+                            can run on a selection of objects.
                         {% endblocktranslate %}
                     </p>
-                    <p class="emphasized">
+                    <p class="de-emphasized">
                         <strong>{{ object_list|length }}</strong> Boefje{{ object_list|pluralize:"s" }} {% translate "available" %}
                     </p>
                 </div>
+                {% if perms.tools.can_set_katalogus_settings %}
+                    <div class="horizontal-view toolbar">
+                        <a class="button ghost"
+                           href="{% url "boefje_setup" organization_code=organization.code %}"><span aria-hidden="true" class="icon ti-plus"></span>{% translate "Add Boefje" %}</a>
+                    </div>
+                {% endif %}
             </div>
             {% include "partials/katalogus_filter.html" with form=form %}
             {% include "partials/katalogus_toolbar.html" %}
diff --git a/rocky/katalogus/templates/clone_settings.html b/rocky/katalogus/templates/clone_settings.html
index 5a18eab69b3..b6efa5469b4 100644
--- a/rocky/katalogus/templates/clone_settings.html
+++ b/rocky/katalogus/templates/clone_settings.html
@@ -11,7 +11,7 @@ <h2>{% translate "Clone settings" %}</h2>
         </p>
         <form action="{% url "katalogus_settings" organization.code %}"
               method="post"
-              class="horizontal-view help"
+              class="help"
               novalidate>
             {% csrf_token %}
             {% include "partials/form/fieldset.html" with legend=name fields=form %}
diff --git a/rocky/katalogus/templates/katalogus.html b/rocky/katalogus/templates/katalogus.html
index 24107431705..3284a9491e3 100644
--- a/rocky/katalogus/templates/katalogus.html
+++ b/rocky/katalogus/templates/katalogus.html
@@ -32,7 +32,7 @@ <h2>{% translate "All plugins" %}</h2>
             </div>
             {% include "partials/katalogus_filter.html" with form=form %}
             {% include "partials/katalogus_toolbar.html" %}
-            {% include "partials/plugins.html" %}
+            {% include "partials/plugins.html" with active="all" %}
 
         </section>
     </main>
diff --git a/rocky/katalogus/templates/partials/katalogus_toolbar.html b/rocky/katalogus/templates/partials/katalogus_toolbar.html
index cea35c9210b..96f21fe1c29 100644
--- a/rocky/katalogus/templates/partials/katalogus_toolbar.html
+++ b/rocky/katalogus/templates/partials/katalogus_toolbar.html
@@ -3,8 +3,10 @@
 {% if object_list %}
     <div class="horizontal-view horizontal-scroll toolbar">
         <a href="{% url url_name organization_code=organization.code view_type="grid" %}?{{ request.GET.urlencode }}"
-           class="button icon ti-layout-grid {% if view_type == "table" %}ghost{% endif %}">{% translate "Gridview" %}</a>
+           class=" icon toggle-button ti-layout-grid"
+           {% if view_type == "grid" %}aria-current="page"{% endif %}>{% translate "Gridview" %}</a>
         <a href="{% url url_name organization_code=organization.code view_type="table" %}?{{ request.GET.urlencode }}"
-           class="button icon ti-menu-2 {% if view_type != "table" %}ghost{% endif %}">{% translate "Tableview" %}</a>
+           class=" icon toggle-button ti-menu-2"
+           {% if view_type == "table" %}aria-current="page"{% endif %}>{% translate "Tableview" %}</a>
     </div>
 {% endif %}
diff --git a/rocky/katalogus/templates/partials/plugin_settings_required.html b/rocky/katalogus/templates/partials/plugin_settings_required.html
index c48dc8842ac..889cd86766a 100644
--- a/rocky/katalogus/templates/partials/plugin_settings_required.html
+++ b/rocky/katalogus/templates/partials/plugin_settings_required.html
@@ -8,7 +8,7 @@
                 {% if not form %}
                     <h1>{% translate "The form could not be initialized." %}</h1>
                 {% else %}
-                    <form novalidate method="post" class="horizontal-view help">
+                    <form novalidate method="post" class="help">
                         {% csrf_token %}
                         {% translate "Required settings" as fieldset_legend %}
                         {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/katalogus/templates/partials/plugin_tile_modal.html b/rocky/katalogus/templates/partials/plugin_tile_modal.html
index 51479c5c035..dadf623ac0b 100644
--- a/rocky/katalogus/templates/partials/plugin_tile_modal.html
+++ b/rocky/katalogus/templates/partials/plugin_tile_modal.html
@@ -1,11 +1,12 @@
 {% load i18n %}
 
-{% component "modal" size="dialog-medium" %}
-{% fill "trigger" %}
-<a class="tile-detail-link modal-trigger">{% translate "See details" %}</a>
-{% endfill %}
-{% fill "header" %}
-{% translate "Boefje details" %}
+<a href="#{{ plugin.id }}-detail-modal"
+   class="tile-detail-link"
+   data-modal-id="{{ plugin.id }}-detail-modal">{% translate "See details" %}</a>
+{% with modal_id=plugin.id|add:"-detail-modal" %}
+    {% component "modal" modal_id=modal_id size="dialog-medium" %}
+    {% fill "header" %}
+    {% translate "Boefje details" %}
 {% endfill %}
 {% fill "content" %}
 <section>
@@ -86,3 +87,4 @@ <h3 class="heading-small">{% translate "Produces" %}</h3>
 {% endfill %}
 {% endcomponent %}
 {% component_css_dependencies %}
+{% endwith %}
diff --git a/rocky/katalogus/templates/partials/plugins.html b/rocky/katalogus/templates/partials/plugins.html
index 95524ce1d0b..495f8d431cb 100644
--- a/rocky/katalogus/templates/partials/plugins.html
+++ b/rocky/katalogus/templates/partials/plugins.html
@@ -8,7 +8,9 @@
             <thead>
                 <tr>
                     <th>{% translate "Plugin name" %}</th>
-                    <th>{% translate "Plugin type" %}</th>
+                    {% if active == "all" %}
+                        <th>{% translate "Plugin type" %}</th>
+                    {% endif %}
                     <th>{% translate "Plugin description" %}</th>
                     <th colspan="2">{% translate "Actions" %}</th>
                 </tr>
@@ -21,11 +23,13 @@
                                 <strong>{{ plugin.name }}</strong>
                             </span>
                         </td>
-                        <td scope="row">
-                            <p class="plugin-title">
-                                <span class="label-plugin-type {{ plugin.type }}">{{ plugin.type|title }}</span>
-                            </p>
-                        </td>
+                        {% if active == "all" %}
+                            <td scope="row">
+                                <p class="plugin-title">
+                                    <span class="label-plugin-type {{ plugin.type }}">{{ plugin.type|title }}</span>
+                                </p>
+                            </td>
+                        {% endif %}
                         <td>
                             {% if plugin.description %}<span class="plugin-description">{{ plugin.description }}</span>{% endif %}
                         </td>
diff --git a/rocky/katalogus/templates/plugin_container_image.html b/rocky/katalogus/templates/plugin_container_image.html
new file mode 100644
index 00000000000..688d9c4b435
--- /dev/null
+++ b/rocky/katalogus/templates/plugin_container_image.html
@@ -0,0 +1,138 @@
+{% load static %}
+{% load humanize %}
+{% load i18n %}
+
+<div>
+    <h2>{% translate "Container image" %}</h2>
+    <p>
+        {% translate "The container image for this Boefje is:" %} <a href="{{ plugin.oci_image }}">{{ plugin.oci_image }}</a>
+    </p>
+    <div class="fifty-fifty">
+        <div>
+            <h3>{% translate "Variants" %}</h3>
+            <p>
+                {% blocktranslate %}
+                    Boefje variants that use the same container image. For more
+                    information about Boefje variants you can read the documentation.
+                {% endblocktranslate %}
+            </p>
+        </div>
+        {% if perms.tools.can_add_boefje %}
+            <div class="horizontal-view toolbar">
+                <a class="button ghost"
+                   href="{% url "boefje_variant_setup" plugin_id=plugin.id organization_code=organization.code %}"><span aria-hidden="true" class="icon ti-plus"></span>{% translate "Add variant" %}</a>
+            </div>
+        {% endif %}
+    </div>
+    {% if variants %}
+        {% if new_variant %}
+            <p class="confirmation" aria-label="{% translate "confirmation" %}">
+                <span>{% blocktranslate %}Variant {{ plugin.name }} created.{% endblocktranslate%}</span>
+                {% blocktranslate trimmed %}
+                    The Boefje variant is successfully created and can now be used.
+                {% endblocktranslate %}
+            </p>
+        {% endif %}
+        <div class="horizontal-scroll">
+            <ul class="accordion">
+                <li>
+                    <button id="definition-asset" aria-expanded="true">All variants</button>
+                    <div aria-labelledby="definition-asset">
+                        <table>
+                            <caption class="visually-hidden">{% translate "Overview of variants" %}</caption>
+                            <thead>
+                                <tr>
+                                    <th scope="col">{% translate "Name" %}</th>
+                                    <th scope="col">{% translate "Scan level" %}</th>
+                                    <th scope="col">{% translate "Status" %}</th>
+                                    <th scope="col">{% translate "Age" %}</th>
+                                    <th scope="col">{% translate "Scan frequency" %}</th>
+                                    <th scope="col"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {% for variant in variants %}
+                                    <tr>
+                                        <td>
+                                            <a href="{% url "boefje_detail" organization_code=organization.code plugin_id=variant.id %}">
+                                                {% if variant.id == plugin.id %}
+                                                    {{ variant.name }} ({% translate "current" %})
+                                                {% else %}
+                                                    {{ variant.name }}
+                                                {% endif %}
+                                            </a>
+                                        </td>
+                                        <td>
+                                            {% include "partials/scan_level_indicator.html" with value=variant.scan_level %}
+
+                                        </td>
+                                        <td>
+                                            {% if variant.enabled %}
+                                                <span class="label tags-color-2-medium">{% translate "Enabled" %}</span>
+                                            {% else %}
+                                                <span class="label tags-color-4-medium">{% translate "Disabled" %}</span>
+                                            {% endif %}
+                                        </td>
+                                        <td>
+                                            <span title="{{ variant.created }} UTC">{{ variant.created|naturaltime }}</span>
+                                        </td>
+                                        <td>
+                                            <span title="{{ variant.interval }}">
+                                                {% if variant.interval %}
+                                                    {{ variant.interval }} {% translate "minutes" %}
+                                                {% else %}
+                                                    {% translate "Default system scan frequency" %}
+                                                {% endif %}
+                                            </span>
+                                        </td>
+                                        <td class="actions">
+                                            <button class="expando-button"
+                                                    data-icon-open-class="icon ti-chevron-down"
+                                                    data-icon-close-class="icon ti-chevron-up"
+                                                    data-close-label="{% translate "Close details" %}">
+                                                {% translate "Open details" %}
+                                            </button>
+                                        </td>
+                                    </tr>
+                                    <tr class="expando-row">
+                                        <td colspan="5">
+                                            <h5>{% translate "Boefje ID" %}</h5>
+                                            <p>{{ variant.id }}</p>
+                                            <h5>{% translate "Creation date" %}</h5>
+                                            {% if variant.created %}
+                                                <p>{{ variant.created }}</p>
+                                            {% else %}
+                                                <p>-</p>
+                                            {% endif %}
+                                            <h5>{% translate "Arguments" %}</h5>
+                                            {% if variant.oci_arguments %}
+                                                <p>{% translate "The following arguments are used for this Boefje variant:" %}</p>
+                                                <p class="explanation" aria-label="{% translate "explanation" %}">{{ variant.oci_arguments|join:" " }}</p>
+                                            {% else %}
+                                                <p>{% translate "There are no arguments used for this Boefje variant." %}</p>
+                                            {% endif %}
+                                            {% if perms.tools.can_add_boefje %}
+                                                <div class="horizontal-view toolbar">
+                                                    <a class="button ghost"
+                                                       href="{% url "edit_boefje" plugin_id=variant.id organization_code=organization.code %}"><span aria-hidden="true" class="icon ti-edit action-button"></span>{% translate "Edit variant" %}</a>
+                                                </div>
+                                            {% endif %}
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </li>
+            </ul>
+        </div>
+    {% else %}
+        <p class="explanation" aria-label="{% translate "explanation" %}">
+            <span>{% translate "This Boefje has no variants yet." %}</span>
+            {% blocktranslate trimmed %}
+                You can make a variant and change the arguments and JSON Schema
+                to customize it to fit your needs.
+            {% endblocktranslate %}
+        </p>
+    {% endif %}
+</div>
diff --git a/rocky/katalogus/templates/plugin_settings_add.html b/rocky/katalogus/templates/plugin_settings_add.html
index 1cb9f85c571..a2d84e95d52 100644
--- a/rocky/katalogus/templates/plugin_settings_add.html
+++ b/rocky/katalogus/templates/plugin_settings_add.html
@@ -24,7 +24,7 @@ <h1>
           {% endblocktrans %}
                 </p>
                 <div class="layout-form">
-                    <form novalidate method="post" class="horizontal-view help">
+                    <form novalidate method="post" class="help">
                         {% csrf_token %}
                         {% include "partials/form/form_errors.html" with form=form %}
                         {% include "partials/form/fieldset.html" with legend=name fields=form %}
diff --git a/rocky/katalogus/templates/plugin_settings_list.html b/rocky/katalogus/templates/plugin_settings_list.html
index 3ca5ca51dfb..dc5f4165da6 100644
--- a/rocky/katalogus/templates/plugin_settings_list.html
+++ b/rocky/katalogus/templates/plugin_settings_list.html
@@ -2,62 +2,48 @@
 {% load i18n %}
 
 {% if object_list %}
-    <section>
-        <div>
-            <h1>{{ plugin.type|title }}{% translate " Details" %}</h1>
-            <p>{% translate "Settings" %}</p>
-            <div class="horizontal-scroll">
-                <table>
-                    <caption class="visually-hidden">{% translate "Overview of settings" %}</caption>
-                    <thead>
+    <div>
+        <div class="fifty-fifty">
+            <div>
+                <h2>{% translate "Settings" %}</h2>
+                <p>
+                    {% blocktranslate %}
+                        In the table below the settings for this specific Boefje can be seen.
+                        Set or change the value of the variables by editing the settings.
+                    {% endblocktranslate %}
+                </p>
+            </div>
+            <div class="horizontal-view toolbar">
+                <a class="button ghost"
+                   href="{% url 'plugin_settings_add' organization_code=organization.code plugin_type=plugin.type plugin_id=plugin.id %}"><span class="icon ti-settings"></span>{% translate "Configure Settings" %}</a>
+            </div>
+        </div>
+        <div class="horizontal-scroll">
+            <table>
+                <caption class="visually-hidden">{% translate "Overview of settings" %}</caption>
+                <thead>
+                    <tr>
+                        <th scope="col">{% translate "Variable" %}</th>
+                        <th scope="col">{% translate "Value" %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for setting in object_list %}
                         <tr>
-                            <th scope="col">{% translate "Name" %}</th>
-                            <th scope="col">{% translate "Value" %}</th>
-                            <th scope="col">{% translate "Required" %}</th>
-                            <th scope="col">{% translate "Action" %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for setting in object_list %}
-                            <tr>
-                                <td>{{ setting.name }}</td>
-                                <td>
-                                    {% if setting.value is None %}
-                                        {% translate "Unset" %}
-                                    {% elif setting.secret %}
-                                        •••••••••••••
-                                    {% else %}
-                                        {{ setting.value }}
-                                    {% endif %}
-                                </td>
-                                <td>
-                                    {% if setting.required %}
-                                        {% translate "Yes" %}
-                                    {% else %}
-                                        {% translate "No" %}
-                                    {% endif %}
-                                </td>
+                            <td>{{ setting.name }}</td>
+                            <td>
                                 {% if setting.value is None %}
-                                    <td>
-                                        <a href="{% url 'plugin_settings_add' organization_code=organization.code plugin_type=plugin.type plugin_id=plugin.id %}">{% translate "Add" %}</a>
-                                    </td>
-                                    <td></td>
+                                    -
+                                {% elif setting.secret %}
+                                    •••••••••••••
                                 {% else %}
-                                    <td>
-                                        <a href="{% url 'plugin_settings_add' organization_code=organization.code plugin_type=plugin.type plugin_id=plugin.id %}">{% translate "Edit" %}</a>
-                                    </td>
+                                    {{ setting.value }}
                                 {% endif %}
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
-                <form action="{% url "plugin_settings_delete" organization_code=organization.code plugin_type=plugin.type plugin_id=plugin.id %}"
-                      method="get"
-                      class="inline">
-                    {% csrf_token %}
-                    <button type="submit">{% translate "Delete" %}</button>
-                </form>
-            </div>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
         </div>
-    </section>
+    </div>
 {% endif %}
diff --git a/rocky/katalogus/urls.py b/rocky/katalogus/urls.py
index 7a254ce01da..7d5943b8713 100644
--- a/rocky/katalogus/urls.py
+++ b/rocky/katalogus/urls.py
@@ -1,5 +1,6 @@
-from django.urls import path
+from django.urls import path, re_path
 
+from katalogus.views.boefje_setup import AddBoefjeVariantView, AddBoefjeView, EditBoefjeView
 from katalogus.views.change_clearance_level import ChangeClearanceLevel
 from katalogus.views.katalogus import (
     AboutPluginsView,
@@ -32,7 +33,17 @@
         name="confirm_clone_settings",
     ),
     path(
-        "plugins/boefjes/<view_type>/",
+        "plugins/boefjes/add/",
+        AddBoefjeView.as_view(),
+        name="boefje_setup",
+    ),
+    path(
+        "plugins/boefjes/add-variant/<plugin_id>/",
+        AddBoefjeVariantView.as_view(),
+        name="boefje_variant_setup",
+    ),
+    re_path(
+        r"^plugins/boefjes/(?P<view_type>(grid|table))/$",
         BoefjeListView.as_view(),
         name="boefjes_list",
     ),
@@ -52,6 +63,11 @@
         BoefjeDetailView.as_view(),
         name="boefje_detail",
     ),
+    path(
+        "plugins/boefje/<plugin_id>/edit/",
+        EditBoefjeView.as_view(),
+        name="edit_boefje",
+    ),
     path(
         "plugins/normalizer/<plugin_id>/",
         NormalizerDetailView.as_view(),
diff --git a/rocky/katalogus/views/boefje_setup.py b/rocky/katalogus/views/boefje_setup.py
new file mode 100644
index 00000000000..3c4d686facf
--- /dev/null
+++ b/rocky/katalogus/views/boefje_setup.py
@@ -0,0 +1,246 @@
+import uuid
+from datetime import datetime
+from urllib.parse import urlencode
+
+from account.mixins import OrganizationPermissionRequiredMixin, OrganizationView
+from django.urls import reverse
+from django.views.generic.edit import FormView
+from tools.forms.boefje import BoefjeSetupForm
+
+from katalogus.client import Boefje, DuplicatePluginError, KATalogusNotAllowedError, get_katalogus
+from octopoes.models.types import type_by_name
+
+
+class BoefjeSetupView(OrganizationPermissionRequiredMixin, OrganizationView, FormView):
+    """Setup view for creating new Boefjes and variants"""
+
+    template_name = "boefje_setup.html"
+    form_class = BoefjeSetupForm
+    permission_required = "tools.can_add_boefje"
+
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+        self.katalogus = get_katalogus(self.organization.code)
+        self.plugin_id = uuid.uuid4()
+        self.created = str(datetime.now())
+        self.query_params = urlencode({"new_variant": True})
+
+    def get_success_url(self) -> str:
+        return (
+            reverse(
+                "boefje_detail",
+                kwargs={"organization_code": self.organization.code, "plugin_id": self.plugin_id},
+            )
+            + "?"
+            + self.query_params
+        )
+
+
+class AddBoefjeView(BoefjeSetupView):
+    """View where the user can create a new Boefje"""
+
+    def form_valid(self, form):
+        form_data = form.cleaned_data
+        plugin = create_boefje_with_form_data(form_data, self.plugin_id, self.created)
+
+        try:
+            self.katalogus.create_plugin(plugin)
+            return super().form_valid(form)
+        except DuplicatePluginError as error:
+            if "name" in error.message:
+                form.add_error("name", ("Boefje with this name does already exist. Please choose another name."))
+            return self.form_invalid(form)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["breadcrumbs"] = [
+            {"url": reverse("katalogus", kwargs={"organization_code": self.organization.code}), "text": "KAT-alogus"},
+            {
+                "url": reverse("boefje_setup", kwargs={"organization_code": self.organization.code}),
+                "text": "Boefje setup",
+            },
+        ]
+
+        return context
+
+
+class AddBoefjeVariantView(BoefjeSetupView):
+    """View where the user can create a Boefje variant, based on another Boefje."""
+
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+
+        self.based_on_plugin_id = self.kwargs.get("plugin_id")
+
+        self.plugin = self.katalogus.get_plugin(self.based_on_plugin_id)
+
+    def get_initial(self):
+        initial = super().get_initial()
+
+        consumes = []
+
+        for input_object in self.plugin.consumes:
+            consumes.append(input_object.__name__)
+
+        initial["oci_image"] = self.plugin.oci_image
+        initial["oci_arguments"] = " ".join(self.plugin.oci_arguments)
+        initial["boefje_schema"] = self.plugin.boefje_schema
+        initial["consumes"] = consumes
+        initial["produces"] = ", ".join(self.plugin.produces)
+        initial["scan_level"] = self.plugin.scan_level
+        initial["interval"] = self.plugin.interval
+
+        return initial
+
+    def form_valid(self, form):
+        form_data = form.cleaned_data
+        plugin = create_boefje_with_form_data(form_data, self.plugin_id, self.created)
+
+        try:
+            self.katalogus.create_plugin(plugin)
+            return super().form_valid(form)
+        except DuplicatePluginError as error:
+            if "name" in error.message:
+                form.add_error("name", ("Boefje with this name does already exist. Please choose another name."))
+            return self.form_invalid(form)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["boefje_variant"] = True
+        context["return_to_plugin_id"] = self.based_on_plugin_id
+
+        context["breadcrumbs"] = [
+            {"url": reverse("katalogus", kwargs={"organization_code": self.organization.code}), "text": "KAT-alogus"},
+            {
+                "url": reverse(
+                    "boefje_detail",
+                    kwargs={"organization_code": self.organization.code, "plugin_id": self.based_on_plugin_id},
+                ),
+                "text": "Boefje detail page",
+            },
+            {
+                "url": reverse(
+                    "boefje_variant_setup",
+                    kwargs={"organization_code": self.organization.code, "plugin_id": self.based_on_plugin_id},
+                ),
+                "text": "Boefje variant setup",
+            },
+        ]
+
+        return context
+
+
+class EditBoefjeView(BoefjeSetupView):
+    """View where the user can update a Boefje."""
+
+    def setup(self, request, *args, **kwargs):
+        super().setup(request, *args, **kwargs)
+
+        self.plugin_id = self.kwargs.get("plugin_id")
+        self.query_params = urlencode({"new_variant": False})
+        self.plugin = self.katalogus.get_plugin(self.plugin_id)
+        self.created = self.plugin.created
+
+    def get_initial(self):
+        initial = super().get_initial()
+
+        consumes = []
+
+        for input_object in self.plugin.consumes:
+            consumes.append(input_object.__name__)
+
+        initial["name"] = self.plugin.name
+        initial["description"] = self.plugin.description
+        initial["oci_image"] = self.plugin.oci_image
+        initial["oci_arguments"] = " ".join(self.plugin.oci_arguments)
+        initial["boefje_schema"] = self.plugin.boefje_schema
+        initial["consumes"] = consumes
+        initial["produces"] = ", ".join(self.plugin.produces)
+        initial["scan_level"] = self.plugin.scan_level
+        initial["interval"] = self.plugin.interval
+
+        return initial
+
+    def form_valid(self, form):
+        form_data = form.cleaned_data
+        plugin = create_boefje_with_form_data(form_data, self.plugin_id, self.created)
+
+        try:
+            self.katalogus.edit_plugin(plugin)
+            return super().form_valid(form)
+        except DuplicatePluginError as error:
+            if "name" in error.message:
+                form.add_error("name", ("Boefje with this name does already exist. Please choose another name."))
+            return self.form_invalid(form)
+        except KATalogusNotAllowedError:
+            form.add_error(
+                "name",
+                (
+                    "Editing this Boefje is not allowed because it is static. "
+                    "Please create a new variant of this static Boefje."
+                ),
+            )
+            return self.form_invalid(form)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["edit_boefje_name"] = self.plugin.name
+        context["return_to_plugin_id"] = self.plugin.id
+
+        context["breadcrumbs"] = [
+            {
+                "url": reverse("katalogus", kwargs={"organization_code": self.organization.code}),
+                "text": "KAT-alogus",
+            },
+            {
+                "url": reverse(
+                    "boefje_detail",
+                    kwargs={
+                        "organization_code": self.organization.code,
+                        "plugin_id": self.plugin.id,
+                    },
+                ),
+                "text": self.plugin.name,
+            },
+            {
+                "url": reverse(
+                    "edit_boefje",
+                    kwargs={
+                        "organization_code": self.organization.code,
+                        "plugin_id": self.plugin.id,
+                    },
+                ),
+                "text": 'Edit "' + self.plugin.name + '"',
+            },
+        ]
+
+        return context
+
+
+def create_boefje_with_form_data(form_data, plugin_id: str, created: str):
+    arguments = [] if not form_data["oci_arguments"] else form_data["oci_arguments"].split()
+    consumes = [] if not form_data["consumes"] else form_data["consumes"].strip("[]").replace("'", "").split(", ")
+    produces = [] if not form_data["produces"] else form_data["produces"].split(",")
+    produces = {p.strip() for p in produces}
+    interval = int(form_data.get("interval") or 0) or None
+    input_objects = set()
+
+    for input_object in consumes:
+        input_objects.add(type_by_name(input_object))
+
+    return Boefje(
+        id=str(plugin_id),
+        name=form_data["name"],
+        created=created,
+        description=form_data["description"],
+        interval=interval,
+        enabled=False,
+        type="boefje",
+        scan_level=form_data["scan_level"],
+        consumes=input_objects,
+        produces=produces,
+        boefje_schema=form_data["boefje_schema"],
+        oci_image=form_data["oci_image"],
+        oci_arguments=arguments,
+    )
diff --git a/rocky/katalogus/views/change_clearance_level.py b/rocky/katalogus/views/change_clearance_level.py
index 2f1560493bc..303503f9e86 100644
--- a/rocky/katalogus/views/change_clearance_level.py
+++ b/rocky/katalogus/views/change_clearance_level.py
@@ -12,6 +12,7 @@
 class ChangeClearanceLevel(OrganizationPermissionRequiredMixin, SchedulerView, SinglePluginView, TemplateView):
     template_name = "change_clearance_level.html"
     permission_required = "tools.can_set_clearance_level"
+    task_type = "boefje"
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
diff --git a/rocky/katalogus/views/katalogus_settings.py b/rocky/katalogus/views/katalogus_settings.py
index 14edf7a5719..be4810c03e8 100644
--- a/rocky/katalogus/views/katalogus_settings.py
+++ b/rocky/katalogus/views/katalogus_settings.py
@@ -9,10 +9,13 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, TemplateView
 from httpx import HTTPError
+from structlog import get_logger
 from tools.models import Organization
 
 from katalogus.client import get_katalogus
 
+logger = get_logger(__name__)
+
 
 class ConfirmCloneSettingsView(
     OrganizationPermissionRequiredMixin,
@@ -35,6 +38,7 @@ def get_context_data(self, **kwargs):
 
     def post(self, request, *args, **kwargs):
         to_organization = Organization.objects.get(code=kwargs["to_organization"])
+        logger.info("Cloning organization settings", event_code=910000, to_organization_code=to_organization.code)
         get_katalogus(self.organization.code).clone_all_configuration_to_organization(to_organization.code)
         messages.add_message(
             self.request,
diff --git a/rocky/katalogus/views/plugin_detail.py b/rocky/katalogus/views/plugin_detail.py
index 119f2047d3e..bf38075627b 100644
--- a/rocky/katalogus/views/plugin_detail.py
+++ b/rocky/katalogus/views/plugin_detail.py
@@ -128,6 +128,12 @@ class BoefjeDetailView(PluginDetailView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context["new_variant"] = self.request.GET.get("new_variant")
+        context["variants"] = get_katalogus(self.organization.code).get_plugins(oci_image=self.plugin.oci_image)
+
+        for variant in context["variants"]:
+            if variant.created:
+                variant.created = datetime.fromisoformat(variant.created)
 
         context["select_ooi_filter_form"] = SelectOOIFilterForm
         if "show_all" in self.request.GET:
diff --git a/rocky/katalogus/views/plugin_enable_disable.py b/rocky/katalogus/views/plugin_enable_disable.py
index 36db033e530..e87b7ed7c40 100644
--- a/rocky/katalogus/views/plugin_enable_disable.py
+++ b/rocky/katalogus/views/plugin_enable_disable.py
@@ -1,24 +1,18 @@
 from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
-from django.urls import reverse
+from django.urls.base import reverse
 from django.utils.translation import gettext_lazy as _
-from httpx import HTTPError
 
 from katalogus.views.mixins import SinglePluginView
 
 
 class PluginEnableDisableView(SinglePluginView):
-    def check_required_settings(self, settings: dict):
-        if self.plugin_schema is None or "required" not in self.plugin_schema:
-            return True
-
-        return all([field in settings for field in self.plugin_schema["required"]])
-
     def post(self, request, *args, **kwargs):
         plugin_state = kwargs["plugin_state"]
+
         if plugin_state == "True":
-            self.katalogus_client.disable_boefje(self.plugin)
+            self.katalogus_client.disable_plugin(self.plugin)
             messages.add_message(
                 self.request,
                 messages.WARNING,
@@ -26,62 +20,33 @@ def post(self, request, *args, **kwargs):
             )
             return HttpResponseRedirect(request.POST.get("current_url"))
 
-        try:
-            plugin_settings = self.katalogus_client.get_plugin_settings(self.plugin.id)
-        except HTTPError:
-            messages.add_message(
-                self.request,
-                messages.ERROR,
-                _("Failed fetching settings for {}. Is the Katalogus up?").format(self.plugin.name),
-            )
-            return redirect(
-                reverse(
-                    "boefje_detail",
-                    kwargs={
-                        "organization_code": self.organization.code,
-                        "plugin_id": self.plugin.id,
-                    },
-                )
-            )
-
-        if not self.check_required_settings(plugin_settings):
-            messages.add_message(
-                self.request,
-                messages.INFO,
-                _("Before enabling, please set the required settings for '{}'.").format(self.plugin.name),
-            )
-            return redirect(
-                reverse(
-                    "plugin_settings_add",
-                    kwargs={
-                        "organization_code": self.organization.code,
-                        "plugin_id": self.plugin.id,
-                        "plugin_type": self.plugin.type,
-                    },
-                )
-            )
-
         if self.plugin.can_scan(self.organization_member):
-            self.katalogus_client.enable_boefje(self.plugin)
+            self.katalogus_client.enable_plugin(self.plugin)
             messages.add_message(
                 self.request,
                 messages.SUCCESS,
                 _("{} '{}' enabled.").format(self.plugin.type.title(), self.plugin.name),
             )
         else:
-            member_clearance_level_text = (
-                f"Your clearance level is L{self.organization_member.acknowledged_clearance_level}. Contact your "
-                f"administrator to get a higher clearance level."
-            )
-
             if (
-                self.organization_member.trusted_clearance_level < 0
-                or self.organization_member.acknowledged_clearance_level < 0
+                self.organization_member.trusted_clearance_level
+                != self.organization_member.acknowledged_clearance_level
             ):
+                member_clearance_level_text = _(
+                    "You have not acknowledged your clearance level. "
+                    "Go to your profile page to acknowledge your clearance level."
+                )
+            elif self.organization_member.max_clearance_level < 0:
                 member_clearance_level_text = _(
                     "Your clearance level is not set. Go to your profile page to see your clearance "
                     "or contact the administrator to set a clearance level."
                 )
+            else:
+                clearance_level = self.organization_member.max_clearance_level
+
+                member_clearance_level_text = _(
+                    "Your clearance level is L{}. Contact your administrator to get a higher clearance level."
+                ).format(clearance_level)
 
             messages.add_message(
                 self.request,
@@ -92,4 +57,4 @@ def post(self, request, *args, **kwargs):
                 ),
             )
 
-        return HttpResponseRedirect(request.POST.get("current_url"))
+        return redirect(reverse("katalogus", kwargs={"organization_code": self.organization.code}))
diff --git a/rocky/katalogus/views/plugin_settings_add.py b/rocky/katalogus/views/plugin_settings_add.py
index 47842b284a5..f89921025cd 100644
--- a/rocky/katalogus/views/plugin_settings_add.py
+++ b/rocky/katalogus/views/plugin_settings_add.py
@@ -54,7 +54,7 @@ def form_valid(self, form):
 
         if "add-enable" in self.request.POST:
             try:
-                self.katalogus_client.enable_boefje(self.plugin)
+                self.katalogus_client.enable_plugin(self.plugin)
             except HTTPError:
                 messages.add_message(self.request, messages.ERROR, _("Enabling {} failed").format(self.plugin.name))
                 return redirect(self.get_success_url())
diff --git a/rocky/katalogus/views/plugin_settings_list.py b/rocky/katalogus/views/plugin_settings_list.py
index f27b16f1d43..90c66269254 100644
--- a/rocky/katalogus/views/plugin_settings_list.py
+++ b/rocky/katalogus/views/plugin_settings_list.py
@@ -24,7 +24,7 @@ def get_plugin_settings(self) -> list[dict[str, Any]]:
                 return []
 
             settings = self.katalogus_client.get_plugin_settings(plugin_id=self.plugin.id)
-            props = self.plugin_schema["properties"]
+            props = self.plugin_schema.get("properties", [])
 
             return [
                 {
diff --git a/rocky/onboarding/templates/account/step_2a_organization_setup.html b/rocky/onboarding/templates/account/step_2a_organization_setup.html
index 79f6d77fcec..5c7d1db8c38 100644
--- a/rocky/onboarding/templates/account/step_2a_organization_setup.html
+++ b/rocky/onboarding/templates/account/step_2a_organization_setup.html
@@ -24,7 +24,7 @@ <h2>{% translate "Organization setup" %}</h2>
                 <form novalidate
                       action="{% url "step_organization_setup" %}"
                       method="post"
-                      class="horizontal-view help layout-form">
+                      class="help layout-form">
                     {% csrf_token %}
                     {% translate "Organization details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/onboarding/templates/account/step_2a_organization_update.html b/rocky/onboarding/templates/account/step_2a_organization_update.html
index 1ee96c51222..b171ccdf879 100644
--- a/rocky/onboarding/templates/account/step_2a_organization_update.html
+++ b/rocky/onboarding/templates/account/step_2a_organization_update.html
@@ -20,7 +20,7 @@ <h2>{% translate "Organization setup" %}</h2>
                         page within OpenKAT when necessary.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate method="post" class="horizontal-view help layout-form">
+                <form novalidate method="post" class="help layout-form">
                     {% csrf_token %}
                     {% translate "Organization details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/onboarding/templates/account/step_4_account_setup_admin.html b/rocky/onboarding/templates/account/step_4_account_setup_admin.html
index 06162b69c34..7aeb903a0b0 100644
--- a/rocky/onboarding/templates/account/step_4_account_setup_admin.html
+++ b/rocky/onboarding/templates/account/step_4_account_setup_admin.html
@@ -21,7 +21,7 @@ <h2>{% translate "Admin account setup" %}</h2>
                         as well as organization details.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate method="post" class="horizontal-view help">
+                <form novalidate method="post" class="help">
                     {% csrf_token %}
                     {% translate "Admin details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/onboarding/templates/account/step_5_account_setup_red_teamer.html b/rocky/onboarding/templates/account/step_5_account_setup_red_teamer.html
index 87811d5d4d0..3d026785e50 100644
--- a/rocky/onboarding/templates/account/step_5_account_setup_red_teamer.html
+++ b/rocky/onboarding/templates/account/step_5_account_setup_red_teamer.html
@@ -15,7 +15,7 @@ <h1>{% translate "OpenKAT setup" %}</h1>
                 <h2>{% translate "Red teamer account setup" %}</h2>
                 <strong>{% translate "Red teamer" %}</strong>
                 <p>{% translate "A red teamer account can run scans and generate reports." %}</p>
-                <form novalidate method="post" class="horizontal-view help">
+                <form novalidate method="post" class="help">
                     {% csrf_token %}
                     {% translate "Red teamer details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/onboarding/templates/account/step_6_account_setup_client.html b/rocky/onboarding/templates/account/step_6_account_setup_client.html
index 25270aefaef..0030efa3b58 100644
--- a/rocky/onboarding/templates/account/step_6_account_setup_client.html
+++ b/rocky/onboarding/templates/account/step_6_account_setup_client.html
@@ -20,7 +20,7 @@ <h2>{% translate "Client account setup (optional)" %}</h2>
                         Adding a client account to the organization is optional.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate method="post" class="horizontal-view help">
+                <form novalidate method="post" class="help">
                     {% csrf_token %}
                     {% translate "User details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/onboarding/templates/step_3b_setup_scan_ooi_add.html b/rocky/onboarding/templates/step_3b_setup_scan_ooi_add.html
index 14e7b8e2dd9..2e9f502904e 100644
--- a/rocky/onboarding/templates/step_3b_setup_scan_ooi_add.html
+++ b/rocky/onboarding/templates/step_3b_setup_scan_ooi_add.html
@@ -43,17 +43,15 @@ <h3>{% translate "Dependencies" %}</h3>
                         the process of creating them manually.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate method="post" class="horizontal-view help layout-form">
+                <form novalidate method="post" class="help layout-form">
                     {% csrf_token %}
                     {% translate type as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
                     <div class="button-container">
                         <button type="submit">{% translate "Create object" %}</button>
-                        <div class="button-container">
-                            <a href="{% url "complete_onboarding" organization.code %}"
-                               class="button ghost">{% translate "Skip onboarding" %}</a>
-                        </div>
+                        <a href="{% url "complete_onboarding" organization.code %}"
+                           class="button ghost">{% translate "Skip onboarding" %}</a>
                     </div>
                 </form>
             </div>
diff --git a/rocky/onboarding/templates/step_3f_set_clearance_level.html b/rocky/onboarding/templates/step_3f_set_clearance_level.html
index a3df49a7cfb..7938a6baff8 100644
--- a/rocky/onboarding/templates/step_3f_set_clearance_level.html
+++ b/rocky/onboarding/templates/step_3f_set_clearance_level.html
@@ -20,20 +20,17 @@ <h2>{% translate "Setup scan - Set clearance level for" %} {{ ooi|human_readable
                         For the onboarding we will suggest to set the clearance level to L{{ dns_report_least_clearance_level }}.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate
-                      action=""
-                      method="post"
-                      class="horizontal-view help layout-form">
+                <form novalidate action="" method="post" class="help layout-form">
                     {% csrf_token %}
                     {% translate "Set clearance level" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
-                    <button type="submit">{% translate "Set clearance level" %}</button>
+                    <div class="button-container">
+                        <button type="submit">{% translate "Set clearance level" %}</button>
+                        <a href="{% url "complete_onboarding" organization.code %}"
+                           class="button ghost">{% translate "Skip onboarding" %}</a>
+                    </div>
                 </form>
-                <div class="button-container">
-                    <a href="{% url "complete_onboarding" organization.code %}"
-                       class="button ghost">{% translate "Skip onboarding" %}</a>
-                </div>
             </div>
         </section>
     </main>
diff --git a/rocky/onboarding/views.py b/rocky/onboarding/views.py
index db68a262ae2..27b3a05dee8 100644
--- a/rocky/onboarding/views.py
+++ b/rocky/onboarding/views.py
@@ -364,11 +364,15 @@ class OnboardingReportView(
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
+        self.selected_oois = self.get_ooi_pks()
+        self.selected_report_types = self.get_report_type_ids()
+
+    def get_ooi_pks(self) -> list[str]:
         ooi = self.get_ooi(self.request.GET.get("ooi", ""))
-        self.oois = [Hostname(name=ooi.web_url.tokenized["netloc"]["name"], network=ooi.network)]
-        self.selected_oois = [self.oois[0].primary_key]
+        hostname_ooi = [Hostname(name=ooi.web_url.tokenized["netloc"]["name"], network=ooi.network)]
+        return [hostname_ooi[0].primary_key]
 
-    def get_report_type_selection(self) -> list[str]:
+    def get_report_type_ids(self) -> list[str]:
         return [self.request.GET.get("report_type", "")]
 
     def post(self, request, *args, **kwargs):
diff --git a/rocky/poetry.lock b/rocky/poetry.lock
index 5fc54c05d7b..1580631560d 100644
--- a/rocky/poetry.lock
+++ b/rocky/poetry.lock
@@ -234,13 +234,13 @@ cffi = ">=1.0.0"
 
 [[package]]
 name = "certifi"
-version = "2024.7.4"
+version = "2024.8.30"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2024.7.4-py3-none-any.whl", hash = "sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90"},
-    {file = "certifi-2024.7.4.tar.gz", hash = "sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b"},
+    {file = "certifi-2024.8.30-py3-none-any.whl", hash = "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8"},
+    {file = "certifi-2024.8.30.tar.gz", hash = "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9"},
 ]
 
 [[package]]
@@ -1220,13 +1220,13 @@ trio = ["trio (>=0.22.0,<0.26.0)"]
 
 [[package]]
 name = "httpx"
-version = "0.27.0"
+version = "0.27.2"
 description = "The next generation HTTP client."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "httpx-0.27.0-py3-none-any.whl", hash = "sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5"},
-    {file = "httpx-0.27.0.tar.gz", hash = "sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5"},
+    {file = "httpx-0.27.2-py3-none-any.whl", hash = "sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0"},
+    {file = "httpx-0.27.2.tar.gz", hash = "sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2"},
 ]
 
 [package.dependencies]
@@ -1241,6 +1241,7 @@ brotli = ["brotli", "brotlicffi"]
 cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"]
 http2 = ["h2 (>=3,<5)"]
 socks = ["socksio (==1.*)"]
+zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "idna"
@@ -2011,18 +2012,18 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.8.2"
+version = "2.9.2"
 description = "Data validation using Python type hints"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic-2.8.2-py3-none-any.whl", hash = "sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8"},
-    {file = "pydantic-2.8.2.tar.gz", hash = "sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a"},
+    {file = "pydantic-2.9.2-py3-none-any.whl", hash = "sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12"},
+    {file = "pydantic-2.9.2.tar.gz", hash = "sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.20.1"
+annotated-types = ">=0.6.0"
+pydantic-core = "2.23.4"
 typing-extensions = [
     {version = ">=4.12.2", markers = "python_version >= \"3.13\""},
     {version = ">=4.6.1", markers = "python_version < \"3.13\""},
@@ -2030,103 +2031,104 @@ typing-extensions = [
 
 [package.extras]
 email = ["email-validator (>=2.0.0)"]
+timezone = ["tzdata"]
 
 [[package]]
 name = "pydantic-core"
-version = "2.20.1"
+version = "2.23.4"
 description = "Core functionality for Pydantic validation and serialization"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a"},
-    {file = "pydantic_core-2.20.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840"},
-    {file = "pydantic_core-2.20.1-cp310-none-win32.whl", hash = "sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250"},
-    {file = "pydantic_core-2.20.1-cp310-none-win_amd64.whl", hash = "sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27"},
-    {file = "pydantic_core-2.20.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b"},
-    {file = "pydantic_core-2.20.1-cp311-none-win32.whl", hash = "sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a"},
-    {file = "pydantic_core-2.20.1-cp311-none-win_amd64.whl", hash = "sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1"},
-    {file = "pydantic_core-2.20.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd"},
-    {file = "pydantic_core-2.20.1-cp312-none-win32.whl", hash = "sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688"},
-    {file = "pydantic_core-2.20.1-cp312-none-win_amd64.whl", hash = "sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203"},
-    {file = "pydantic_core-2.20.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0"},
-    {file = "pydantic_core-2.20.1-cp313-none-win32.whl", hash = "sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e"},
-    {file = "pydantic_core-2.20.1-cp313-none-win_amd64.whl", hash = "sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa"},
-    {file = "pydantic_core-2.20.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987"},
-    {file = "pydantic_core-2.20.1-cp38-none-win32.whl", hash = "sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a"},
-    {file = "pydantic_core-2.20.1-cp38-none-win_amd64.whl", hash = "sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09"},
-    {file = "pydantic_core-2.20.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab"},
-    {file = "pydantic_core-2.20.1-cp39-none-win32.whl", hash = "sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2"},
-    {file = "pydantic_core-2.20.1-cp39-none-win_amd64.whl", hash = "sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99"},
-    {file = "pydantic_core-2.20.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a"},
-    {file = "pydantic_core-2.20.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7"},
-    {file = "pydantic_core-2.20.1.tar.gz", hash = "sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3"},
+    {file = "pydantic_core-2.23.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071"},
+    {file = "pydantic_core-2.23.4-cp310-none-win32.whl", hash = "sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119"},
+    {file = "pydantic_core-2.23.4-cp310-none-win_amd64.whl", hash = "sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0"},
+    {file = "pydantic_core-2.23.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64"},
+    {file = "pydantic_core-2.23.4-cp311-none-win32.whl", hash = "sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f"},
+    {file = "pydantic_core-2.23.4-cp311-none-win_amd64.whl", hash = "sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e"},
+    {file = "pydantic_core-2.23.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24"},
+    {file = "pydantic_core-2.23.4-cp312-none-win32.whl", hash = "sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84"},
+    {file = "pydantic_core-2.23.4-cp312-none-win_amd64.whl", hash = "sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6"},
+    {file = "pydantic_core-2.23.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f"},
+    {file = "pydantic_core-2.23.4-cp313-none-win32.whl", hash = "sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769"},
+    {file = "pydantic_core-2.23.4-cp313-none-win_amd64.whl", hash = "sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2"},
+    {file = "pydantic_core-2.23.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb"},
+    {file = "pydantic_core-2.23.4-cp38-none-win32.whl", hash = "sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6"},
+    {file = "pydantic_core-2.23.4-cp38-none-win_amd64.whl", hash = "sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040"},
+    {file = "pydantic_core-2.23.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605"},
+    {file = "pydantic_core-2.23.4-cp39-none-win32.whl", hash = "sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6"},
+    {file = "pydantic_core-2.23.4-cp39-none-win_amd64.whl", hash = "sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433"},
+    {file = "pydantic_core-2.23.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8"},
+    {file = "pydantic_core-2.23.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e"},
+    {file = "pydantic_core-2.23.4.tar.gz", hash = "sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863"},
 ]
 
 [package.dependencies]
@@ -2134,13 +2136,13 @@ typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
 
 [[package]]
 name = "pydantic-settings"
-version = "2.3.4"
+version = "2.5.2"
 description = "Settings management using Pydantic"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
+    {file = "pydantic_settings-2.5.2-py3-none-any.whl", hash = "sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907"},
+    {file = "pydantic_settings-2.5.2.tar.gz", hash = "sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0"},
 ]
 
 [package.dependencies]
@@ -2148,6 +2150,7 @@ pydantic = ">=2.7.0"
 python-dotenv = ">=0.21.0"
 
 [package.extras]
+azure-key-vault = ["azure-identity (>=1.16.0)", "azure-keyvault-secrets (>=4.8.0)"]
 toml = ["tomli (>=2.0.1)"]
 yaml = ["pyyaml (>=6.0.1)"]
 
@@ -3356,18 +3359,22 @@ files = [
 
 [[package]]
 name = "zipp"
-version = "3.19.2"
+version = "3.20.2"
 description = "Backport of pathlib-compatible object wrapper for zip files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "zipp-3.19.2-py3-none-any.whl", hash = "sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c"},
-    {file = "zipp-3.19.2.tar.gz", hash = "sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19"},
+    {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"},
+    {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"},
 ]
 
 [package.extras]
+check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"]
+cover = ["pytest-cov"]
 doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"]
-test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy", "pytest-ruff (>=0.2.1)"]
+enabler = ["pytest-enabler (>=2.2)"]
+test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
+type = ["pytest-mypy"]
 
 [[package]]
 name = "zopfli"
diff --git a/rocky/reports/forms.py b/rocky/reports/forms.py
index ed34728cf30..c0f6dafdc76 100644
--- a/rocky/reports/forms.py
+++ b/rocky/reports/forms.py
@@ -1,6 +1,8 @@
+from datetime import datetime, timezone
+
 from django import forms
 from django.utils.translation import gettext_lazy as _
-from tools.forms.base import BaseRockyForm
+from tools.forms.base import BaseRockyForm, DateInput
 
 from reports.report_types.definitions import Report
 
@@ -28,3 +30,108 @@ def __init__(self, report_types: set[Report], *args, **kwargs):
         super().__init__(*args, **kwargs)
         report_types_choices = ((report_type.id, report_type.name) for report_type in report_types)
         self.fields["report_type"].choices = report_types_choices
+
+
+class ReportScheduleStartDateChoiceForm(BaseRockyForm):
+    choose_date = forms.ChoiceField(
+        label="",
+        required=False,
+        widget=forms.RadioSelect(attrs={"class": "submit-on-click"}),
+        choices=(("today", _("Today")), ("schedule", _("Different date"))),
+        initial="today",
+    )
+
+
+class ReportScheduleStartDateForm(BaseRockyForm):
+    start_date = forms.DateField(
+        label="",
+        widget=DateInput(format="%Y-%m-%d"),
+        initial=lambda: datetime.now(tz=timezone.utc).date(),
+        required=True,
+    )
+
+
+class ReportRecurrenceChoiceForm(BaseRockyForm):
+    choose_recurrence = forms.ChoiceField(
+        label="",
+        required=False,
+        widget=forms.RadioSelect(attrs={"class": "submit-on-click"}),
+        choices=(("once", _("No, just once")), ("repeat", _("Yes, repeat"))),
+        initial="once",
+    )
+
+
+class ReportScheduleRecurrenceForm(BaseRockyForm):
+    recurrence = forms.ChoiceField(
+        label="",
+        required=False,
+        widget=forms.Select(attrs={"form": "generate_report"}),
+        choices=[
+            ("daily", _("Daily")),
+            ("weekly", _("Weekly")),
+            ("monthly", _("Monthly")),
+            ("yearly", _("Yearly")),
+        ],
+    )
+
+
+class CustomReportScheduleForm(BaseRockyForm):
+    start_date = forms.DateField(
+        label=_("Start date"),
+        widget=DateInput(format="%Y-%m-%d"),
+        initial=lambda: datetime.now(tz=timezone.utc).date(),
+        required=False,
+    )
+    repeating_number = forms.IntegerField(initial=1, required=False, min_value=1, max_value=100)
+    repeating_term = forms.ChoiceField(
+        widget=forms.Select,
+        choices=[
+            ("day", _("day")),
+            ("week", _("week")),
+            ("month", _("month")),
+            ("year", _("year")),
+        ],
+    )
+    on_weekdays = forms.ChoiceField(
+        widget=forms.RadioSelect,
+        choices=[
+            ("monday", "M"),
+            ("tuesday", "T"),
+            ("wednesday", "W"),
+            ("thursday", "T"),
+            ("friday", "F"),
+            ("saturday", "S"),
+            ("sunday", "S"),
+        ],
+    )
+    recurrence_ends = forms.ChoiceField(
+        widget=forms.RadioSelect,
+        choices=[
+            ("never", _("Never")),
+            ("on", _("On")),  # user choses a specific date
+            ("after", _("After")),  # after how many occurrences? Shows drop down with occurrences
+        ],
+    )
+
+    end_date = forms.DateField(
+        label=_(""),
+        widget=forms.HiddenInput(),
+        initial=lambda: datetime.now(tz=timezone.utc).date(),
+        required=False,
+    )
+
+
+class ParentReportNameForm(BaseRockyForm):
+    parent_report_name = forms.CharField(
+        label=_("Report name format"), required=False, initial="{report type} for {ooi}"
+    )
+
+
+class ChildReportNameForm(BaseRockyForm):
+    child_report_name = forms.CharField(
+        label=_("Subreports name format"), required=True, initial="{report type} for {ooi}"
+    )
+
+
+class ReportNameForm(ParentReportNameForm, ChildReportNameForm):
+    pass
diff --git a/rocky/reports/management/__init__.py b/rocky/reports/management/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rocky/reports/management/commands/__init__.py b/rocky/reports/management/commands/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rocky/reports/management/commands/worker.py b/rocky/reports/management/commands/worker.py
new file mode 100644
index 00000000000..e715a58921f
--- /dev/null
+++ b/rocky/reports/management/commands/worker.py
@@ -0,0 +1,10 @@
+from django.core.management import BaseCommand
+
+from reports.runner.worker import get_runtime_manager
+
+
+class Command(BaseCommand):
+    help = "Start a report worker that pulls tasks from the scheduler to generate reports."
+
+    def handle(self, *args, **options):
+        get_runtime_manager().run()
diff --git a/rocky/reports/report_types/aggregate_organisation_report/appendix.html b/rocky/reports/report_types/aggregate_organisation_report/appendix.html
index ccea31e6ef8..b99427cbd7c 100644
--- a/rocky/reports/report_types/aggregate_organisation_report/appendix.html
+++ b/rocky/reports/report_types/aggregate_organisation_report/appendix.html
@@ -17,7 +17,7 @@ <h3 id="selected-oois">{% translate "Selected objects" %} ({{ total_oois }})</h3
         {% include "summary/ooi_selection.html" %}
 
     </div>
-    <h3 id="selected-report-types">{% translate "Selected Report Types" %}</h3>
+    <h3 id="selected-report-types">{% translate "Selected Report Types" %} ({{ data.report_types|length }})</h3>
     <table>
         <caption class="visually-hidden">{% translate "Selected report types" %}</caption>
         <thead>
diff --git a/rocky/reports/report_types/aggregate_organisation_report/introduction.html b/rocky/reports/report_types/aggregate_organisation_report/introduction.html
index d71dcbed43f..60813f712f9 100644
--- a/rocky/reports/report_types/aggregate_organisation_report/introduction.html
+++ b/rocky/reports/report_types/aggregate_organisation_report/introduction.html
@@ -3,7 +3,7 @@
 <section class="introduction" id="introduction">
     <div>
         <div class="horizontal-view toolbar">
-            <h1>{{ report_name }}</h1>
+            <h1>{{ report_ooi.name }}</h1>
             <div class="dropdown">
                 <button aria-controls="export-add" class="dropdown-button ghost">
                     {% translate "Export" %}<span aria-hidden="true" class="icon ti-chevron-down"></span>
@@ -23,10 +23,10 @@ <h1>{{ report_name }}</h1>
         <div>
             <p>{% translate "This is the OpenKAT report for organization" %} {{ organization.name }}</p>
             <p>
-                {% translate "Created with data from:" %} <strong>{{ observed_at }} {{ TIME_ZONE }}</strong>
+                {% translate "Created with data from:" %} <strong>{{ report_ooi.observed_at }} {{ TIME_ZONE }}</strong>
             </p>
             <p>
-                {% translate "Created on:" %} <strong>{{ created_at }}</strong>
+                {% translate "Created on:" %} <strong>{{ report_ooi.date_generated }}</strong>
             </p>
             <p>
                 {% translate "Created by:" %} <strong>{{ organization_member.user.full_name }}</strong>
diff --git a/rocky/reports/report_types/definitions.py b/rocky/reports/report_types/definitions.py
index e36661e3821..0aff9af1dfa 100644
--- a/rocky/reports/report_types/definitions.py
+++ b/rocky/reports/report_types/definitions.py
@@ -13,8 +13,21 @@
 
 
 class ReportPlugins(TypedDict):
-    required: list[str]
-    optional: list[str]
+    required: set[str]
+    optional: set[str]
+
+
+def report_plugins_union(report_types: list[type["BaseReport"]]) -> ReportPlugins:
+    """Take the union of the required and optional plugin sets and remove optional plugins that are required"""
+
+    plugins: ReportPlugins = {"required": set(), "optional": set()}
+
+    for report_type in report_types:
+        plugins["required"].update(report_type.plugins["required"])
+        plugins["optional"].update(report_type.plugins["optional"])
+        plugins["optional"].difference_update(report_type.plugins["required"])
+
+    return plugins
 
 
 class BaseReport:
diff --git a/rocky/reports/report_types/dns_report/report.py b/rocky/reports/report_types/dns_report/report.py
index 2ae8f888f49..0fd6b62eb52 100644
--- a/rocky/reports/report_types/dns_report/report.py
+++ b/rocky/reports/report_types/dns_report/report.py
@@ -18,7 +18,7 @@ class DNSReport(Report):
     id = "dns-report"
     name = _("DNS Report")
     description = _("DNS reports focus on domain name system configuration and potential weaknesses.")
-    plugins = {"required": ["dns-records", "dns-sec"], "optional": ["dns-zone"]}
+    plugins = {"required": {"dns-records", "dns-sec"}, "optional": {"dns-zone"}}
     input_ooi_types = {Hostname}
     template_path = "dns_report/report.html"
 
diff --git a/rocky/reports/report_types/findings_report/report.html b/rocky/reports/report_types/findings_report/report.html
index 5e9f476a23d..5eb65cef851 100644
--- a/rocky/reports/report_types/findings_report/report.html
+++ b/rocky/reports/report_types/findings_report/report.html
@@ -49,6 +49,8 @@ <h3>{% translate "Findings" %}</h3>
                             <td colspan="5">
                                 <h4 class="heading-normal">{% translate "Description" %}</h4>
                                 <p>{{ info.finding_type.description }}</p>
+                                <h4 class="heading-normal">{% translate "Source" %}</h4>
+                                <a href="{{ info.finding_type.source }}">{{ info.finding_type.source }}</a>
                                 <h4 class="heading-normal">{% translate "Impact" %}</h4>
                                 <p>{{ info.finding_type.impact }}</p>
                                 <h4 class="heading-normal">{% translate "Recommendation" %}</h4>
diff --git a/rocky/reports/report_types/findings_report/report.py b/rocky/reports/report_types/findings_report/report.py
index 9b05e6231b9..9ca4951d9d2 100644
--- a/rocky/reports/report_types/findings_report/report.py
+++ b/rocky/reports/report_types/findings_report/report.py
@@ -3,20 +3,27 @@
 
 from django.utils.translation import gettext_lazy as _
 
+import octopoes.models.ooi.reports as report_models
 from octopoes.models import Reference
 from octopoes.models.ooi.findings import Finding, FindingType, RiskLevelSeverity
+from octopoes.models.ooi.monitoring import Incident
+from octopoes.models.ooi.question import Question
+from octopoes.models.ooi.web import RESTAPI, ImageMetadata
 from octopoes.models.types import ALL_TYPES
 from reports.report_types.definitions import Report, ReportPlugins
 
 TREE_DEPTH = 9
 SEVERITY_OPTIONS = [severity.value for severity in RiskLevelSeverity]
 
+_EXCLUDE_OOI_TYPES = [Question, RESTAPI, Incident, ImageMetadata, report_models.ReportData, report_models.Report]
+_INPUT_OOI_TYPES = {ooi_type for ooi_type in ALL_TYPES if ooi_type not in _EXCLUDE_OOI_TYPES}
+
 
 class FindingsReport(Report):
     id = "findings-report"
     name = _("Findings Report")
     description = _("Shows all the finding types and their occurrences.")
-    plugins: ReportPlugins = {"required": [], "optional": []}
+    plugins: ReportPlugins = {"required": set(), "optional": set()}
     input_ooi_types = ALL_TYPES
     template_path = "findings_report/report.html"
     label_style = "3-light"
diff --git a/rocky/reports/report_types/helpers.py b/rocky/reports/report_types/helpers.py
index 4df28901cd2..1dbc1772935 100644
--- a/rocky/reports/report_types/helpers.py
+++ b/rocky/reports/report_types/helpers.py
@@ -1,7 +1,7 @@
 from octopoes.models import OOI, Reference
 from reports.report_types.aggregate_organisation_report.report import AggregateOrganisationReport
 from reports.report_types.concatenated_report.report import ConcatenatedReport
-from reports.report_types.definitions import AggregateReport, MultiReport, Report
+from reports.report_types.definitions import AggregateReport, BaseReport, Report
 from reports.report_types.dns_report.report import DNSReport
 from reports.report_types.findings_report.report import FindingsReport
 from reports.report_types.ipv6_report.report import IPv6Report
@@ -36,6 +36,8 @@
 
 CONCATENATED_REPORTS = [ConcatenatedReport]
 
+ALL_REPORT_TYPES = REPORTS + AGGREGATE_REPORTS + MULTI_REPORTS + CONCATENATED_REPORTS
+
 
 def get_ooi_types_with_report() -> set[type[OOI]]:
     """
@@ -44,7 +46,7 @@ def get_ooi_types_with_report() -> set[type[OOI]]:
     return {ooi_type for report in REPORTS for ooi_type in report.input_ooi_types}
 
 
-def get_report_types_for_ooi(ooi_pk: str) -> list[type[Report]]:
+def get_report_types_for_ooi(ooi_pk: str) -> list[type[BaseReport]]:
     """
     Get all report types that can be generated for a given OOI
     """
@@ -53,26 +55,26 @@ def get_report_types_for_ooi(ooi_pk: str) -> list[type[Report]]:
     return [report for report in REPORTS if ooi_type in report.input_ooi_types]
 
 
-def get_report_types_for_oois(ooi_pks: list[str]) -> set[type[Report]]:
+def get_report_types_for_oois(oois: list[str]) -> set[type[BaseReport]]:
     """
     Get all report types that can be generated for a given list of OOIs
     """
-    return {report for ooi_pk in ooi_pks for report in get_report_types_for_ooi(ooi_pk)}
+
+    return {report for ooi_pk in oois for report in get_report_types_for_ooi(ooi_pk)}
 
 
-def get_report_by_id(report_id: str) -> type[Report] | type[MultiReport] | type[AggregateReport]:
+def get_report_by_id(report_id: str) -> type[BaseReport]:
     """
     Get report type by id
     """
-    if report_id is None:
-        return ConcatenatedReport
-    for report in REPORTS + MULTI_REPORTS + AGGREGATE_REPORTS + CONCATENATED_REPORTS:
+
+    for report in ALL_REPORT_TYPES:
         if report.id == report_id:
             return report
     raise ValueError(f"Report with id {report_id} not found")
 
 
-def get_reports(report_ids: list[str]) -> list[type[Report] | type[MultiReport] | type[AggregateReport]]:
+def get_reports(report_ids: list[str]) -> list[type[BaseReport]]:
     return [get_report_by_id(report_id) for report_id in report_ids]
 
 
diff --git a/rocky/reports/report_types/ipv6_report/report.py b/rocky/reports/report_types/ipv6_report/report.py
index ae864dca348..98ce048086c 100644
--- a/rocky/reports/report_types/ipv6_report/report.py
+++ b/rocky/reports/report_types/ipv6_report/report.py
@@ -20,7 +20,7 @@ class IPv6Report(Report):
     id = "ipv6-report"
     name = _("IPv6 Report")
     description = _("Check whether hostnames point to IPv6 addresses.")
-    plugins = {"required": ["dns-records"], "optional": []}
+    plugins = {"required": {"dns-records"}, "optional": set()}
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "ipv6_report/report.html"
     label_style = "4-light"
diff --git a/rocky/reports/report_types/mail_report/report.py b/rocky/reports/report_types/mail_report/report.py
index 69f166a7ec9..0adf2ab9750 100644
--- a/rocky/reports/report_types/mail_report/report.py
+++ b/rocky/reports/report_types/mail_report/report.py
@@ -15,7 +15,7 @@ class MailReport(Report):
     id = "mail-report"
     name = _("Mail Report")
     description = _("System specific Mail Report that focusses on IP addresses and hostnames.")
-    plugins = {"required": ["dns-records"], "optional": []}
+    plugins = {"required": {"dns-records"}, "optional": set()}
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "mail_report/report.html"
     label_style = "2-light"
diff --git a/rocky/reports/report_types/multi_organization_report/report.py b/rocky/reports/report_types/multi_organization_report/report.py
index b32146f3f55..6bc74209f32 100644
--- a/rocky/reports/report_types/multi_organization_report/report.py
+++ b/rocky/reports/report_types/multi_organization_report/report.py
@@ -23,7 +23,7 @@ class MultiOrganizationReport(MultiReport):
     id = "multi-organization-report"
     name = _("Multi Organization Report")
     description = _("Multi Organization Report")
-    plugins: ReportPlugins = {"required": [], "optional": []}
+    plugins: ReportPlugins = {"required": set(), "optional": set()}
     input_ooi_types = {ReportData}
     template_path = "multi_organization_report/report.html"
 
@@ -257,6 +257,6 @@ def collect_report_data(
 ):
     report_data = {}
     for ooi in [x for x in input_ooi_references if Reference.from_str(x).class_type == ReportData]:
-        report_data[ooi] = connector.get(Reference.from_str(ooi), observed_at).dict()
+        report_data[ooi] = connector.get(Reference.from_str(ooi), observed_at).model_dump()
 
     return report_data
diff --git a/rocky/reports/report_types/name_server_report/report.py b/rocky/reports/report_types/name_server_report/report.py
index 9398e728719..a0eb7f01606 100644
--- a/rocky/reports/report_types/name_server_report/report.py
+++ b/rocky/reports/report_types/name_server_report/report.py
@@ -52,12 +52,12 @@ class NameServerSystemReport(Report):
     name = _("Name Server Report")
     description = _("Name Server Report checks name servers on basic security standards.")
     plugins = {
-        "required": [
+        "required": {
             "nmap",
             "dns-records",
             "dns-sec",
-        ],
-        "optional": [],
+        },
+        "optional": set(),
     }
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "name_server_report/report.html"
diff --git a/rocky/reports/report_types/open_ports_report/report.py b/rocky/reports/report_types/open_ports_report/report.py
index e868237dad5..05fbd1e6c0d 100644
--- a/rocky/reports/report_types/open_ports_report/report.py
+++ b/rocky/reports/report_types/open_ports_report/report.py
@@ -14,8 +14,8 @@ class OpenPortsReport(Report):
     name = _("Open Ports Report")
     description = _("Find open ports of IP addresses")
     plugins = {
-        "required": ["nmap"],
-        "optional": ["shodan", "nmap-udp", "nmap-ports", "nmap-ip-range", "masscan"],
+        "required": {"nmap"},
+        "optional": {"shodan", "nmap-udp", "nmap-ports", "nmap-ip-range", "masscan"},
     }
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "open_ports_report/report.html"
diff --git a/rocky/reports/report_types/rpki_report/report.py b/rocky/reports/report_types/rpki_report/report.py
index ed2d05576e0..1e11541ec1f 100644
--- a/rocky/reports/report_types/rpki_report/report.py
+++ b/rocky/reports/report_types/rpki_report/report.py
@@ -22,7 +22,7 @@ class RPKIReport(Report):
         "Shows whether the IP is covered by a valid RPKI ROA. For a hostname it shows "
         "the IP addresses and whether they are covered by a valid RPKI ROA."
     )
-    plugins = {"required": ["dns-records", "rpki"], "optional": []}
+    plugins = {"required": {"dns-records", "rpki"}, "optional": set()}
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "rpki_report/report.html"
     label_style = "4-light"
diff --git a/rocky/reports/report_types/safe_connections_report/report.py b/rocky/reports/report_types/safe_connections_report/report.py
index 13554d39562..f4192d7254d 100644
--- a/rocky/reports/report_types/safe_connections_report/report.py
+++ b/rocky/reports/report_types/safe_connections_report/report.py
@@ -20,8 +20,8 @@ class SafeConnectionsReport(Report):
     name = _("Safe Connections Report")
     description: str = _("Shows whether the IPService contains safe ciphers.")
     plugins = {
-        "required": ["dns-records", "testssl-sh-ciphers", "nmap"],
-        "optional": [],
+        "required": {"dns-records", "testssl-sh-ciphers", "nmap"},
+        "optional": set(),
     }
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "safe_connections_report/report.html"
diff --git a/rocky/reports/report_types/systems_report/report.py b/rocky/reports/report_types/systems_report/report.py
index db71c686271..af804290acb 100644
--- a/rocky/reports/report_types/systems_report/report.py
+++ b/rocky/reports/report_types/systems_report/report.py
@@ -53,7 +53,7 @@ class SystemReport(Report):
     id = "systems-report"
     name = _("System Report")
     description = _("Combine IP addresses, hostnames and services into systems.")
-    plugins = {"required": ["dns-records", "nmap"], "optional": ["nmap-udp"]}
+    plugins = {"required": {"dns-records", "nmap"}, "optional": {"nmap-udp"}}
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "systems_report/report.html"
     label_style = "6-light"
diff --git a/rocky/reports/report_types/tls_report/report.py b/rocky/reports/report_types/tls_report/report.py
index e56cd5cf8ba..eae1802093d 100644
--- a/rocky/reports/report_types/tls_report/report.py
+++ b/rocky/reports/report_types/tls_report/report.py
@@ -20,7 +20,7 @@ class TLSReport(Report):
     id = "tls-report"
     name = _("TLS Report")
     description: str = _("TLS Report assesses the security of data encryption and transmission protocols.")
-    plugins = {"required": ["testssl-sh-ciphers"], "optional": []}
+    plugins = {"required": {"testssl-sh-ciphers"}, "optional": set()}
     input_ooi_types = {IPService}
     template_path = "tls_report/report.html"
     label_style = "3-light"
diff --git a/rocky/reports/report_types/vulnerability_report/report.py b/rocky/reports/report_types/vulnerability_report/report.py
index 021e88978d5..d8b88888ed9 100644
--- a/rocky/reports/report_types/vulnerability_report/report.py
+++ b/rocky/reports/report_types/vulnerability_report/report.py
@@ -21,8 +21,8 @@ class VulnerabilityReport(Report):
     name = _("Vulnerability Report")
     description: str = _("Vulnerabilities found are grouped for each system.")
     plugins = {
-        "required": ["dns-records", "nmap", "webpage-analysis"],
-        "optional": ["nmap-udp", "nmap-ports", "shodan"],
+        "required": {"dns-records", "nmap", "webpage-analysis"},
+        "optional": {"nmap-udp", "nmap-ports", "shodan"},
     }
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "vulnerability_report/report.html"
diff --git a/rocky/reports/report_types/web_system_report/report.py b/rocky/reports/report_types/web_system_report/report.py
index 75aece24111..f55a3ebc51c 100644
--- a/rocky/reports/report_types/web_system_report/report.py
+++ b/rocky/reports/report_types/web_system_report/report.py
@@ -92,7 +92,7 @@ class WebSystemReport(Report):
     name = _("Web System Report")
     description = _("Web System Reports check web systems on basic security standards.")
     plugins = {
-        "required": [
+        "required": {
             "nmap",
             "dns-records",
             "security_txt_downloader",
@@ -100,8 +100,8 @@ class WebSystemReport(Report):
             "ssl-version",
             "ssl-certificates",
             "webpage-analysis",
-        ],
-        "optional": [],
+        },
+        "optional": set(),
     }
     input_ooi_types = {Hostname, IPAddressV4, IPAddressV6}
     template_path = "web_system_report/report.html"
diff --git a/rocky/reports/runner/__init__.py b/rocky/reports/runner/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/rocky/reports/runner/local.py b/rocky/reports/runner/local.py
new file mode 100644
index 00000000000..a1e5a4e5fa2
--- /dev/null
+++ b/rocky/reports/runner/local.py
@@ -0,0 +1,48 @@
+from datetime import datetime, timezone
+
+from django.conf import settings
+from katalogus.client import KATalogusError, get_katalogus
+from tools.models import Organization
+
+from octopoes.connector.octopoes import OctopoesAPIConnector
+from octopoes.models import Reference
+from octopoes.models.ooi.reports import ReportRecipe
+from reports.report_types.helpers import get_report_by_id
+from reports.runner.models import JobRuntimeError, ReportJobRunner
+from reports.views.base import format_plugin_data, hydrate_plugins
+from reports.views.mixins import collect_reports, save_report_data
+from rocky.bytes_client import get_bytes_client
+from rocky.scheduler import ReportTask
+
+
+class LocalReportJobRunner(ReportJobRunner):
+    def run(self, report_task: ReportTask) -> None:
+        now = datetime.now(timezone.utc)
+        connector = OctopoesAPIConnector(settings.OCTOPOES_API, report_task.organisation_id)
+        recipe: ReportRecipe = connector.get(
+            Reference.from_str(f"ReportRecipe|{report_task.report_recipe_id}"), datetime.now(timezone.utc)
+        )
+        parsed_report_types = [get_report_by_id(report_type_id) for report_type_id in recipe.report_types]
+
+        error_reports, report_data = collect_reports(
+            now,
+            connector,
+            list(recipe.input_recipe["input_oois"]),
+            parsed_report_types,
+        )
+
+        try:
+            report_type_plugins = hydrate_plugins(parsed_report_types, get_katalogus(report_task.organisation_id))
+            plugins = format_plugin_data(report_type_plugins)
+        except KATalogusError as e:
+            raise JobRuntimeError("Failed to hydrate plugins from KATalogus") from e
+
+        save_report_data(
+            get_bytes_client(report_task.organisation_id),
+            now,
+            connector,
+            Organization.objects.get(code=report_task.organisation_id),
+            plugins,
+            report_data,
+            [(recipe.report_name_format, recipe.report_name_format)],
+        )
diff --git a/rocky/reports/runner/models.py b/rocky/reports/runner/models.py
new file mode 100644
index 00000000000..6ea2409cbd3
--- /dev/null
+++ b/rocky/reports/runner/models.py
@@ -0,0 +1,15 @@
+from octopoes.models.ooi.reports import ReportRecipe
+
+
+class ReportJobRunner:
+    def run(self, recipe: ReportRecipe) -> None:
+        raise NotImplementedError()
+
+
+class WorkerManager:
+    def run(self) -> None:
+        raise NotImplementedError()
+
+
+class JobRuntimeError(RuntimeError):
+    """Base exception class for exceptions raised during running of jobs"""
diff --git a/rocky/reports/runner/worker.py b/rocky/reports/runner/worker.py
new file mode 100644
index 00000000000..c411c365766
--- /dev/null
+++ b/rocky/reports/runner/worker.py
@@ -0,0 +1,262 @@
+import multiprocessing as mp
+import os
+import signal
+import sys
+import time
+from queue import Queue
+
+import structlog
+from django.conf import settings
+from httpx import HTTPError
+from pydantic import ValidationError
+
+from reports.runner.local import LocalReportJobRunner
+from reports.runner.models import ReportJobRunner, WorkerManager
+from rocky.scheduler import SchedulerClient, Task, TaskStatus, scheduler_client
+
+logger = structlog.get_logger(__name__)
+
+
+class SchedulerWorkerManager(WorkerManager):
+    def __init__(
+        self,
+        runner: ReportJobRunner,
+        scheduler: SchedulerClient,
+        pool_size: int,
+        poll_interval: int,
+        worker_heartbeat: int,
+    ):
+        self.runner = runner
+        self.scheduler = scheduler
+        self.pool_size = pool_size
+        self.poll_interval = poll_interval
+        self.worker_heartbeat = worker_heartbeat
+
+        manager = mp.Manager()
+
+        self.task_queue = manager.Queue()  # multiprocessing.Queue() will not work on macOS, see mp.Queue.qsize()
+        self.handling_tasks = manager.dict()
+        self.workers: list[mp.Process] = []
+
+        self.exited = False
+
+    def run(self) -> None:
+        logger.info("Created worker pool for queue 'report'")
+
+        self.workers = [mp.Process(target=_start_working, args=self._worker_args()) for _ in range(self.pool_size)]
+        for worker in self.workers:
+            worker.start()
+
+        signal.signal(signal.SIGINT, lambda signum, _: self.exit(signum))
+        signal.signal(signal.SIGTERM, lambda signum, _: self.exit(signum))
+
+        while True:
+            try:
+                self._check_workers()
+                self._fill_queue(self.task_queue)
+            except Exception as e:  # noqa
+                logger.exception("Unhandled Exception:")
+                logger.info("Continuing worker...")
+                continue
+            except:  # noqa
+                # Calling sys.exit() in self.exit() will raise SystemExit. We
+                # should only log the exception and call self.exit() when the
+                # exception is caused by something else and self.exit() hasn't
+                # been called yet.
+                if not self.exited:
+                    logger.exception("Exiting worker...")
+                    self.exit()
+
+                raise
+
+    def _fill_queue(self, task_queue: Queue):
+        if task_queue.qsize() > self.pool_size:
+            time.sleep(self.worker_heartbeat)
+            return
+
+        try:
+            queues = self.scheduler.get_queues()
+        except HTTPError:
+            # Scheduler is having issues, so make note of it and try again
+            logger.exception("Getting the queues from the scheduler failed")
+            time.sleep(10 * self.poll_interval)  # But not immediately
+            return
+
+        # We do not target a specific queue since we start one runtime for all organisations
+        # and queue ids contain the organisation_id
+        queues = [q for q in queues if q.id.startswith("report")]
+
+        logger.debug("Found queues: %s", [queue.id for queue in queues])
+
+        all_queues_empty = True
+
+        for queue in queues:
+            logger.debug("Popping from queue %s", queue.id)
+
+            try:
+                p_item = self.scheduler.pop_item(queue.id)
+            except (HTTPError, ValidationError):
+                logger.error("Popping task from scheduler failed")
+                time.sleep(self.poll_interval)
+                continue
+
+            if not p_item:
+                logger.debug("Queue %s empty", queue.id)
+                continue
+
+            all_queues_empty = False
+
+            logger.info("Handling task[%s]", p_item.id)
+
+            try:
+                task_queue.put(p_item)
+                logger.info("Dispatched task[%s]", p_item.id)
+            except:  # noqa
+                logger.error("Exiting worker...")
+                logger.info("Patching scheduler task[id=%s] to %s", p_item.id, TaskStatus.FAILED.value)
+
+                try:
+                    self.scheduler.patch_task(p_item.id, TaskStatus.FAILED)
+                    logger.info("Set task status to %s in the scheduler for task[id=%s]", TaskStatus.FAILED, p_item.id)
+                except HTTPError:
+                    logger.error("Could not patch scheduler task to %s", TaskStatus.FAILED.value)
+
+                raise
+
+        if all_queues_empty:
+            logger.debug("All queues empty, sleeping %f seconds", self.poll_interval)
+            time.sleep(self.poll_interval)
+
+    def _check_workers(self) -> None:
+        new_workers = []
+
+        for worker in self.workers:
+            closed = False
+
+            try:
+                if worker.is_alive():
+                    new_workers.append(worker)
+                    continue
+            except ValueError:
+                closed = True  # worker is closed, so we create a new one
+
+            logger.warning(
+                "Worker[pid=%s, %s] not alive, creating new worker...", worker.pid, _format_exit_code(worker.exitcode)
+            )
+
+            if not closed:  # Closed workers do not have a pid, so cleaning up would fail
+                self._cleanup_pending_worker_task(worker)
+                worker.close()
+
+            new_worker = mp.Process(target=_start_working, args=self._worker_args())
+            new_worker.start()
+            new_workers.append(new_worker)
+
+        self.workers = new_workers
+
+    def _cleanup_pending_worker_task(self, worker: mp.Process) -> None:
+        if worker.pid not in self.handling_tasks:
+            logger.debug("No pending task found for Worker[pid=%s, %s]", worker.pid, _format_exit_code(worker.exitcode))
+            return
+
+        handling_task_id = self.handling_tasks[worker.pid]
+
+        try:
+            task = self.scheduler.get_task_details(handling_task_id)
+
+            if task.status is TaskStatus.DISPATCHED or task.status is TaskStatus.RUNNING:
+                try:
+                    self.scheduler.patch_task(task.id, TaskStatus.FAILED)
+                    logger.warning("Set status to failed in the scheduler for task[id=%s]", handling_task_id)
+                except HTTPError:
+                    logger.exception("Could not patch scheduler task to failed")
+        except HTTPError:
+            logger.exception("Could not get scheduler task[id=%s]", handling_task_id)
+
+    def _worker_args(self) -> tuple:
+        return self.task_queue, self.runner, self.scheduler, self.handling_tasks
+
+    def exit(self, signum: int | None = None):
+        try:
+            if signum:
+                logger.info("Received %s, exiting", signal.Signals(signum).name)
+
+            if not self.task_queue.empty():
+                tasks: list[Task] = [self.task_queue.get() for _ in range(self.task_queue.qsize())]
+
+                for task in tasks:
+                    try:
+                        self.scheduler.push_task(task)
+                    except HTTPError:
+                        logger.exception("Rescheduling task failed[id=%s]", task.id)
+
+            killed_workers = []
+
+            for worker in self.workers:  # Send all signals before joining, speeding up shutdowns
+                try:
+                    if worker.is_alive():
+                        worker.kill()
+                        killed_workers.append(worker)
+                except ValueError:
+                    pass  # worker is already closed
+
+            for worker in killed_workers:
+                worker.join()
+                self._cleanup_pending_worker_task(worker)
+                worker.close()
+        finally:
+            self.exited = True
+            # If we are called from the main run loop we are already in the
+            # process of exiting, so we only need to call sys.exit() in the
+            # signal handler.
+            if signum:
+                sys.exit()
+
+
+def _format_exit_code(exitcode: int | None) -> str:
+    if exitcode is None or exitcode >= 0:
+        return f"exitcode={exitcode}"
+
+    return f"signal={signal.Signals(-exitcode).name}"
+
+
+def _start_working(
+    task_queue: mp.Queue,
+    runner: ReportJobRunner,
+    scheduler: SchedulerClient,
+    handling_tasks: dict[int, str],
+):
+    logger.info("Started listening for tasks from worker[pid=%s]", os.getpid())
+
+    while True:
+        p_item = task_queue.get()
+        status = TaskStatus.FAILED
+        handling_tasks[os.getpid()] = str(p_item.id)
+
+        try:
+            scheduler.patch_task(p_item.id, TaskStatus.RUNNING)
+            runner.run(p_item.data)
+            status = TaskStatus.COMPLETED
+        except Exception:  # noqa
+            logger.exception("An error occurred handling scheduler item[id=%s]", p_item.id)
+        except:  # noqa
+            logger.exception("An unhandled error occurred handling scheduler item[id=%s]", p_item.id)
+            raise
+        finally:
+            try:
+                # The docker runner could have handled this already
+                if scheduler.get_task_details(p_item.id).status == TaskStatus.RUNNING:
+                    scheduler.patch_task(p_item.id, status)  # Note that implicitly, we have p_item.id == task_id
+                    logger.info("Set status to %s in the scheduler for task[id=%s]", status, p_item.id)
+            except HTTPError:
+                logger.exception("Could not patch scheduler task to %s", status.value)
+
+
+def get_runtime_manager() -> WorkerManager:
+    return SchedulerWorkerManager(
+        LocalReportJobRunner(),
+        scheduler_client(None),
+        settings.POOL_SIZE,
+        settings.POLL_INTERVAL,
+        settings.WORKER_HEARTBEAT,
+    )
diff --git a/rocky/reports/templates/aggregate_report.html b/rocky/reports/templates/aggregate_report.html
index 9ba1d1d23a3..8cdb08d1f79 100644
--- a/rocky/reports/templates/aggregate_report.html
+++ b/rocky/reports/templates/aggregate_report.html
@@ -5,7 +5,7 @@
 
 {% block content %}
     {% include "header.html" %}
-    {% include template with data=post_processed_data %}
+    {% include report_ooi.template with data=report_data %}
 
 {% endblock content %}
 {% block html_at_end_body %}
diff --git a/rocky/reports/templates/aggregate_report_pdf.html b/rocky/reports/templates/aggregate_report_pdf.html
index 4047414e922..f1e79ff06b0 100644
--- a/rocky/reports/templates/aggregate_report_pdf.html
+++ b/rocky/reports/templates/aggregate_report_pdf.html
@@ -14,7 +14,7 @@
         {% endcompress %}
     </head>
     <body>
-        {% include template with data=post_processed_data %}
+        {% include report_ooi.template with data=report_data %}
 
     </body>
 </html>
diff --git a/rocky/reports/templates/forms/report_form_fields.html b/rocky/reports/templates/forms/report_form_fields.html
index 461594e93b4..5c512e51967 100644
--- a/rocky/reports/templates/forms/report_form_fields.html
+++ b/rocky/reports/templates/forms/report_form_fields.html
@@ -1,7 +1,6 @@
 <input type="hidden"
        name="observed_at"
        value="{{ observed_at|date:"Y-m-d" }}">
-{% for ooi in selected_oois %}<input type="hidden" name="ooi" value="{{ ooi }}">{% endfor %}
 {% for ooi_type in ooi_types_selection %}<input type="hidden" name="ooi_type" value="{{ ooi_type }}">{% endfor %}
 {% for clearance_level in clearance_levels_selection %}
     <input type="hidden" name="clearance_level" value="{{ clearance_level }}">
@@ -9,14 +8,20 @@
 {% for clearance_type in clearance_types_selection %}
     <input type="hidden" name="clearance_type" value="{{ clearance_type }}">
 {% endfor %}
-{% if selected_report_types %}
+{% if request.GET.page %}<input type="hidden" name="page" value="{{ request.GET.page }}">{% endif %}
+{% if not disable_ooi_selection_fields %}
+    {% for ooi in selected_oois %}<input type="hidden" name="ooi" value="{{ ooi }}">{% endfor %}
+{% endif %}
+{% if not disable_report_type_fields %}
     {% for report_type in selected_report_types %}
         <input type="hidden" name="report_type" value="{{ report_type }}">
     {% endfor %}
 {% endif %}
-{% if plugins.required %}
-    {% for required_plugin in plugins.required %}
-        <input type="hidden" name="plugin" value="{{ required_plugin.id }}">
-    {% endfor %}
+{% for required_optional_plugin, plugins_ in plugins.items %}
+    {% for plugin in plugins_ %}<input type="hidden" name="plugin" value="{{ plugin.id }}">{% endfor %}
+{% endfor %}
+{% if request.POST.choose_recurrence %}
+    <input type="hidden"
+           name="choose_recurrence"
+           value="{{ request.POST.choose_recurrence }}">
 {% endif %}
-{% if request.GET.page %}<input type="hidden" name="page" value="{{ request.GET.page }}">{% endif %}
diff --git a/rocky/reports/templates/partials/export_report_settings.html b/rocky/reports/templates/partials/export_report_settings.html
index 834e6b3b022..23546bfb807 100644
--- a/rocky/reports/templates/partials/export_report_settings.html
+++ b/rocky/reports/templates/partials/export_report_settings.html
@@ -7,68 +7,52 @@
 <section>
     <div>
         {% if selected_oois and selected_report_types %}
-            <h2>{% translate "Report name" %}</h2>
-            {% include "partials/return_button.html" with btn_text="Change selection" %}
-
+            <h2>{% translate "Report schedule" %}</h2>
             <p>
                 {% blocktranslate trimmed %}
-                    Give your report a custom name and optionally add the reports' reference date
-                    to the name. To do so you can select a standard option or use a <a href="https://strftime.org/" target="_blank">Python
-                    strftime code</a> in the report name.
+                    When scheduling your report, you have two options. You can either choose to generate it just once now,
+                    or set it to run automatically at regular intervals, like daily, weekly,
+                    or monthly. If you need the report just for a single occasion, select the one-time option.
                 {% endblocktranslate %}
             </p>
+            {% include "partials/return_button.html" with btn_text="Change selection" %}
+
+            <form class="inline" method="post" action="{{ current }}">
+                {% csrf_token %}
+                {% include "forms/report_form_fields.html" %}
+
+                <h3>{% translate "Recurrence" %}</h3>
+                {% include "partials/form/fieldset.html" with fields=report_schedule_form_recurrence_choice %}
+
+                {% if is_scheduled_report %}
+                    {% include "partials/form/fieldset.html" with fields=report_schedule_form_recurrence %}
+
+                {% endif %}
+            </form>
             <form id="generate_report" class="inline" method="post" action="{{ next }}">
-                <table id="report-name-table">
-                    <caption class="visually-hidden">{% translate "Report names:" %}</caption>
-                    <thead>
-                        <tr>
-                            <th scope="col" colspan="2">
-                                {% translate "Name" %} <span class="nota-bene" aria-hidden>{% translate "(Required)" %}</span>
-                            </th>
-                            <th scope="col">{% translate "Add reference date" %}</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        {% for report_name in reports %}
-                            {% with report_id=report_name|slugify %}
-                                <input type="hidden" name="old_report_name" value="{{ report_name }}" />
-                                <tr>
-                                    <td>
-                                        <div>
-                                            <input id="{{ report_id }}"
-                                                   class="name-input"
-                                                   name="report_name"
-                                                   type="text"
-                                                   value="{{ report_name }}"
-                                                   required
-                                                   minlength="3" />
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <button type="button"
-                                                class="icon ti-arrow-back-up action-button reset-button hidden"
-                                                aria-label="{% translate "Reset" %}"></button>
-                                    </td>
-                                    <td>
-                                        <select class="reference-date" name="reference_date">
-                                            <option value="">{% translate "No reference date" %}</option>
-                                            <option value="%b %d %Y, %H:%M">{% translate "Day" %} ({{ current_datetime|date:"N jS Y, H:i" }})</option>
-                                            <option value="week">{% translate "Week" %} ({% translate "Week" %} {{ current_datetime|date:"W, Y" }})</option>
-                                            <option value="%b, %Y">{% translate "Month" %} ({{ current_datetime|date:"N, Y" }})</option>
-                                            <option value="%Y">{% translate "Year" %} ({{ current_datetime|date:"Y" }})</option>
-                                        </select>
-                                    </td>
-                                </tr>
-                            {% endwith %}
-                        {% endfor %}
-                    </tbody>
-                </table>
                 {% csrf_token %}
-                <button type="submit" form="generate_report">
-                    {% include "forms/report_form_fields.html" %}
+                {% include "forms/report_form_fields.html" %}
+
+                {% if show_listed_report_names %}
+                    {% include "partials/report_names_header.html" %}
+                    {% include "partials/report_names_form.html" %}
+
+                    <button type="submit" form="generate_report">
+                        {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
+                    </button>
+                {% endif %}
+                {% if is_scheduled_report %}
+                    {% include "partials/report_names_header.html" %}
+                    {% include "partials/form/fieldset.html" with fields=report_parent_name_form %}
+
+                    {% if reports|length > 1 %}
+                        {% include "partials/form/fieldset.html" with fields=report_child_name_form %}
 
-                    {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
-                </button>
+                    {% endif %}
+                    <button type="submit" form="generate_report">
+                        {% translate "Generate report" %}<span class="icon ti-chevron-right" aria-hidden="true"></span>
+                    </button>
+                {% endif %}
             </form>
         {% else %}
             {% include "partials/return_button.html" with btn_text="Go back" %}
@@ -79,5 +63,6 @@ <h2>{% translate "Report name" %}</h2>
 {% block html_at_end_body %}
     {% compress js %}
         <script src="{% static "js/renameReports.js" %}" nonce="{{ request.csp_nonce }}" type="module"></script>
+        <script src="{% static "js/autoSubmit.js" %}" nonce="{{ request.csp_nonce }}" type="module"></script>
     {% endcompress %}
 {% endblock html_at_end_body %}
diff --git a/rocky/reports/templates/partials/report_header.html b/rocky/reports/templates/partials/report_header.html
index cc651048d09..5aba55406c2 100644
--- a/rocky/reports/templates/partials/report_header.html
+++ b/rocky/reports/templates/partials/report_header.html
@@ -3,7 +3,7 @@
 <section class="introduction" id="introduction">
     <div>
         <div class="horizontal-view toolbar">
-            <h1>{{ report_name }}</h1>
+            <h1>{{ report_ooi.name }}</h1>
             <div class="dropdown">
                 <button aria-controls="export-add" class="dropdown-button ghost">
                     {% translate "Export" %}<span aria-hidden="true" class="icon ti-chevron-down"></span>
@@ -11,9 +11,10 @@ <h1>{{ report_name }}</h1>
                 <div id="export-add" aria-expanded="false" class="dropdown-list">
                     <ul>
                         <li>
-                            <a href="{{ report_download_pdf_url }}"
-                               target="_blank"
-                               rel="noopener noreferrer"><span class="icon ti-download" aria-hidden="true"></span>{% translate "Download report" %}</a>
+                            <a href="{{ report_download_pdf_url }}" target="_blank"><span class="icon ti-download" aria-hidden="true"></span>{% translate "Download report" %} (PDF)</a>
+                        </li>
+                        <li>
+                            <a href="{{ report_download_json_url }}" target="_blank"><span class="icon ti-download" aria-hidden="true"></span>{% translate "Download report" %} (JSON)</a>
                         </li>
                     </ul>
                 </div>
@@ -25,10 +26,10 @@ <h1>{{ report_name }}</h1>
                 {% translate "All selected report types for the selected objects are displayed one below the other." %}
             </p>
             <p>
-                {% translate "Created with data from:" %} <strong>{{ observed_at }} {{ TIME_ZONE }}</strong>
+                {% translate "Created with data from:" %} <strong>{{ report_ooi.observed_at }} {{ TIME_ZONE }}</strong>
             </p>
             <p>
-                {% translate "Created on:" %} <strong>{{ created_at }}</strong>
+                {% translate "Created on:" %} <strong>{{ report_ooi.date_generated }}</strong>
             </p>
             <p>
                 {% translate "Created by:" %} <strong>{{ organization_member.user.full_name }}</strong>
diff --git a/rocky/reports/templates/partials/report_names_form.html b/rocky/reports/templates/partials/report_names_form.html
new file mode 100644
index 00000000000..28d91084845
--- /dev/null
+++ b/rocky/reports/templates/partials/report_names_form.html
@@ -0,0 +1,52 @@
+{% load i18n %}
+{% load static %}
+{% load report_extra %}
+{% load ooi_extra %}
+{% load compress %}
+
+<table id="report-name-table">
+    <caption class="visually-hidden">{% translate "Report names:" %}</caption>
+    <thead>
+        <tr>
+            <th scope="col" colspan="2">
+                {% translate "Name" %} <span class="nota-bene" aria-hidden>{% translate "(Required)" %}</span>
+            </th>
+            <th scope="col">{% translate "Add reference date" %}</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for report_name in reports %}
+            {% with report_id=report_name|slugify %}
+                <input type="hidden" name="old_report_name" value="{{ report_name }}" />
+                <tr>
+                    <td>
+                        <div>
+                            <input id="{{ report_id }}"
+                                   class="name-input"
+                                   name="report_name"
+                                   type="text"
+                                   value="{{ report_name }}"
+                                   required
+                                   minlength="3" />
+                        </div>
+                    </td>
+                    <td>
+                        <button type="button"
+                                class="icon ti-arrow-back-up action-button reset-button hidden"
+                                aria-label="{% translate "Reset" %}"></button>
+                    </td>
+                    <td>
+                        <select class="reference-date" name="reference_date">
+                            <option value="">{% translate "No reference date" %}</option>
+                            <option value="%b %d %Y, %H:%M">{% translate "Day" %} ({{ created_at|date:"N jS Y, H:i" }})</option>
+                            <option value="week">{% translate "Week" %} ({% translate "Week" %} {{ created_at|date:"W, Y" }})</option>
+                            <option value="%b, %Y">{% translate "Month" %} ({{ created_at|date:"N, Y" }})</option>
+                            <option value="%Y">{% translate "Year" %} ({{ created_at|date:"Y" }})</option>
+                        </select>
+                    </td>
+                </tr>
+            {% endwith %}
+        {% endfor %}
+    </tbody>
+</table>
+{% csrf_token %}
diff --git a/rocky/reports/templates/partials/report_names_header.html b/rocky/reports/templates/partials/report_names_header.html
new file mode 100644
index 00000000000..9ff50c925fc
--- /dev/null
+++ b/rocky/reports/templates/partials/report_names_header.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+{% load static %}
+
+<h2>{% translate "Report name" %}</h2>
+<p>
+    {% blocktranslate trimmed %}
+        Give your report a custom name and optionally add the reports' reference date
+        to the name. To do so you can select a standard option or use a <a href="https://strftime.org/" target="_blank">Python
+        strftime code</a> in the report name.
+    {% endblocktranslate %}
+</p>
diff --git a/rocky/reports/templates/partials/report_ooi_list.html b/rocky/reports/templates/partials/report_ooi_list.html
index 255f8d41b3b..d59814e4a4f 100644
--- a/rocky/reports/templates/partials/report_ooi_list.html
+++ b/rocky/reports/templates/partials/report_ooi_list.html
@@ -22,7 +22,7 @@ <h2>
                    href="{% url 'ooi_list' organization_code=organization.code %}">{% translate "Go to the object page" %}</a>
             </div>
         {% else %}
-            {% if "all" in selected_oois %}
+            {% if all_oois_selected %}
                 <div class="horizontal-view horizontal-scroll toolbar start">
                     <p class="de-emphasized">{{ total_oois }} {% translate "objects selected" %}</p>
                     <a class="select_all_objects_element">{% translate "Deselect all objects" %}</a>
@@ -53,11 +53,11 @@ <h2>
                   action="{{ next }}"
                   class="inline layout-wide checkboxes_required">
                 {% csrf_token %}
-                {% if "all" in selected_oois %}
+                {% if all_oois_selected %}
                     {% include "forms/report_form_fields.html" %}
 
                 {% else %}
-                    {% include "forms/report_form_fields.html" with selected_oois=None %}
+                    {% include "forms/report_form_fields.html" with disable_ooi_selection_fields=True %}
 
                 {% endif %}
                 <table>
@@ -66,7 +66,7 @@ <h2>
                         <th>
                             <input class="select_all_objects_element"
                                    type="checkbox"
-                                   {% if "all" in selected_oois %}checked{% endif %}>
+                                   {% if all_oois_selected %}checked{% endif %}>
                         </th>
                         <th>{% translate "Object" %}</th>
                         <th>{% translate "Type" %}</th>
@@ -80,8 +80,8 @@ <h2>
                                     <input type="checkbox"
                                            name="ooi"
                                            value="{{ object.primary_key }}"
-                                           {% if object.primary_key in selected_oois or "all" in selected_oois %}checked{% endif %}
-                                           {% if "all" in selected_oois %}disabled{% endif %}>
+                                           {% if object.primary_key in selected_oois or all_oois_selected %}checked{% endif %}
+                                           {% if all_oois_selected %}disabled{% endif %}>
                                 </td>
                                 <td>{{ object.human_readable }}</td>
                                 <td>{{ object.ooi_type }}</td>
@@ -104,7 +104,7 @@ <h2>
     </div>
 </section>
 <form novalidate id="select_all_objects_form" class="inline" method="get">
-    {% include "forms/report_form_fields.html" with selected_oois=None %}
+    {% include "forms/report_form_fields.html" with disable_ooi_selection_fields=True %}
 
-    {% if "all" not in selected_oois %}<input type="hidden" name="ooi" value="all">{% endif %}
+    {% if not all_oois_selected %}<input type="hidden" name="ooi" value="all">{% endif %}
 </form>
diff --git a/rocky/reports/templates/partials/report_setup_scan.html b/rocky/reports/templates/partials/report_setup_scan.html
index fb664a92071..0d0271283b5 100644
--- a/rocky/reports/templates/partials/report_setup_scan.html
+++ b/rocky/reports/templates/partials/report_setup_scan.html
@@ -37,10 +37,10 @@ <h2>{% translate "Plugins" %}</h2>
                 {% endblocktranslate %}
             </p>
             <h3>{% translate "Required plugins" %}</h3>
-            <p>{% translate "This report type requires the following plugins to be enabled:" %}</p>
-            {% if all_plugins_enabled.required %}
+            {% if enabled_plugins.required %}
                 <p>{% translate "Good job! All required plugins are enabled." %}</p>
-            {% else %}
+            {% elif plugins.required %}
+                <p>{% translate "This report type requires the following plugins to be enabled:" %}</p>
                 <div class="required-plugin-container">
                     <div class="toolbar">
                         <div class="checkbox">
@@ -57,14 +57,16 @@ <h3>{% translate "Required plugins" %}</h3>
                         {% endfor %}
                     </div>
                 </div>
+            {% else %}
+                <p>{% translate "There are no required plugins." %}</p>
             {% endif %}
             <h3>{% translate "Suggested plugins" %}</h3>
-            <p>
-                {% translate "This report requires at least one of the following plugins to be enabled to generate the report:" %}
-            </p>
-            {% if all_plugins_enabled.optional %}
+            {% if enabled_plugins.optional %}
                 <p>{% translate "Good job! All suggested plugins are enabled" %}</p>
-            {% else %}
+            {% elif plugins.optional %}
+                <p>
+                    {% translate "This report requires at least one of the following plugins to be enabled to generate the report:" %}
+                </p>
                 <div class="optional-plugin-container hide-overflow">
                     <div class="toolbar">
                         <div class="checkbox">
@@ -76,10 +78,8 @@ <h3>{% translate "Suggested plugins" %}</h3>
                     </div>
                     <div class="column-4 tiles plugins images-cover">
                         {% for optional_plugin in plugins.optional|dictsort:"enabled" %}
-                            {% if optional_plugin not in plugins.required %}
-                                {% include "partials/plugin_tile.html" with plugin=optional_plugin form_id="continue-to-configurationt" show_report_types="yes" plugin_report_types=plugin_data.plugin_report_types %}
+                            {% include "partials/plugin_tile.html" with plugin=optional_plugin form_id="continue-to-configurationt" show_report_types="yes" plugin_report_types=plugin_data.plugin_report_types %}
 
-                            {% endif %}
                         {% endfor %}
                     </div>
                     <div class="toolbar">
@@ -89,6 +89,8 @@ <h3>{% translate "Suggested plugins" %}</h3>
                                 data-show-text="{% translate "Show more suggested plugins" %}"></button>
                     </div>
                 </div>
+            {% else %}
+                <p>{% translate "There are no optional plugins." %}</p>
             {% endif %}
             <form id="continue-to-configuration"
                   class="inline"
diff --git a/rocky/reports/templates/partials/report_types_selection.html b/rocky/reports/templates/partials/report_types_selection.html
index 3c401605847..be6e1283007 100644
--- a/rocky/reports/templates/partials/report_types_selection.html
+++ b/rocky/reports/templates/partials/report_types_selection.html
@@ -14,7 +14,7 @@ <h1>{% translate "Choose report types" %}</h1>
             {% endblocktranslate %}
         </p>
         {% if not selected_oois %}
-            {% include "partials/return_button.html" with btn_text="Go back" %}
+            {% include "partials/return_button.html" with btn_text="Go back" selected_report_types=None %}
 
         {% else %}
             <h2>
@@ -31,7 +31,7 @@ <h2>
                     You have selected {{ total_oois }} objects in previous step.
                 {% endblocktranslate %}
             </p>
-            {% if not "all" in selected_oois %}
+            {% if not all_oois_selected %}
                 {% include "summary/ooi_selection.html" %}
 
             {% endif %}
@@ -40,28 +40,25 @@ <h2>
                   action="{{ previous }}"
                   class="inline layout-wide">
                 {% csrf_token %}
-                {% include "forms/report_form_fields.html" %}
+                {% include "forms/report_form_fields.html" with selected_report_types=None %}
 
                 <button type="submit" class="button ghost">
                     <span class="icon ti-chevron-left"></span>{% translate "Change selection" %}
                 </button>
             </form>
-            {% if available_report_types_aggregate %}
-                <h2>{% translate "Available report types" %} ({{ count_available_report_types_aggregate }})</h2>
-            {% else %}
-                <h2>{% translate "Available report types" %} ({{ available_report_types|length }})</h2>
-            {% endif %}
+            <h2>{% translate "Available report types" %} ({{ count_available_report_types }})</h2>
             <p>{% translate "All report types that are available for your selection." %}</p>
-            <a class="toggle-all" data-toggle-target="report_type">{% translate "Toggle all report types" %}</a>
+            <a class="toggle-all {% if all_report_types_checked %}toggle-on{% endif %}"
+               data-toggle-target="report_type">{% translate "Toggle all report types" %}</a>
             <form class="inline layout-wide checkboxes_required"
                   method="post"
                   action="{{ next }}">
                 {% csrf_token %}
-                {% include "forms/report_form_fields.html" %}
+                {% include "forms/report_form_fields.html" with disable_report_type_fields=True %}
 
                 <div class="column-4 tiles">
-                    {% if available_report_types_aggregate %}
-                        {% include "partials/report_types_tiles_required_optional.html" with report_types=available_report_types_aggregate %}
+                    {% if "required" in available_report_types %}
+                        {% include "partials/report_types_tiles_required_optional.html" with report_types=available_report_types %}
 
                     {% else %}
                         {% include "partials/report_types_tiles.html" with report_types=available_report_types %}
diff --git a/rocky/reports/templates/report_overview/report_history.html b/rocky/reports/templates/report_overview/report_history.html
index 8a9646c0953..9197031aaf0 100644
--- a/rocky/reports/templates/report_overview/report_history.html
+++ b/rocky/reports/templates/report_overview/report_history.html
@@ -1,14 +1,26 @@
+{% extends "layouts/base.html" %}
+
 {% load i18n %}
+{% load static %}
+
+{% block content %}
+    {% include "header.html" %}
+
+    <main id="main-content" tabindex="-1" class="katalogus">
+        <section>
+            {% include "report_overview/report_overview_header.html" %}
+            {% include "report_overview/report_overview_navigation.html" with active="history" %}
+
+            <div class="horizontal-scroll">
+                <h2>{% translate "Reports history" %}</h2>
+                <p>{% translate "An overview of all your generated reports." %}</p>
+                <p class="de-emphasized">
+                    {% blocktranslate with length=reports|length total=total_oois %}Showing {{ length }} of {{ total }} reports{% endblocktranslate %}
+                </p>
+                {% include "report_overview/report_history_table.html" %}
+                {% include "partials/list_paginator.html" %}
 
-<section>
-    <div class="horizontal-scroll">
-        <h2>{% translate "Reports history" %}</h2>
-        <p>{% translate "An overview of all your generated reports." %}</p>
-        <p class="de-emphasized">
-            {% blocktranslate with length=reports|length total=total_oois %}Showing {{ length }} of {{ total }} reports{% endblocktranslate %}
-        </p>
-        {% include "report_overview/report_history_table.html" %}
-        {% include "partials/list_paginator.html" %}
-
-    </div>
-</section>
+            </div>
+        </section>
+    </main>
+{% endblock content %}
diff --git a/rocky/reports/templates/report_overview/report_overview.html b/rocky/reports/templates/report_overview/report_overview.html
deleted file mode 100644
index 1672cbbba21..00000000000
--- a/rocky/reports/templates/report_overview/report_overview.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "layouts/base.html" %}
-
-{% load i18n %}
-{% load static %}
-
-{% block content %}
-    {% include "header.html" %}
-
-    <main id="main-content" tabindex="-1" class="katalogus">
-        <section>
-            {% include "report_overview/report_overview_header.html" %}
-            {% include "report_overview/report_history.html" %}
-
-        </section>
-    </main>
-{% endblock content %}
diff --git a/rocky/reports/templates/report_overview/report_overview_navigation.html b/rocky/reports/templates/report_overview/report_overview_navigation.html
index c6c1c7dc3e9..d0483e355ab 100644
--- a/rocky/reports/templates/report_overview/report_overview_navigation.html
+++ b/rocky/reports/templates/report_overview/report_overview_navigation.html
@@ -3,17 +3,8 @@
 <div>
     <nav class="tabs" aria-label="{% translate "Plugins Navigation" %}">
         <ul>
-            <li {% if active == "recent" %}aria-current="page"{% endif %}>
-                <a href="">{% translate "Recent" %}</a>
-            </li>
-            <li {% if active == "presets" %}aria-current="page"{% endif %}>
-                <a href="">{% translate "Presets" %}</a>
-            </li>
             <li {% if active == "scheduled" %}aria-current="page"{% endif %}>
-                <a href="">{% translate "Scheduled" %}</a>
-            </li>
-            <li {% if active == "folders" %}aria-current="page"{% endif %}>
-                <a href="">{% translate "Folders" %}</a>
+                <a href="{% url 'scheduled_reports' organization.code %}">{% translate "Scheduled" %}</a>
             </li>
             <li {% if active == "history" %}aria-current="page"{% endif %}>
                 <a href="{% url 'report_history' organization.code %}">{% translate "History" %}</a>
diff --git a/rocky/reports/templates/report_overview/scheduled_reports.html b/rocky/reports/templates/report_overview/scheduled_reports.html
new file mode 100644
index 00000000000..6c155500c12
--- /dev/null
+++ b/rocky/reports/templates/report_overview/scheduled_reports.html
@@ -0,0 +1,26 @@
+{% extends "layouts/base.html" %}
+
+{% load i18n %}
+{% load static %}
+
+{% block content %}
+    {% include "header.html" %}
+
+    <main id="main-content" tabindex="-1" class="katalogus">
+        <section>
+            {% include "report_overview/report_overview_header.html" %}
+            {% include "report_overview/report_overview_navigation.html" with active="scheduled" %}
+
+            <div class="horizontal-scroll">
+                <h2>{% translate "Scheduled reports" %}</h2>
+                <p>{% translate "View your scheduled reports." %}</p>
+                <p class="de-emphasized">
+                    {% blocktranslate with length=scheduled_reports|length total=total_oois %}Showing {{ length }} scheduled reports{% endblocktranslate %}
+                </p>
+                {% include "report_overview/scheduled_reports_table.html" %}
+                {% include "partials/list_paginator.html" %}
+
+            </div>
+        </section>
+    </main>
+{% endblock content %}
diff --git a/rocky/reports/templates/report_overview/scheduled_reports_table.html b/rocky/reports/templates/report_overview/scheduled_reports_table.html
new file mode 100644
index 00000000000..f5580f12c2c
--- /dev/null
+++ b/rocky/reports/templates/report_overview/scheduled_reports_table.html
@@ -0,0 +1,89 @@
+{% load i18n %}
+{% load ooi_extra %}
+{% load report_extra %}
+
+<div class="horizontal-scroll">
+    <table>
+        <caption class="visually-hidden">{% translate "Scheduled reports:" %}</caption>
+        <thead>
+            <tr>
+                <th scope="col">{% translate "Report Name" %}</th>
+                <th scope="col">{% translate "Subreport Name" %}</th>
+                <th scope="col">{% translate "Report types" %}</th>
+                <th scope="col">{% translate "Scheduled for" %}</th>
+                <th scope="col">{% translate "Recurrence" %}</th>
+                <th scope="col"></th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for schedule in scheduled_reports %}
+                {% if schedule.recipe %}
+                    <tr>
+                        <td class="nowrap">{{ schedule.recipe.report_name_format }}</td>
+                        <td class="nowrap">{{ schedule.recipe.subreport_name_format }}</td>
+                        <td>
+                            {% for report_type in schedule.recipe.report_types %}
+                                {% if forloop.counter0 < 2 %}
+                                    <span class="label tags-color-{{ report_type|get_report_type_label_style }}">{{ report_type|get_report_type_name }}</span>
+                                {% endif %}
+                                {% if forloop.counter0 == 2 %}
+                                    <span class="label tags-color-grey-2">+ {{ schedule.recipe.report_types|length|add:"-2" }}</span>
+                                {% endif %}
+                            {% endfor %}
+                        </td>
+                        <td class="nowrap">{{ schedule.deadline_at }}</td>
+                        <td class="nowrap">{{ schedule.cron }}</td>
+                        {% if schedule.reports %}
+                            <td class="actions">
+                                <button class="expando-button"
+                                        data-icon-open-class="icon ti-chevron-down"
+                                        data-icon-close-class="icon ti-chevron-up"
+                                        data-close-label="{% translate "Close details" %}">
+                                    {% translate "Open details" %}
+                                </button>
+                            </td>
+                        {% else %}
+                            <td></td>
+                        {% endif %}
+                    </tr>
+                    {% if schedule.reports %}
+                        <tr class="expando-row">
+                            <td colspan="6">
+                                <table>
+                                    <caption class="visually-hidden">{% translate "Scheduled Reports:" %}</caption>
+                                    <thead>
+                                        <tr>
+                                            <th scope="col">{% translate "Name" %}</th>
+                                            <th scope="col">{% translate "Report type" %}</th>
+                                            <th scope="col">{% translate "Input Object" %}</th>
+                                            <th scope="col">{% translate "Reference date" %}</th>
+                                            <th scope="col">{% translate "Creation date" %}</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {% for report in schedule.reports %}
+                                            <tr>
+                                                <td>
+                                                    <a href="{% url "view_report" organization.code %}?report_id={{ report.reference }}&observed_at={{ report.observed_at|date:"Y-m-d H:i:s:u" }}"
+                                                       title="{% translate "Show report details" %}">{{ report.name }}</a>
+                                                </td>
+                                                <td>
+                                                    <span class="label tags-color-{{ report.report_type|get_report_type_label_style }}">{{ report.report_type|get_report_type_name }}</span>
+                                                </td>
+                                                <td>
+                                                    {% for ooi in report.input_oois %}<span>{{ ooi|human_readable }}</span>{% endfor %}
+                                                </td>
+                                                <td class="nowrap">{{ report.observed_at|date }}</td>
+                                                <td class="nowrap">{{ report.date_generated }}</td>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                    {% endif %}
+                {% endif %}
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
diff --git a/rocky/reports/templates/summary/report_asset_overview.html b/rocky/reports/templates/summary/report_asset_overview.html
index be7e8ccb0dd..320ae707057 100644
--- a/rocky/reports/templates/summary/report_asset_overview.html
+++ b/rocky/reports/templates/summary/report_asset_overview.html
@@ -13,7 +13,7 @@ <h3>{% translate "Selected objects" %} ({{ total_oois }})</h3>
         </p>
         {% include "summary/ooi_selection.html" %}
 
-        <h3>{% translate "Selected Report Types" %}</h3>
+        <h3>{% translate "Selected Report Types" %} ({{ report_types|length }})</h3>
         <p>
             {% blocktranslate trimmed %}
                 The table below shows which reports were chosen to generate this report,
@@ -39,6 +39,7 @@ <h3>{% translate "Selected Report Types" %}</h3>
                 {% endfor %}
             </tbody>
         </table>
+        {{ data }}
         {% include "summary/selected_plugins.html" %}
 
     </div>
diff --git a/rocky/reports/templates/summary/selected_plugins.html b/rocky/reports/templates/summary/selected_plugins.html
index f4563ca14ab..4e1f29065f0 100644
--- a/rocky/reports/templates/summary/selected_plugins.html
+++ b/rocky/reports/templates/summary/selected_plugins.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<h3>{% translate "Selected Plugins" %}</h3>
+<h3>{% translate "Plugins" %} ({{ data.plugins|length }})</h3>
 {% if data.plugins %}
     <p>
         {% blocktranslate trimmed %}
diff --git a/rocky/reports/urls.py b/rocky/reports/urls.py
index c2a3ffb1551..cf54d18d61f 100644
--- a/rocky/reports/urls.py
+++ b/rocky/reports/urls.py
@@ -26,11 +26,12 @@
     ReportTypesSelectionMultiReportView,
     SetupScanMultiReportView,
 )
-from reports.views.report_overview import ReportHistoryView, SubreportView
+from reports.views.report_overview import ReportHistoryView, ScheduledReportsView, SubreportView
 
 # Report overview urls
 urlpatterns = [
     path("", ReportsLandingView.as_view(), name="reports"),
+    path("scheduled-reports/", ScheduledReportsView.as_view(), name="scheduled_reports"),
     path("report-history/", ReportHistoryView.as_view(), name="report_history"),
     path("report-history/subreports", SubreportView.as_view(), name="subreports"),
 ]
@@ -39,6 +40,7 @@
 urlpatterns += [
     path("view", ViewReportView.as_view(), name="view_report"),
     path("view/pdf/", ViewReportPDFView.as_view(), name="view_report_pdf"),
+    path("view/json/", ViewReportView.as_view(), name="view_report_json"),
 ]
 
 # Generate report urls
diff --git a/rocky/reports/views/aggregate_report.py b/rocky/reports/views/aggregate_report.py
index 51d0f9da8b7..10c417ef08c 100644
--- a/rocky/reports/views/aggregate_report.py
+++ b/rocky/reports/views/aggregate_report.py
@@ -1,28 +1,24 @@
-from datetime import datetime, timezone
 from typing import Any
 
-from django.contrib import messages
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect
 from django.urls import reverse
-from django.utils.http import urlencode
 from django.utils.translation import gettext_lazy as _
-from tools.view_helpers import PostRedirect
 
 from reports.report_types.aggregate_organisation_report.report import AggregateOrganisationReport
-from reports.report_types.definitions import AggregateReport, MultiReport, Report
-from reports.report_types.helpers import get_ooi_types_from_aggregate_report, get_report_types_from_aggregate_report
+from reports.report_types.helpers import get_ooi_types_from_aggregate_report
 from reports.views.base import (
     REPORTS_PRE_SELECTION,
     OOISelectionView,
     ReportBreadcrumbs,
+    ReportFinalSettingsView,
     ReportPluginView,
     ReportTypeSelectionView,
+    SaveReportView,
     get_selection,
 )
 from reports.views.mixins import SaveAggregateReportMixin
 from reports.views.view_helpers import AggregateReportStepsMixin
-from rocky.views.ooi_view import BaseOOIListView
 
 
 class BreadcrumbsAggregateReportView(ReportBreadcrumbs):
@@ -71,9 +67,7 @@ def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
         )
 
 
-class OOISelectionAggregateReportView(
-    AggregateReportStepsMixin, BreadcrumbsAggregateReportView, BaseOOIListView, OOISelectionView
-):
+class OOISelectionAggregateReportView(AggregateReportStepsMixin, BreadcrumbsAggregateReportView, OOISelectionView):
     """
     Select Objects for the 'Aggregate Report' flow.
     """
@@ -83,11 +77,6 @@ class OOISelectionAggregateReportView(
     current_step = 1
     ooi_types = get_ooi_types_from_aggregate_report(AggregateOrganisationReport)
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
-            messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
-        return self.get(request, *args, **kwargs)
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["channel"] = "aggregate_report"
@@ -95,10 +84,7 @@ def get_context_data(self, **kwargs):
 
 
 class ReportTypesSelectionAggregateReportView(
-    AggregateReportStepsMixin,
-    BreadcrumbsAggregateReportView,
-    OOISelectionView,
-    ReportTypeSelectionView,
+    AggregateReportStepsMixin, BreadcrumbsAggregateReportView, ReportTypeSelectionView
 ):
     """
     Shows all possible report types from a list of Objects.
@@ -108,36 +94,8 @@ class ReportTypesSelectionAggregateReportView(
     template_name = "aggregate_report/select_report_types.html"
     breadcrumbs_step = 4
     current_step = 2
-    ooi_types = get_ooi_types_from_aggregate_report(AggregateOrganisationReport)
-
-    def setup(self, request, *args, **kwargs):
-        super().setup(request, *args, **kwargs)
-        self.available_report_types = self.get_report_types_for_aggregate_report(
-            get_report_types_from_aggregate_report(AggregateOrganisationReport)
-        )
-
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
-            messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-        return self.get(request, *args, **kwargs)
-
-    def get_report_types_for_aggregate_report(
-        self, reports_dict: dict[str, set[type[Report]]]
-    ) -> dict[str, list[dict[str, str]]]:
-        report_types = {}
-        for option, reports in reports_dict.items():
-            report_types[option] = self.get_report_types(reports)
-        return report_types
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["available_report_types_aggregate"] = self.available_report_types
-        context["count_available_report_types_aggregate"] = len(self.available_report_types["required"]) + len(
-            self.available_report_types["optional"]
-        )
-        context["total_oois"] = self.get_total_objects()
-        return context
+    report_type = AggregateOrganisationReport
+    ooi_types = get_ooi_types_from_aggregate_report(report_type)
 
 
 class SetupScanAggregateReportView(
@@ -151,22 +109,10 @@ class SetupScanAggregateReportView(
     breadcrumbs_step = 5
     current_step = 3
 
-    def post(self, request, *args, **kwargs):
-        # If the user wants to change selection, but all plugins are enabled, it needs to go even further back
-        if not self.selected_report_types:
-            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-
-        if "return" in self.request.POST and self.plugins_enabled():
-            return PostRedirect(self.get_previous())
 
-        if self.plugins_enabled():
-            return PostRedirect(self.get_next())
-
-        return self.get(request, *args, **kwargs)
-
-
-class ExportSetupAggregateReportView(AggregateReportStepsMixin, BreadcrumbsAggregateReportView, ReportPluginView):
+class ExportSetupAggregateReportView(
+    AggregateReportStepsMixin, BreadcrumbsAggregateReportView, ReportFinalSettingsView
+):
     """
     Shows the export setup page where users can set their export preferences.
     """
@@ -174,41 +120,14 @@ class ExportSetupAggregateReportView(AggregateReportStepsMixin, BreadcrumbsAggre
     template_name = "aggregate_report/export_setup.html"
     breadcrumbs_step = 6
     current_step = 4
+    report_type = AggregateOrganisationReport
 
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if not self.selected_report_types:
-            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-        return super().get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["current_datetime"] = datetime.now(timezone.utc)
-        context["reports"] = [_("Aggregate Report")]
-        return context
 
-
-class SaveAggregateReportView(SaveAggregateReportMixin, BreadcrumbsAggregateReportView, ReportPluginView):
+class SaveAggregateReportView(SaveAggregateReportMixin, BreadcrumbsAggregateReportView, SaveReportView):
     """
     Save the report and redirect to the saved report
     """
 
     template_name = "aggregate_report.html"
     breadcrumbs_step = 6
-    current_step = 6
-    ooi_types = get_ooi_types_from_aggregate_report(AggregateOrganisationReport)
-    report_types: list[type[Report] | type[MultiReport] | type[AggregateReport]]
-
-    def post(self, request, *args, **kwargs):
-        old_report_names = request.POST.getlist("old_report_name")
-        new_report_names = request.POST.getlist("report_name")
-        reference_dates = request.POST.getlist("reference_date")
-
-        report_names = list(zip(old_report_names, self.finalise_report_names(new_report_names, reference_dates)))
-        report_ooi = self.save_report(report_names)
-
-        return redirect(
-            reverse("view_report", kwargs={"organization_code": self.organization.code})
-            + "?"
-            + urlencode({"report_id": report_ooi.reference})
-        )
+    current_step = 5
diff --git a/rocky/reports/views/base.py b/rocky/reports/views/base.py
index f84e12c15c0..272540cdf9b 100644
--- a/rocky/reports/views/base.py
+++ b/rocky/reports/views/base.py
@@ -1,6 +1,5 @@
-import json
 from collections import defaultdict
-from collections.abc import Iterable, Sequence
+from collections.abc import Sequence
 from datetime import datetime, timezone
 from operator import attrgetter
 from typing import Any, Literal, cast
@@ -18,20 +17,29 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
 from django_weasyprint import WeasyTemplateResponseMixin
-from katalogus.client import Boefje, KATalogusError, Plugin, get_katalogus
+from katalogus.client import Boefje, KATalogusClientV1, KATalogusError, Plugin, get_katalogus
 from pydantic import RootModel, TypeAdapter
 from tools.ooi_helpers import create_ooi
-from tools.view_helpers import BreadcrumbsMixin, url_with_querystring
+from tools.view_helpers import BreadcrumbsMixin, PostRedirect, url_with_querystring
 
 from octopoes.models import OOI, Reference
 from octopoes.models.ooi.reports import Report as ReportOOI
+from octopoes.models.ooi.reports import ReportRecipe
 from reports.forms import OOITypeMultiCheckboxForReportForm
+from reports.report_types.aggregate_organisation_report.report import AggregateOrganisationReport
 from reports.report_types.concatenated_report.report import ConcatenatedReport
-from reports.report_types.definitions import AggregateReport, BaseReportType, MultiReport, Report
-from reports.report_types.helpers import REPORTS, get_plugins_for_report_ids, get_report_by_id
+from reports.report_types.definitions import AggregateReport, BaseReport, Report, report_plugins_union
+from reports.report_types.helpers import (
+    REPORTS,
+    get_report_by_id,
+    get_report_types_for_oois,
+    get_report_types_from_aggregate_report,
+)
+from reports.report_types.multi_organization_report.report import MultiOrganizationReport
 from reports.utils import JSONEncoder, debug_json_keys
 from rocky.views.mixins import ObservedAtMixin, OOIList
-from rocky.views.ooi_view import OOIFilterView
+from rocky.views.ooi_view import BaseOOIListView, OOIFilterView
+from rocky.views.scheduler import SchedulerView
 
 REPORTS_PRE_SELECTION = {
     "clearance_level": ["2", "3", "4"],
@@ -48,6 +56,17 @@ def get_selection(request: HttpRequest, pre_selection: dict[str, str | Sequence[
 logger = structlog.get_logger(__name__)
 
 
+class ReportDataDict(RootModel):
+    root: Any
+
+    class Config:
+        arbitrary_types_allowed = True
+
+
+def recursive_dict():
+    return defaultdict(recursive_dict)
+
+
 class ReportBreadcrumbs(OrganizationView, BreadcrumbsMixin):
     breadcrumbs_step: int = 1
 
@@ -100,38 +119,69 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class OOISelectionView(OOIFilterView):
+class ReportsLandingView(ReportBreadcrumbs, TemplateView):
     """
-    Shows a list of OOIs to select from and handles OOIs selection requests.
+    Landing page for Reports.
+    """
+
+    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        return redirect(reverse("report_history", kwargs=self.get_kwargs()))
+
+
+def hydrate_plugins(report_types: list[type["BaseReport"]], katalogus: KATalogusClientV1) -> dict[str, list[Plugin]]:
+    merged_plugins = report_plugins_union(report_types)
+
+    return {
+        "required": sorted(katalogus.get_plugins(ids=list(merged_plugins["required"])), key=attrgetter("name")),
+        "optional": sorted(katalogus.get_plugins(ids=list(merged_plugins["optional"])), key=attrgetter("name")),
+    }
+
+
+def format_plugin_data(report_type_plugins: dict[str, list[Plugin]]):
+    return [
+        {
+            "required": required_optional == "required",
+            "enabled": plugin.enabled,
+            "name": plugin.name,
+            "scan_level": plugin.scan_level.value if isinstance(plugin, Boefje) else 0,
+            "type": plugin.type,
+            "description": plugin.description,
+        }
+        for required_optional, plugins in report_type_plugins.items()
+        for plugin in plugins
+    ]
+
+
+class BaseReportView(OOIFilterView):
+    """
+    This view is the base for the report creation wizard.
+    All the necessary functions and variables needed.
     """
 
     NONE_OOI_SELECTION_MESSAGE = _("Select at least one OOI to proceed.")
+    NONE_REPORT_TYPE_SELECTION_MESSAGE = _("Select at least one report type to proceed.")
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
-        self.selected_oois: list[str] = self.get_ooi_selection()
-        self.oois: list[OOI] = self.get_oois()
-        self.oois_pk: list[str] = self.get_oois_pk()
+        self.selected_oois = self.get_ooi_pks()
+        self.selected_report_types = self.get_report_type_ids()
 
     def get_ooi_selection(self) -> list[str]:
-        selected_oois = self.request.GET.getlist("ooi", [])
-        if "all" in selected_oois:
-            return selected_oois
         return sorted(set(self.request.POST.getlist("ooi", [])))
 
-    def get_total_objects(self) -> int:
-        if "all" in self.selected_oois:
-            return len(self.oois_pk)
-        return len(self.selected_oois)
+    def all_oois_selected(self) -> bool:
+        return "all" in self.request.GET.getlist("ooi", [])
+
+    def get_ooi_pks(self) -> list[str]:
+        if self.all_oois_selected():
+            return sorted([ooi.primary_key for ooi in self.get_oois()])
+        return self.get_ooi_selection()
 
-    def get_oois_pk(self) -> list[str]:
-        oois_pk = self.selected_oois
-        if "all" in self.selected_oois:
-            oois_pk = [ooi.primary_key for ooi in self.oois]
-        return oois_pk
+    def get_total_oois(self):
+        return len(self.selected_oois)
 
     def get_oois(self) -> list[OOI]:
-        if "all" in self.selected_oois:
+        if self.all_oois_selected():
             return self.octopoes_api_connector.list_objects(
                 self.get_ooi_types(),
                 valid_time=self.observed_at,
@@ -140,58 +190,108 @@ def get_oois(self) -> list[OOI]:
                 scan_profile_type=self.get_ooi_profile_types(),
             ).items
 
-        return [self.get_single_ooi(pk=ooi_pk) for ooi_pk in self.selected_oois]
+        return [self.get_single_ooi(pk=ooi_pk) for ooi_pk in self.get_ooi_selection()]
 
-    def get_ooi_filter_forms(self, ooi_types: Iterable[type[OOI]]) -> dict[str, Form]:
+    def get_ooi_filter_forms(self) -> dict[str, Form]:
         return {
             "ooi_type_form": OOITypeMultiCheckboxForReportForm(
-                sorted([ooi_class.get_ooi_type() for ooi_class in ooi_types]),
+                sorted([ooi_class.get_ooi_type() for ooi_class in self.ooi_types]),
                 self.request.GET,
             )
         }
 
+    def get_report_type_ids(self) -> list[str]:
+        return sorted(set(self.request.POST.getlist("report_type", [])))
+
+    def get_report_types(self) -> list[type[BaseReport]]:
+        return [get_report_by_id(report_type_id) for report_type_id in self.selected_report_types]
+
+    def get_plugin_data_for_saving(self) -> list[dict]:
+        try:
+            report_type_plugins = hydrate_plugins(self.get_report_types(), get_katalogus(self.organization.code))
+        except KATalogusError as error:
+            return messages.error(self.request, error.message)
+
+        return format_plugin_data(report_type_plugins)
+
+    def get_observed_at(self):
+        return self.observed_at if self.observed_at < datetime.now(timezone.utc) else datetime.now(timezone.utc)
+
+    def show_report_names(self) -> bool:
+        recurrence_choice = self.request.POST.get("choose_recurrence", "once")
+        return recurrence_choice == "once"
+
+    def is_scheduled_report(self) -> bool:
+        recurrence_choice = self.request.POST.get("choose_recurrence", "")
+        return recurrence_choice == "repeat"
+
+    def create_report_recipe(self, report_name_format: str, subreport_name_format: str, schedule: str) -> ReportRecipe:
+        report_recipe = ReportRecipe(
+            recipe_id=uuid4(),
+            report_name_format=report_name_format,
+            subreport_name_format=subreport_name_format,
+            input_recipe={"input_oois": self.get_ooi_pks()},
+            report_types=self.get_report_type_ids(),
+            cron_expression=schedule,
+        )
+        create_ooi(
+            api_connector=self.octopoes_api_connector,
+            bytes_client=self.bytes_client,
+            ooi=report_recipe,
+            observed_at=datetime.now(timezone.utc),
+        )
+        return report_recipe
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+
+        context["all_oois_selected"] = self.all_oois_selected()
         context["selected_oois"] = self.selected_oois
-        context["oois_pk"] = self.oois_pk
-        context["oois"] = self.oois
-        context.update(self.get_ooi_filter_forms(self.ooi_types))
+        context["selected_report_types"] = self.selected_report_types
+
         return context
 
 
-class ReportTypeSelectionView(TemplateView):
+class OOISelectionView(BaseReportView, BaseOOIListView):
+    """
+    Shows a list of OOIs to select from and handles OOIs selection requests.
+    """
+
+    def post(self, request, *args, **kwargs):
+        if not (self.get_ooi_selection() or self.all_oois_selected()):
+            messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
+        return self.get(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context.update(self.get_ooi_filter_forms())
+        return context
+
+
+class ReportTypeSelectionView(BaseReportView, ReportBreadcrumbs, TemplateView):
     """
     Shows report types and handles selections and requests.
     """
 
-    NONE_REPORT_TYPE_SELECTION_MESSAGE = _("Select at least one report type to proceed.")
+    report_type: type[BaseReport] | None = None  # Get report types from a specific report type ex. AggregateReport
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
-        self.selected_report_types = self.get_report_type_selection()
-        self.report_types: list[type[Report] | type[MultiReport] | type[AggregateReport]] = (
-            self.get_report_types_from_choice()
-        )
-        self.report_type_ids = [report_type for report_type in self.selected_report_types]
-
-    def get_report_type_selection(self) -> list[str]:
-        return sorted(set(self.request.POST.getlist("report_type", [])))
+        self.available_report_types, self.counted_report_types = self.get_available_report_types()
 
-    def get_report_types_from_choice(
-        self,
-    ) -> list[type[Report] | type[MultiReport] | type[AggregateReport]]:
-        report_types = []
-        for report_type in self.selected_report_types:
-            try:
-                report = get_report_by_id(report_type)
-                report_types.append(report)
-            except ValueError:
-                error_message = _("Report type '%s' does not exist.") % report_type
-                messages.error(self.request, error_message)
-        return report_types
+    def post(self, request, *args, **kwargs):
+        if not (self.get_ooi_selection() or self.all_oois_selected()):
+            return PostRedirect(self.get_previous())
+        return self.get(request, *args, **kwargs)
 
     @staticmethod
-    def get_report_types(reports: set[type[BaseReportType]]) -> list[dict[str, str]]:
+    def get_report_types_from_ooi_selelection(
+        report_types: set[type[BaseReport]] | set[type[Report]] | set[type[MultiOrganizationReport]],
+    ) -> list[dict[str, str]]:
+        """
+        The report types are fetched from which ooi is selected. Shows all report types for the oois.
+        """
+
         return [
             {
                 "id": report_type.id,
@@ -199,93 +299,103 @@ def get_report_types(reports: set[type[BaseReportType]]) -> list[dict[str, str]]
                 "description": report_type.description,
                 "label_style": report_type.label_style,
             }
-            for report_type in reports
+            for report_type in report_types
         ]
 
+    def get_report_types_for_generate_report(self):
+        return self.get_report_types_from_ooi_selelection(get_report_types_for_oois(self.selected_oois))
+
+    def get_report_types_for_aggregate_report(self) -> dict[str, list[dict[str, str]]]:
+        reports_dict = get_report_types_from_aggregate_report(AggregateOrganisationReport)
+        report_types: dict[str, list[dict[str, str]]] = {}
+
+        for option, reports in reports_dict.items():
+            report_types[option] = self.get_report_types_from_ooi_selelection(reports)
+        return report_types
+
+    def get_available_report_types(
+        self,
+    ) -> tuple[list[dict[str, str]] | dict[str, list[dict[str, str]]], int]:
+        report_types: list[dict[str, str]] | dict[str, list[dict[str, str]]] = {}
+        if self.report_type is not None:
+            if self.report_type == AggregateOrganisationReport:
+                report_types = self.get_report_types_for_aggregate_report()
+                return report_types, len(
+                    [report_type for report_type_list in report_types.values() for report_type in report_type_list]
+                )
+
+            elif self.report_type == MultiOrganizationReport:
+                report_types = self.get_report_types_from_ooi_selelection({MultiOrganizationReport})
+                return report_types, len(report_types)
+
+        report_types = self.get_report_types_for_generate_report()
+        return report_types, len(report_types)
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["selected_report_types"] = self.selected_report_types
+        context["oois"] = self.get_oois()  # show listed oois in report type view.
+        context["total_oois"] = self.get_total_oois()  # adds counter to the heading
+
+        context["available_report_types"] = self.available_report_types  # shows tiles of report types
+
+        context["count_available_report_types"] = self.counted_report_types  # counter next to heading
+        # especially for the CSS selector to set toggle on.
+        context["all_report_types_checked"] = len(self.get_report_type_ids()) == self.counted_report_types
+
         return context
 
 
-class ReportPluginView(OOISelectionView, ReportTypeSelectionView):
+class ReportPluginView(BaseReportView, ReportBreadcrumbs, TemplateView):
     """
-    This view shows the required and optional plugins.
-    Needs ReportTypeView to know which report type is selected to get their plugins.
-    The plugin ids will be collected and fetched form KAT-alogus.
-    The user is able to activate plugins they need for the scans.
-    The oois selection is also remembered by ReportOOIView.
+    This view shows the required and optional plugins together with the summary per report type.
     """
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
+        self.plugins = None
+
         try:
-            self.plugins, self.all_plugins_enabled = self.get_all_plugins()
+            self.plugins = hydrate_plugins(self.get_report_types(), get_katalogus(self.organization.code))
         except KATalogusError as error:
             messages.error(self.request, error.message)
-            self.plugins = {}
-            self.all_plugins_enabled = {}
 
-    def report_has_required_plugins(self) -> bool:
-        if self.plugins:
-            required_plugins = self.plugins["required"]
-            return required_plugins != [] or required_plugins is not None
-        return False
+    def post(self, request, *args, **kwargs):
+        if self.plugins is None:
+            return PostRedirect(self.get_previous())
 
-    def plugins_enabled(self) -> bool:
-        if self.all_plugins_enabled:
-            return self.all_plugins_enabled["required"] and self.all_plugins_enabled["optional"]
-        return False
-
-    def get_plugin_data_for_saving(self) -> list[dict]:
-        plugin_data = []
-
-        for required_optional, plugins in self.plugins.items():
-            for plugin in plugins:
-                plugin_data.append(
-                    {
-                        "required": required_optional == "required",
-                        "enabled": plugin.enabled,
-                        "name": plugin.name,
-                        "scan_level": plugin.scan_level.value if isinstance(plugin, Boefje) else 0,
-                        "type": plugin.type,
-                        "description": plugin.description,
-                    }
-                )
+        all_plugins_enabled = self.all_plugins_enabled()
 
-        return plugin_data
+        if not self.get_report_type_ids():
+            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
+            return PostRedirect(self.get_previous())
 
-    def get_all_plugins(self) -> tuple[dict[str, list[Plugin]], dict[str, bool]]:
-        return self.get_required_optional_plugins(get_plugins_for_report_ids(self.report_type_ids))
+        if "return" in self.request.POST and all_plugins_enabled:
+            return PostRedirect(self.get_previous())
 
-    def get_required_optional_plugins(
-        self, plugin_ids_dict: dict[str, set[str]]
-    ) -> tuple[dict[str, list[Plugin]], dict[str, bool]]:
-        required_optional_plugins: dict[str, list[Plugin]] = {}
-        plugins_enabled: dict[str, bool] = {}
+        if all_plugins_enabled:
+            return PostRedirect(self.get_next())
+        return self.get(request, *args, **kwargs)
 
-        for required_optional, plugin_ids in plugin_ids_dict.items():
-            plugins: list[Plugin] = (
-                get_katalogus(self.organization.code).get_plugins(ids=list(plugin_ids)) if plugin_ids else []
-            )
+    def all_plugins_enabled(self) -> bool:
+        return all(self.plugins_enabled().values())
 
-            sorted_plugins = sorted(plugins, key=attrgetter("name"))
-            are_plugins_enabled: list[bool] = []
-            for plugin in sorted_plugins:
-                are_plugins_enabled.append(plugin.enabled)
-            required_optional_plugins[required_optional] = plugins
-            plugins_enabled[required_optional] = all(are_plugins_enabled)
+    def plugins_enabled(self) -> dict[str, bool]:
+        if self.plugins is not None:
+            return {
+                "required": all([plugin.enabled for plugin in self.plugins["required"]]),
+                "optional": all([plugin.enabled for plugin in self.plugins["optional"]]),
+            }
 
-        return required_optional_plugins, plugins_enabled
+        return {"required": False, "optional": False}
 
-    def get_plugin_data(self):
+    def get_plugins_data(self):
         report_types: dict[str, Any] = {}
         plugin_report_types: dict[str, list] = {}
         total_enabled_plugins = {"required": 0, "optional": 0}
         total_available_plugins = {"required": 0, "optional": 0}
 
-        if self.plugins:
-            for report_type in self.report_types:
+        if self.plugins is not None:
+            for report_type in self.get_report_types():
                 for plugin_type in ["required", "optional"]:
                     # Mypy doesn't infer this automatically https://github.com/python/mypy/issues/9168
                     plugin_type = cast(Literal["required", "optional"], plugin_type)
@@ -320,109 +430,146 @@ def get_plugin_data(self):
                     report_types[report_type.name][f"number_of_enabled_{plugin_type}"] = number_of_enabled
                     report_types[report_type.name][f"number_of_available_{plugin_type}"] = len(report_plugins)
 
-        plugin_data = {
-            "total_enabled_plugins": total_enabled_plugins,
-            "total_available_plugins": total_available_plugins,
-            "report_types": report_types,
-            "plugin_report_types": plugin_report_types,
-        }
+            plugin_data = {
+                "total_enabled_plugins": total_enabled_plugins,
+                "total_available_plugins": total_available_plugins,
+                "report_types": report_types,
+                "plugin_report_types": plugin_report_types,
+            }
 
-        return plugin_data
+            return plugin_data
 
-    @staticmethod
-    def finalise_report_names(report_names: list[str], reference_dates: list[str]) -> list[str]:
-        final_report_names = []
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["enabled_plugins"] = self.all_plugins_enabled()
+        context["plugin_data"] = self.get_plugins_data()
+        context["plugins"] = self.plugins
+        return context
 
-        if len(report_names) == len(reference_dates):
-            for index, report_name in enumerate(report_names):
-                date_format = ""
-                if reference_dates[index] and reference_dates[index] != "":
-                    date_format = " - "
-                    if reference_dates[index] == "week":
-                        date_format += _("Week %W, %Y")
-                    else:
-                        date_format += reference_dates[index]
-                final_report_name = f"{report_name} {date_format}".strip()
-                final_report_names.append(final_report_name)
-        if not final_report_names:
-            return report_names
-        return final_report_names
 
-    def save_report_raw(self, data: dict) -> str:
-        report_data_raw_id = self.bytes_client.upload_raw(
-            raw=ReportDataDict(data).model_dump_json().encode(),
-            manual_mime_types={"openkat/report"},
-        )
+class ReportFinalSettingsView(BaseReportView, ReportBreadcrumbs, SchedulerView, TemplateView):
+    report_type: type[BaseReport] | None = None
+    task_type = "report"
+    is_a_scheduled_report = False
+    show_listes_report_names = False
 
-        return report_data_raw_id
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        if not self.get_report_type_ids():
+            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
+            return PostRedirect(self.get_previous())
 
-    def save_report_ooi(
-        self,
-        report_data_raw_id: str,
-        report_type: type[Report] | type[MultiReport] | type[AggregateReport],
-        input_oois: list[str],
-        parent: Reference | None,
-        has_parent: bool,
-        observed_at: datetime,
-        name: str,
-    ) -> ReportOOI:
-        if not name or name.isspace():
-            name = report_type.name
-        report_ooi = ReportOOI(
-            name=str(name),
-            report_type=str(report_type.id),
-            template=report_type.template_path,
-            report_id=uuid4(),
-            organization_code=self.organization.code,
-            organization_name=self.organization.name,
-            organization_tags=list(self.organization.tags.all()),
-            data_raw_id=report_data_raw_id,
-            date_generated=datetime.now(timezone.utc),
-            input_oois=input_oois,
-            observed_at=observed_at,
-            parent_report=parent,
-            has_parent=has_parent,
-        )
+        self.is_a_scheduled_report = self.is_scheduled_report()
+        self.show_listes_report_names = self.show_report_names()
 
-        create_ooi(
-            api_connector=self.octopoes_api_connector,
-            bytes_client=self.bytes_client,
-            ooi=report_ooi,
-            observed_at=observed_at,
-        )
+        return super().get(request, *args, **kwargs)
 
-        return report_ooi
+    @staticmethod
+    def create_report_names(oois: list[OOI], report_types: list[type[BaseReport]]) -> dict[str, str]:
+        reports = {}
+        oois_count = len(oois)
+        report_types_count = len(report_types)
+        ooi = oois[0].human_readable
+        report_type = report_types[0].name
+
+        # Create name for parent report
+        if not (report_types_count == 1 and oois_count == 1):
+            if report_types_count > 1 and oois_count > 1:
+                name = _("Concatenated Report for {oois_count} objects").format(
+                    report_type=report_type, oois_count=oois_count
+                )
+            elif report_types_count > 1 and oois_count == 1:
+                name = _("Concatenated Report for {ooi}").format(ooi=ooi)
+            elif report_types_count == 1 and oois_count > 1:
+                name = _("{report_type} for {oois_count} objects").format(
+                    report_type=report_type, oois_count=oois_count
+                )
+            reports[name] = ""
 
-    def get_observed_at(self):
-        return self.observed_at if self.observed_at < datetime.now(timezone.utc) else datetime.now(timezone.utc)
+        # Create name for subreports or single reports
+        for ooi in oois:
+            for report_type_ in report_types:
+                name = _("{report_type} for {ooi}").format(report_type=report_type_.name, ooi=ooi.human_readable)
+                reports[name] = ""
+
+        return reports
+
+    def get_report_names(self) -> dict[str, str] | list[str]:
+        if self.report_type is not None and self.report_type == AggregateOrganisationReport:
+            return [_("Aggregate Report")]
+        if self.report_type is not None and self.report_type == MultiOrganizationReport:
+            return [_("Multi Report")]
+
+        return self.create_report_names(self.get_oois(), self.get_report_types())
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        context["reports"] = self.get_report_names()
+
+        context["report_schedule_form_recurrence_choice"] = self.get_report_schedule_form_recurrence_choice()
+        context["report_schedule_form_recurrence"] = self.get_report_schedule_form_recurrence()
+
+        context["report_parent_name_form"] = self.get_report_parent_name_form()
+        context["report_child_name_form"] = self.get_report_child_name_form()
+
+        context["show_listed_report_names"] = self.show_listes_report_names
+        context["is_scheduled_report"] = self.is_a_scheduled_report
+
         context["created_at"] = datetime.now()
-        context["plugins"] = self.plugins
-        context["all_plugins_enabled"] = self.all_plugins_enabled
-        context["plugin_data"] = self.get_plugin_data()
         return context
 
 
-class ReportsLandingView(ReportBreadcrumbs, TemplateView):
-    """
-    Landing page for Reports.
-    """
+class SaveReportView(BaseReportView, ReportBreadcrumbs, SchedulerView):
+    task_type = "report"
 
-    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        return redirect(reverse("report_history", kwargs=self.get_kwargs()))
+    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
+        old_report_names = request.POST.getlist("old_report_name")
+        report_names = request.POST.getlist("report_name", [])
+        reference_dates = request.POST.getlist("reference_date")
 
+        if self.show_report_names() and report_names:
+            final_report_names = list(zip(old_report_names, self.finalise_report_names(report_names, reference_dates)))
+            report_ooi = self.save_report(final_report_names)
 
-class ReportDataDict(RootModel):
-    root: Any
+            return redirect(
+                reverse("view_report", kwargs={"organization_code": self.organization.code})
+                + "?"
+                + urlencode({"report_id": report_ooi.reference})
+            )
+        elif self.is_scheduled_report():
+            report_name_format = request.POST.get("parent_report_name", "")
+            subreport_name_format = request.POST.get("child_report_name", "")
 
-    class Config:
-        arbitrary_types_allowed = True
+            recurrence = request.POST.get("recurrence", "")
 
+            schedule = self.convert_recurrence_to_cron_expressions(recurrence)
 
-def recursive_dict():
-    return defaultdict(recursive_dict)
+            report_recipe = self.create_report_recipe(report_name_format, subreport_name_format, schedule)
+
+            self.create_report_schedule(report_recipe)
+
+            return redirect(reverse("scheduled_reports", kwargs={"organization_code": self.organization.code}))
+
+        messages.error(request, _("Empty name should not be possible."))
+        return PostRedirect(self.get_previous())
+
+    @staticmethod
+    def finalise_report_names(report_names: list[str], reference_dates: list[str]) -> list[str]:
+        final_report_names = []
+
+        if len(report_names) == len(reference_dates):
+            for index, report_name in enumerate(report_names):
+                date_format = ""
+                if reference_dates[index] and reference_dates[index] != "":
+                    date_format = " - "
+                    if reference_dates[index] == "week":
+                        date_format += _("Week %W, %Y")
+                    else:
+                        date_format += reference_dates[index]
+                final_report_name = f"{report_name} {date_format}".strip()
+                final_report_names.append(final_report_name)
+        if not final_report_names:
+            return report_names
+        return final_report_names
 
 
 class ViewReportView(ObservedAtMixin, OrganizationView, TemplateView):
@@ -433,24 +580,16 @@ class ViewReportView(ObservedAtMixin, OrganizationView, TemplateView):
 
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
-        self.report_id = request.GET.get("report_id")
-        self.report_ooi = self.octopoes_api_connector.get(
-            Reference.from_str(f"{self.report_id}"), valid_time=self.observed_at
-        )
+        self.report_ooi = self.get_report_ooi(request.GET.get("report_id"))
+        self.report_data, self.input_oois, self.report_types = self.get_report_data()
 
     def get(self, request, *args, **kwargs):
         if "json" in self.request.GET and self.request.GET["json"] == "true":
-            self.bytes_client.login()
-            data = json.loads(self.bytes_client.get_raw(raw_id=self.report_ooi.data_raw_id))
-
             response = {
                 "organization_code": self.organization.code,
                 "organization_name": self.organization.name,
                 "organization_tags": list(self.organization.tags.all()),
-                "data": {
-                    "report_data": {},
-                    "post_processed_data": data,
-                },
+                "data": self.report_data,
             }
 
             try:
@@ -459,7 +598,7 @@ def get(self, request, *args, **kwargs):
                 # We can't use translated strings as keys in JSON. This
                 # debugging code makes it easy to spot where the problem is.
                 if settings.DEBUG:
-                    debug_json_keys(data, [])
+                    debug_json_keys(self.report_data, [])
                 raise
             else:
                 response["Content-Disposition"] = f"attachment; filename=report-{self.organization.code}.json"
@@ -467,6 +606,9 @@ def get(self, request, *args, **kwargs):
 
         return super().get(request, *args, **kwargs)
 
+    def get_report_ooi(self, ooi_pk: str) -> ReportOOI:
+        return self.octopoes_api_connector.get(Reference.from_str(f"{ooi_pk}"), valid_time=self.observed_at)
+
     def get_template_names(self):
         if self.report_ooi.report_type and issubclass(get_report_by_id(self.report_ooi.report_type), AggregateReport):
             return [
@@ -478,11 +620,16 @@ def get_template_names(self):
             ]
 
     def get_children_reports(self) -> list[ReportOOI]:
-        return self.octopoes_api_connector.query(
-            "Report.<parent_report[is Report]",
-            valid_time=self.observed_at,
-            source=self.report_ooi.reference,
-        )
+        return [
+            child
+            for x in REPORTS
+            for child in self.octopoes_api_connector.query(
+                "Report.<parent_report[is Report]",
+                valid_time=self.observed_at,
+                source=self.report_ooi.reference,
+            )
+            if child.report_type == x.id
+        ]
 
     @staticmethod
     def get_report_types(reports: list[ReportOOI]) -> list[dict[str, Any]]:
@@ -493,71 +640,76 @@ def get_report_data_from_bytes(self, report: ReportOOI) -> dict[str, Any]:
             self.bytes_client.get_raw(raw_id=report.data_raw_id)
         )
 
-    def get_input_oois(self, reports: list[ReportOOI]) -> list[OOI]:
+    def get_input_oois(self, reports: list[ReportOOI]) -> list[type[OOI]]:
         ooi_pks = {ooi for report in reports for ooi in report.input_oois}
 
         return [
             self.octopoes_api_connector.get(Reference.from_str(ooi), valid_time=self.observed_at) for ooi in ooi_pks
         ]
 
-    def get_context_data(self, **kwargs):
-        # TODO: add config and plugins
-        # TODO: add template OOI
-        context = super().get_context_data(**kwargs)
+    def get_report_data_single_report(
+        self,
+    ) -> tuple[dict[str, dict[str, dict[str, Any]]], list[type[OOI]], list[dict[str, Any]]]:
+        self.bytes_client.login()
+        report_data: dict[str, dict[str, dict[str, Any]]] = {}
+        report_data[self.report_ooi.report_type] = {}
+
+        for ooi in self.report_ooi.input_oois:
+            report_data[self.report_ooi.report_type][ooi] = {
+                "data": self.get_report_data_from_bytes(self.report_ooi)["report_data"],
+                "template": self.report_ooi.template,
+                "report_name": self.report_ooi.name,
+            }
+
+        input_oois = self.get_input_oois([self.report_ooi])
+        report_types = self.get_report_types([self.report_ooi])
+
+        return report_data, input_oois, report_types
 
+    def get_report_data_aggregate_report(
+        self,
+    ) -> tuple[dict[str, dict[str, dict[str, Any]]], list[type[OOI]], list[dict[str, Any]]]:
+        self.bytes_client.login()
+        report_data = self.get_report_data_from_bytes(self.report_ooi)
+
+        children_reports = self.get_children_reports()
+        input_oois = self.get_input_oois([self.report_ooi])
+        report_types = self.get_report_types(children_reports)
+
+        return report_data, input_oois, report_types
+
+    def get_report_data_concatenated_report(
+        self,
+    ) -> tuple[dict[str, dict[str, dict[str, Any]]], list[type[OOI]], list[dict[str, Any]]]:
         self.bytes_client.login()
         report_data: dict[str, dict[str, dict[str, Any]]] = {}
 
-        children_reports = [
-            child for x in REPORTS for child in self.get_children_reports() if child.report_type == x.id
-        ]
-        report_types: list[dict[str, Any]] = []
-
-        if issubclass(
-            get_report_by_id(self.report_ooi.report_type), ConcatenatedReport
-        ):  # get single reports data (children's)
-            context["data"] = self.get_report_data_from_bytes(self.report_ooi)
-            for report in children_reports:
-                for ooi in report.input_oois:
-                    report_data.setdefault(report.report_type, {})[ooi] = {
-                        "data": self.get_report_data_from_bytes(report)["report_data"],
-                        "template": report.template,
-                        "report_name": report.name,
-                    }
-
-            input_oois = self.get_input_oois(children_reports)
-            report_types = self.get_report_types(children_reports)
-
-        elif issubclass(get_report_by_id(self.report_ooi.report_type), AggregateReport):  # its an aggregate report
-            context["post_processed_data"] = self.get_report_data_from_bytes(self.report_ooi)
-            input_oois = self.get_input_oois([self.report_ooi])
-            report_types = self.get_report_types(children_reports)
+        children_reports = self.get_children_reports()
+        input_oois = self.get_input_oois(children_reports)
+        report_types = self.get_report_types(children_reports)
 
-        else:
-            # its a single report
-            report_data[self.report_ooi.report_type] = {}
-            context["data"] = self.get_report_data_from_bytes(self.report_ooi)
-            for ooi in self.report_ooi.input_oois:
-                report_data[self.report_ooi.report_type][ooi] = {
-                    "data": context["data"]["report_data"],
-                    "template": self.report_ooi.template,
-                    "report_name": self.report_ooi.name,
+        for report in children_reports:
+            for ooi in report.input_oois:
+                report_data.setdefault(report.report_type, {})[ooi] = {
+                    "data": self.get_report_data_from_bytes(report)["report_data"],
+                    "template": report.template,
+                    "report_name": report.name,
                 }
+        return report_data, input_oois, report_types
 
-            input_oois = self.get_input_oois([self.report_ooi])
-            report_types = self.get_report_types([self.report_ooi])
+    def get_report_data(self):
+        if issubclass(get_report_by_id(self.report_ooi.report_type), ConcatenatedReport):
+            return self.get_report_data_concatenated_report()
+        elif issubclass(get_report_by_id(self.report_ooi.report_type), AggregateReport):
+            return self.get_report_data_aggregate_report()
+        else:
+            return self.get_report_data_single_report()
 
-        context["report_data"] = report_data
-        context["report_name"] = self.report_ooi.name
-        context["report_types"] = [
-            report_type for x in REPORTS for report_type in report_types if report_type["id"] == x.id
-        ]
-        context["created_at"] = self.report_ooi.date_generated
-        context["observed_at"] = self.report_ooi.observed_at
-        context["total_oois"] = len(input_oois)
-        context["oois"] = input_oois
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["report_data"] = self.report_data
+        context["report_ooi"] = self.report_ooi
 
-        context["template"] = self.report_ooi.template
         context["report_download_pdf_url"] = url_with_querystring(
             reverse(
                 "view_report_pdf",
diff --git a/rocky/reports/views/generate_report.py b/rocky/reports/views/generate_report.py
index a21e2557324..3acbab87d33 100644
--- a/rocky/reports/views/generate_report.py
+++ b/rocky/reports/views/generate_report.py
@@ -1,28 +1,23 @@
-from datetime import datetime, timezone
 from typing import Any
 
-from django.contrib import messages
-from django.core.exceptions import SuspiciousOperation
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect
 from django.urls import reverse
-from django.utils.http import urlencode
 from django.utils.translation import gettext_lazy as _
-from tools.view_helpers import PostRedirect
 
-from octopoes.models import Reference
-from reports.report_types.helpers import get_ooi_types_with_report, get_report_types_for_oois
+from reports.report_types.helpers import get_ooi_types_with_report
 from reports.views.base import (
     REPORTS_PRE_SELECTION,
     OOISelectionView,
     ReportBreadcrumbs,
+    ReportFinalSettingsView,
     ReportPluginView,
     ReportTypeSelectionView,
+    SaveReportView,
     get_selection,
 )
 from reports.views.mixins import SaveGenerateReportMixin
 from reports.views.view_helpers import GenerateReportStepsMixin
-from rocky.views.ooi_view import BaseOOIListView
 
 
 class BreadcrumbsGenerateReportView(ReportBreadcrumbs):
@@ -71,9 +66,7 @@ def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
         )
 
 
-class OOISelectionGenerateReportView(
-    GenerateReportStepsMixin, BreadcrumbsGenerateReportView, BaseOOIListView, OOISelectionView
-):
+class OOISelectionGenerateReportView(GenerateReportStepsMixin, BreadcrumbsGenerateReportView, OOISelectionView):
     """
     Select objects for the 'Generate Report' flow.
     """
@@ -83,11 +76,6 @@ class OOISelectionGenerateReportView(
     current_step = 1
     ooi_types = get_ooi_types_with_report()
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
-            messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
-        return self.get(request, *args, **kwargs)
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["channel"] = "generate_report"
@@ -95,7 +83,7 @@ def get_context_data(self, **kwargs):
 
 
 class ReportTypesSelectionGenerateReportView(
-    GenerateReportStepsMixin, BreadcrumbsGenerateReportView, OOISelectionView, ReportTypeSelectionView
+    GenerateReportStepsMixin, BreadcrumbsGenerateReportView, ReportTypeSelectionView
 ):
     """
     Shows all possible report types from a list of OOIs.
@@ -106,24 +94,9 @@ class ReportTypesSelectionGenerateReportView(
     breadcrumbs_step = 4
     current_step = 2
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
-            messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-        return self.get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["available_report_types"] = self.get_report_types(get_report_types_for_oois(self.get_oois_pk()))
-        context["total_oois"] = self.get_total_objects()
-        return context
-
 
 class SetupScanGenerateReportView(
-    SaveGenerateReportMixin,
-    GenerateReportStepsMixin,
-    BreadcrumbsGenerateReportView,
-    ReportPluginView,
+    SaveGenerateReportMixin, GenerateReportStepsMixin, BreadcrumbsGenerateReportView, ReportPluginView
 ):
     """
     Show required and optional plugins to start scans to generate OOIs to include in report.
@@ -133,20 +106,8 @@ class SetupScanGenerateReportView(
     breadcrumbs_step = 5
     current_step = 3
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_report_types:
-            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-
-        if "return" in self.request.POST and self.plugins_enabled():
-            return PostRedirect(self.get_previous())
 
-        if self.plugins_enabled():
-            return PostRedirect(self.get_next())
-        return self.get(request, *args, **kwargs)
-
-
-class ExportSetupGenerateReportView(GenerateReportStepsMixin, BreadcrumbsGenerateReportView, ReportPluginView):
+class ExportSetupGenerateReportView(GenerateReportStepsMixin, BreadcrumbsGenerateReportView, ReportFinalSettingsView):
     """
     Shows the export setup page where users can set their export preferences.
     """
@@ -154,74 +115,13 @@ class ExportSetupGenerateReportView(GenerateReportStepsMixin, BreadcrumbsGenerat
     template_name = "generate_report/export_setup.html"
     breadcrumbs_step = 6
     current_step = 4
-    reports: dict[str, str] = {}
 
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if not self.selected_report_types:
-            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
-            return PostRedirect(self.get_previous())
-        self.reports = create_report_names(self.oois_pk, self.report_types)
-        return super().get(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["reports"] = self.reports
-        context["current_datetime"] = datetime.now(timezone.utc)
-        return context
-
-
-class SaveGenerateReportView(SaveGenerateReportMixin, BreadcrumbsGenerateReportView, ReportPluginView):
+class SaveGenerateReportView(SaveGenerateReportMixin, BreadcrumbsGenerateReportView, SaveReportView):
     """
     Save the report generated.
     """
 
     template_name = "generate_report.html"
     breadcrumbs_step = 6
-    current_step = 4
-
-    def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        old_report_names = request.POST.getlist("old_report_name")
-        report_names = request.POST.getlist("report_name")
-        reference_dates = request.POST.getlist("reference_date")
-
-        if "" in report_names:
-            raise SuspiciousOperation(_("Empty name should not be possible."))
-        else:
-            final_report_names = list(zip(old_report_names, self.finalise_report_names(report_names, reference_dates)))
-            report_ooi = self.save_report(final_report_names)
-
-            return redirect(
-                reverse("view_report", kwargs={"organization_code": self.organization.code})
-                + "?"
-                + urlencode({"report_id": report_ooi.reference})
-            )
-
-
-def create_report_names(oois_pk, report_types) -> dict[str, str]:
-    reports = {}
-    oois_count = len(oois_pk)
-    report_types_count = len(report_types)
-    ooi = Reference.from_str(oois_pk[0]).human_readable
-    report_type = report_types[0].name
-
-    # Create name for parent report
-    if not (report_types_count == 1 and oois_count == 1):
-        if report_types_count > 1 and oois_count > 1:
-            name = _("Concatenated Report for {oois_count} objects").format(
-                report_type=report_type, oois_count=oois_count
-            )
-        elif report_types_count > 1 and oois_count == 1:
-            name = _("Concatenated Report for {ooi}").format(ooi=ooi)
-        elif report_types_count == 1 and oois_count > 1:
-            name = _("{report_type} for {oois_count} objects").format(report_type=report_type, oois_count=oois_count)
-        reports[name] = ""
-
-    # Create name for subreports or single reports
-    for ooi in oois_pk:
-        for report_type in report_types:
-            name = _("{report_type} for {ooi}").format(
-                report_type=report_type.name, ooi=Reference.from_str(ooi).human_readable
-            )
-            reports[name] = ""
-
-    return reports
+    current_step = 5
diff --git a/rocky/reports/views/mixins.py b/rocky/reports/views/mixins.py
index cd72d658690..a4a7d7b10db 100644
--- a/rocky/reports/views/mixins.py
+++ b/rocky/reports/views/mixins.py
@@ -1,118 +1,188 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any
+from uuid import uuid4
 
 from django.contrib import messages
 from django.utils.translation import gettext_lazy as _
+from tools.ooi_helpers import create_ooi
 
+from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.models import Reference, ScanProfileType
 from octopoes.models.exception import ObjectNotFoundException, TypeNotFound
-from octopoes.models.ooi.reports import Report as ReportOOI
+from octopoes.models.ooi.reports import Report
 from reports.report_types.aggregate_organisation_report.report import aggregate_reports
 from reports.report_types.concatenated_report.report import ConcatenatedReport
 from reports.report_types.helpers import REPORTS, get_report_by_id
-from reports.views.base import ReportPluginView
+from reports.views.base import BaseReportView, ReportDataDict
+from rocky.bytes_client import BytesClient
 
 
-class SaveGenerateReportMixin(ReportPluginView):
-    def save_report(self, report_names: list) -> ReportOOI:
-        error_reports = []
-        report_data: dict[str, dict[str, dict[str, Any]]] = {}
-        by_type: dict[str, list[str]] = {}
+def collect_reports(observed_at: datetime, octopoes_connector: OctopoesAPIConnector, ooi_pks: list[str], report_types):
+    error_reports = []
+    report_data: dict[str, dict[str, dict[str, Any]]] = {}
+    by_type: dict[str, list[str]] = {}
 
-        number_of_reports = 0
+    for ooi in ooi_pks:
+        ooi_type = Reference.from_str(ooi).class_
 
-        for ooi in self.get_oois_pk():
-            ooi_type = Reference.from_str(ooi).class_
+        if ooi_type not in by_type:
+            by_type[ooi_type] = []
 
-            if ooi_type not in by_type:
-                by_type[ooi_type] = []
+        by_type[ooi_type].append(ooi)
 
-            by_type[ooi_type].append(ooi)
+    for report_class in report_types:
+        oois = {ooi for ooi_type in report_class.input_ooi_types for ooi in by_type.get(ooi_type.get_object_type(), [])}
 
-        sorted_report_types = list(filter(lambda x: x in self.report_types, REPORTS))
+        try:
+            results = report_class(octopoes_connector).collect_data(oois, observed_at)
+        except ObjectNotFoundException:
+            error_reports.append(report_class.id)
+            continue
+        except TypeNotFound:
+            error_reports.append(report_class.id)
+            continue
 
-        for report_class in sorted_report_types:
-            oois = {
-                ooi for ooi_type in report_class.input_ooi_types for ooi in by_type.get(ooi_type.get_object_type(), [])
+        for ooi, data in results.items():
+            if report_class.id not in report_data:
+                report_data[report_class.id] = {}
+
+            report_data[report_class.id][ooi] = {
+                "data": data,
+                "template": report_class.template_path,
+                "report_name": report_class.name,
             }
 
-            try:
-                results = report_class(self.octopoes_api_connector).collect_data(oois, self.observed_at)
+    return error_reports, report_data
 
-            except ObjectNotFoundException:
-                error_reports.append(report_class.id)
-                continue
-            except TypeNotFound:
-                error_reports.append(report_class.id)
-                continue
 
-            for ooi, data in results.items():
-                if report_class.id not in report_data:
-                    report_data[report_class.id] = {}
+def save_report_raw(bytes_client: BytesClient, data: dict) -> str:
+    report_data_raw_id = bytes_client.upload_raw(
+        raw=ReportDataDict(data).model_dump_json().encode(),
+        manual_mime_types={"openkat/report"},
+    )
 
-                report_data[report_class.id][ooi] = {
-                    "data": data,
-                    "template": report_class.template_path,
-                    "report_name": report_class.name,
-                }
-                number_of_reports += 1
+    return report_data_raw_id
 
-        observed_at = self.get_observed_at()
-        now = datetime.utcnow()
 
-        # if its not a single report, we need a parent
-        if number_of_reports > 1:
-            raw_id = self.save_report_raw(data={"plugins": self.get_plugin_data_for_saving()})
-            report_ooi = self.save_report_ooi(
-                report_data_raw_id=raw_id,
-                report_type=ConcatenatedReport,
-                input_oois=[],
-                parent=None,
-                has_parent=False,
-                observed_at=observed_at,
-                name=now.strftime(report_names[0][1]),
-            )
+def save_report_data(
+    bytes_client, observed_at, octopoes_api_connector, organization, plugin_data, report_data, report_names
+):
+    now = datetime.now(timezone.utc)
+
+    # if it's not a single report, we need a parent
+    if len(report_data) > 1 or len(list(report_data.values())[0]) > 1:
+        raw_id = save_report_raw(bytes_client, data={"plugins": plugin_data})
+        name = now.strftime(report_names[0][1])
+
+        if not name or name.isspace():
+            name = ConcatenatedReport.name
+
+        parent_report_ooi = Report(
+            name=str(name),
+            report_type=str(ConcatenatedReport.id),
+            template=ConcatenatedReport.template_path,
+            report_id=uuid4(),
+            organization_code=organization.code,
+            organization_name=organization.name,
+            organization_tags=list(organization.tags.all()),
+            data_raw_id=raw_id,
+            date_generated=datetime.now(timezone.utc),
+            input_oois=[],
+            observed_at=observed_at,
+            parent_report=None,
+            has_parent=False,
+        )
+
+        create_ooi(octopoes_api_connector, bytes_client, parent_report_ooi, observed_at)
+
+        for report_type_id, ooi_data in report_data.items():
+            for ooi, data in ooi_data.items():
+                name_to_save = ""
+                report_type = get_report_by_id(report_type_id)
+                report_type_name = str(report_type.name)
+
+                ooi_name = Reference.from_str(ooi).human_readable
+                for default_name, updated_name in report_names:
+                    # Use default_name to check if we're on the right index in the list to update the name to save.
+                    if ooi_name in default_name and report_type_name in default_name:
+                        name_to_save = updated_name
+                        break
+
+                raw_id = save_report_raw(bytes_client, data={"report_data": data["data"]})
+
+                name = now.strftime(name_to_save)
+                if not name or name.isspace():
+                    name = ConcatenatedReport.name
+
+                sub_report_ooi = Report(
+                    name=str(name),
+                    report_type=report_type_id,
+                    template=report_type.template_path,
+                    report_id=uuid4(),
+                    organization_code=organization.code,
+                    organization_name=organization.name,
+                    organization_tags=list(organization.tags.all()),
+                    data_raw_id=raw_id,
+                    date_generated=datetime.now(timezone.utc),
+                    input_oois=[ooi],
+                    observed_at=observed_at,
+                    parent_report=parent_report_ooi.reference,
+                    has_parent=True,
+                )
+
+                create_ooi(octopoes_api_connector, bytes_client, sub_report_ooi, observed_at)
+
+    # if it's a single report we can just save it as complete
+    else:
+        report_type_id = next(iter(report_data))
+        ooi = next(iter(report_data[report_type_id]))
+        data = report_data[report_type_id][ooi]
+        raw_id = save_report_raw(bytes_client, data={"report_data": data["data"], "plugins": plugin_data})
+        report_type = get_report_by_id(report_type_id)
+        name = now.strftime(report_names[0][1])
+
+        if not name or name.isspace():
+            name = ConcatenatedReport.name
+
+        parent_report_ooi = Report(
+            name=str(name),
+            report_type=report_type_id,
+            template=report_type.template_path,
+            report_id=uuid4(),
+            organization_code=organization.code,
+            organization_name=organization.name,
+            organization_tags=list(organization.tags.all()),
+            data_raw_id=raw_id,
+            date_generated=datetime.now(timezone.utc),
+            input_oois=[ooi],
+            observed_at=observed_at,
+            parent_report=None,
+            has_parent=False,
+        )
+
+        create_ooi(octopoes_api_connector, bytes_client, parent_report_ooi, observed_at)
+    return parent_report_ooi
+
+
+class SaveGenerateReportMixin(BaseReportView):
+    def save_report(self, report_names: list) -> Report:
+        error_reports, report_data = collect_reports(
+            self.observed_at,
+            self.octopoes_api_connector,
+            self.get_ooi_pks(),
+            [x for x in self.get_report_types() if x in REPORTS],
+        )
+
+        parent_report_ooi = save_report_data(
+            self.bytes_client,
+            self.observed_at,
+            self.octopoes_api_connector,
+            self.organization,
+            self.get_plugin_data_for_saving(),
+            report_data,
+            report_names,
+        )
 
-            for report_type, ooi_data in report_data.items():
-                for ooi, data in ooi_data.items():
-                    name_to_save = ""
-
-                    report_type_name = str(get_report_by_id(report_type).name)
-                    ooi_name = Reference.from_str(ooi).human_readable
-                    for default_name, updated_name in report_names:
-                        # Use default_name to check if we're on the right index in the list to update the name to save.
-                        if ooi_name in default_name and report_type_name in default_name:
-                            name_to_save = updated_name
-                            break
-
-                    raw_id = self.save_report_raw(data={"report_data": data["data"]})
-
-                    self.save_report_ooi(
-                        report_data_raw_id=raw_id,
-                        report_type=get_report_by_id(report_type),
-                        input_oois=[ooi],
-                        parent=report_ooi.reference,
-                        has_parent=True,
-                        observed_at=observed_at,
-                        name=now.strftime(name_to_save),
-                    )
-        # if its a single report we can just save it as complete
-        else:
-            report_type = next(iter(report_data))
-            ooi = next(iter(report_data[report_type]))
-            data = report_data[report_type][ooi]
-            raw_id = self.save_report_raw(
-                data={"report_data": data["data"], "plugins": self.get_plugin_data_for_saving()}
-            )
-            report_ooi = self.save_report_ooi(
-                report_data_raw_id=raw_id,
-                report_type=get_report_by_id(report_type),
-                input_oois=[ooi],
-                parent=None,
-                has_parent=False,
-                observed_at=observed_at,
-                name=now.strftime(report_names[0][1]),
-            )
         # If OOI could not be found or the date is incorrect, it will be shown to the user as a message error
         if error_reports:
             report_types = ", ".join(set(error_reports))
@@ -123,17 +193,17 @@ def save_report(self, report_names: list) -> ReportOOI:
             }
             messages.error(self.request, error_message)
 
-        return report_ooi
+        return parent_report_ooi
 
 
-class SaveAggregateReportMixin(ReportPluginView):
-    def save_report(self, report_names: list) -> ReportOOI:
+class SaveAggregateReportMixin(BaseReportView):
+    def save_report(self, report_names: list) -> Report:
         input_oois = self.get_oois()
-
+        organization = self.organization
         aggregate_report, post_processed_data, report_data, report_errors = aggregate_reports(
             self.octopoes_api_connector,
             input_oois,
-            self.selected_report_types,
+            self.get_report_type_ids(),
             self.observed_at,
             self.organization.code,
         )
@@ -165,7 +235,7 @@ def save_report(self, report_names: list) -> ReportOOI:
             )
 
         post_processed_data["report_types"] = []
-        for report_type in self.report_types:
+        for report_type in self.get_report_types():
             post_processed_data["report_types"].append(
                 {
                     "name": str(report_type.name),
@@ -175,22 +245,35 @@ def save_report(self, report_names: list) -> ReportOOI:
             )
 
         now = datetime.utcnow()
+        bytes_client = self.bytes_client
 
         # Create the report
-        report_data_raw_id = self.save_report_raw(data=post_processed_data)
-        report_ooi = self.save_report_ooi(
-            report_data_raw_id=report_data_raw_id,
-            report_type=type(aggregate_report),
-            input_oois=[ooi.primary_key for ooi in input_oois],
-            parent=None,
-            has_parent=False,
+        report_data_raw_id = save_report_raw(bytes_client, data=post_processed_data)
+
+        report_type = type(aggregate_report)
+        name = now.strftime(report_names[0][1])
+        if not name or name.isspace():
+            name = report_type.name
+
+        report_ooi = Report(
+            name=str(name),
+            report_type=str(report_type.id),
+            template=report_type.template_path,
+            report_id=uuid4(),
+            organization_code=organization.code,
+            organization_name=organization.name,
+            organization_tags=list(organization.tags.all()),
+            data_raw_id=report_data_raw_id,
+            date_generated=datetime.now(timezone.utc),
+            input_oois=self.get_ooi_pks(),
             observed_at=observed_at,
-            name=now.strftime(report_names[0][1]),
+            parent_report=None,
+            has_parent=False,
         )
 
         # Save the child reports to bytes
         for ooi, types in report_data.items():
             for report_type, data in types.items():
-                self.save_report_raw(data=data)
+                save_report_raw(bytes_client, data=data)
 
         return report_ooi
diff --git a/rocky/reports/views/multi_report.py b/rocky/reports/views/multi_report.py
index 9af648ee5b5..69ba64f815f 100644
--- a/rocky/reports/views/multi_report.py
+++ b/rocky/reports/views/multi_report.py
@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import datetime
 from typing import Any
 
 from django.contrib import messages
@@ -14,12 +14,12 @@
     REPORTS_PRE_SELECTION,
     OOISelectionView,
     ReportBreadcrumbs,
+    ReportFinalSettingsView,
     ReportPluginView,
     ReportTypeSelectionView,
     get_selection,
 )
 from reports.views.view_helpers import MultiReportStepsMixin
-from rocky.views.ooi_view import BaseOOIListView
 
 
 class BreadcrumbsMultiReportView(ReportBreadcrumbs):
@@ -68,7 +68,7 @@ def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
         )
 
 
-class OOISelectionMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView, BaseOOIListView, OOISelectionView):
+class OOISelectionMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView, OOISelectionView):
     """
     Select OOIs for the 'Multi Report' flow.
     """
@@ -78,17 +78,14 @@ class OOISelectionMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportV
     current_step = 1
     ooi_types = MultiOrganizationReport.input_ooi_types
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
+    def get(self, request, *args, **kwargs):
+        if not self.get_ooi_selection():
             messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
         return self.get(request, *args, **kwargs)
 
 
 class ReportTypesSelectionMultiReportView(
-    MultiReportStepsMixin,
-    BreadcrumbsMultiReportView,
-    OOISelectionView,
-    ReportTypeSelectionView,
+    MultiReportStepsMixin, BreadcrumbsMultiReportView, OOISelectionView, ReportTypeSelectionView
 ):
     """
     Shows all possible report types from a list of OOIs.
@@ -98,19 +95,14 @@ class ReportTypesSelectionMultiReportView(
     template_name = "generate_report/select_report_types.html"
     breadcrumbs_step = 4
     current_step = 2
+    report_type = MultiOrganizationReport
 
-    def post(self, request, *args, **kwargs):
-        if not self.selected_oois:
+    def get(self, request, *args, **kwargs):
+        if not self.get_ooi_selection():
             messages.error(request, self.NONE_OOI_SELECTION_MESSAGE)
             return redirect(self.get_previous())
         return self.get(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["available_report_types"] = self.get_report_types({MultiOrganizationReport})
-        context["total_oois"] = self.get_total_objects()
-        return context
-
 
 class SetupScanMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView, ReportPluginView):
     """
@@ -122,12 +114,12 @@ class SetupScanMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView
     current_step = 3
 
     def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if self.plugins_enabled():
+        if self.all_plugins_enabled():
             return redirect(self.get_next())
         return super().get(request, *args, **kwargs)
 
 
-class ExportSetupMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView, ReportPluginView):
+class ExportSetupMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportView, ReportFinalSettingsView):
     """
     Shows the export setup page where users can set their export preferences.
     """
@@ -135,20 +127,15 @@ class ExportSetupMultiReportView(MultiReportStepsMixin, BreadcrumbsMultiReportVi
     template_name = "generate_report/export_setup.html"
     breadcrumbs_step = 6
     current_step = 4
+    report_type = MultiOrganizationReport
 
     def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if not self.selected_report_types:
-            messages.error(request, _("Select at least one report type to proceed."))
+        if not self.get_report_type_ids():
+            messages.error(request, self.NONE_REPORT_TYPE_SELECTION_MESSAGE)
             return redirect(self.get_previous())
 
         return super().get(request, *args, **kwargs)
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["current_datetime"] = datetime.now(timezone.utc)
-        context["reports"] = [_("Multi Report")]
-        return context
-
 
 class MultiReportView(BreadcrumbsMultiReportView, ReportPluginView):
     """
@@ -162,17 +149,16 @@ def multi_reports_for_oois(self) -> dict[str, dict[str, Any]]:
         report = MultiOrganizationReport(self.octopoes_api_connector)
 
         return report.post_process_data(
-            collect_report_data(self.octopoes_api_connector, self.selected_oois, self.observed_at)
+            collect_report_data(self.octopoes_api_connector, self.get_ooi_pks(), self.observed_at)
         )
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["created_at"] = datetime.now()
-        context["total_oois"] = self.get_total_objects()
+        context["total_oois"] = len(self.get_ooi_pks())
         context["report_types"] = [MultiOrganizationReport]
-        report_data = self.multi_reports_for_oois()
         context["template"] = MultiOrganizationReport.template_path
-        context["report_data"] = report_data
+        context["report_data"] = self.multi_reports_for_oois()
         context["report_download_url"] = url_with_querystring(
             reverse("multi_report_pdf", kwargs={"organization_code": self.organization.code}),
             True,
diff --git a/rocky/reports/views/report_overview.py b/rocky/reports/views/report_overview.py
index d181f3e38ff..feb2706c444 100644
--- a/rocky/reports/views/report_overview.py
+++ b/rocky/reports/views/report_overview.py
@@ -1,10 +1,21 @@
+from datetime import datetime
+from typing import Any
+
+import structlog
+from django.contrib import messages
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView
 
+from octopoes.models import Reference
+from octopoes.models.exception import ObjectNotFoundException
+from octopoes.models.ooi.reports import Report, ReportRecipe
 from reports.views.base import ReportBreadcrumbs, get_selection
 from rocky.paginator import RockyPaginator
 from rocky.views.mixins import OctopoesView, ReportList
+from rocky.views.scheduler import SchedulerView
+
+logger = structlog.get_logger(__name__)
 
 
 class BreadcrumbsReportOverviewView(ReportBreadcrumbs):
@@ -25,6 +36,56 @@ def build_breadcrumbs(self):
         return breadcrumbs
 
 
+class ScheduledReportsView(BreadcrumbsReportOverviewView, SchedulerView, ListView):
+    """
+    Shows all the reports that have ever been generated for the organization.
+    """
+
+    paginate_by = 20
+    breadcrumbs_step = 2
+    context_object_name = "reports"
+    paginator = RockyPaginator
+    template_name = "report_overview/scheduled_reports.html"
+    task_type = "report"
+    context_object_name = "scheduled_reports"
+
+    def get_recipe_ooi_tree(self, ooi_pk: str) -> ReportRecipe | None:
+        try:
+            return self.octopoes_api_connector.get_tree(
+                Reference.from_str(f"ReportRecipe|{ooi_pk}"),
+                valid_time=self.observed_at,
+                depth=1,
+                types={ReportRecipe, Report},
+            )
+        except ObjectNotFoundException:
+            return messages.error(self.request, f"Report recipe with id {ooi_pk} not found.")
+
+    def get_queryset(self) -> list[dict[str, Any]]:
+        report_schedules = self.get_report_schedules()
+
+        recipes = []
+        if report_schedules:
+            for schedule in report_schedules:
+                recipe_id = schedule["data"]["report_recipe_id"]
+                # TODO: This is a workaround to get the recipes and reports.
+                #  We should create an endpoint for this in octopoes
+                recipe_ooi_tree = self.get_recipe_ooi_tree(recipe_id)
+                if recipe_ooi_tree is not None:
+                    recipe_tree = recipe_ooi_tree.store.values()
+                    recipe_ooi = [ooi for ooi in recipe_tree if isinstance(ooi, ReportRecipe)][0]
+                    report_oois = [ooi for ooi in recipe_tree if isinstance(ooi, Report)]
+                    recipes.append(
+                        {
+                            "recipe": recipe_ooi,
+                            "cron": schedule["schedule"],
+                            "deadline_at": datetime.fromisoformat(schedule["deadline_at"]),
+                            "reports": report_oois,
+                        }
+                    )
+
+        return recipes
+
+
 class ReportHistoryView(BreadcrumbsReportOverviewView, OctopoesView, ListView):
     """
     Shows all the reports that have ever been generated for the organization.
@@ -34,7 +95,7 @@ class ReportHistoryView(BreadcrumbsReportOverviewView, OctopoesView, ListView):
     breadcrumbs_step = 2
     context_object_name = "reports"
     paginator = RockyPaginator
-    template_name = "report_overview/report_overview.html"
+    template_name = "report_overview/report_history.html"
 
     def get_queryset(self) -> ReportList:
         return ReportList(
diff --git a/rocky/requirements-dev.txt b/rocky/requirements-dev.txt
index 28a5eb002af..82ac54d47a6 100644
--- a/rocky/requirements-dev.txt
+++ b/rocky/requirements-dev.txt
@@ -128,9 +128,9 @@ brotlicffi==1.1.0.0 ; platform_python_implementation != "CPython" and python_ver
     --hash=sha256:ce01c7316aebc7fce59da734286148b1d1b9455f89cf2c8a4dfce7d41db55c2d \
     --hash=sha256:d9eb71bb1085d996244439154387266fd23d6ad37161f6f52f1cd41dd95a3808 \
     --hash=sha256:fa8ca0623b26c94fccc3a1fdd895be1743b838f3917300506d04aa3346fd2a14
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 cffi==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
     --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
@@ -527,9 +527,9 @@ html5lib==1.1 ; python_version >= "3.10" and python_version < "4.0" \
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -827,102 +827,102 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
 pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pydyf==0.8.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:901186a2e9f897108139426a6486f5225bdcc9b70be2ec965f25111e42f8ac5d \
     --hash=sha256:b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a
@@ -1472,9 +1472,9 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
 zopfli==0.2.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0574372283befa5af98fb31407e1fe6822f2f9c437ef69e7fa260e49022d8a65 \
     --hash=sha256:082f030b2b7d6d4597ac517816e499c63b92130aa8f4f74a3788ebaa5770f974 \
diff --git a/rocky/requirements.txt b/rocky/requirements.txt
index ce160879550..04630091b2b 100644
--- a/rocky/requirements.txt
+++ b/rocky/requirements.txt
@@ -125,9 +125,9 @@ brotlicffi==1.1.0.0 ; platform_python_implementation != "CPython" and python_ver
     --hash=sha256:ce01c7316aebc7fce59da734286148b1d1b9455f89cf2c8a4dfce7d41db55c2d \
     --hash=sha256:d9eb71bb1085d996244439154387266fd23d6ad37161f6f52f1cd41dd95a3808 \
     --hash=sha256:fa8ca0623b26c94fccc3a1fdd895be1743b838f3917300506d04aa3346fd2a14
-certifi==2024.7.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:5a1e7645bc0ec61a09e26c36f6106dd4cf40c6db3a1fb6352b0244e7fb057c7b \
-    --hash=sha256:c198e21b1289c2ab85ee4e67bb4b4ef3ead0892059901a8d5b622f24a1101e90
+certifi==2024.8.30 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8 \
+    --hash=sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9
 cffi==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
     --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
@@ -405,9 +405,9 @@ html5lib==1.1 ; python_version >= "3.10" and python_version < "4.0" \
 httpcore==1.0.5 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61 \
     --hash=sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5
-httpx==0.27.0 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:71d5465162c13681bff01ad59b2cc68dd838ea1f10e51574bac27103f00c91a5 \
-    --hash=sha256:a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5
+httpx==0.27.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:7bb2708e112d8fdd7829cd4243970f0c223274051cb35ee80c03301ee29a3df0 \
+    --hash=sha256:f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2
 idna==3.7 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc \
     --hash=sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0
@@ -569,102 +569,102 @@ psycopg2==2.9.9 ; python_version >= "3.10" and python_version < "4.0" \
 pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
     --hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
-pydantic-core==2.20.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:035ede2e16da7281041f0e626459bcae33ed998cca6a0a007a5ebb73414ac72d \
-    --hash=sha256:04024d270cf63f586ad41fff13fde4311c4fc13ea74676962c876d9577bcc78f \
-    --hash=sha256:0827505a5c87e8aa285dc31e9ec7f4a17c81a813d45f70b1d9164e03a813a686 \
-    --hash=sha256:084659fac3c83fd674596612aeff6041a18402f1e1bc19ca39e417d554468482 \
-    --hash=sha256:10d4204d8ca33146e761c79f83cc861df20e7ae9f6487ca290a97702daf56006 \
-    --hash=sha256:11b71d67b4725e7e2a9f6e9c0ac1239bbc0c48cce3dc59f98635efc57d6dac83 \
-    --hash=sha256:150906b40ff188a3260cbee25380e7494ee85048584998c1e66df0c7a11c17a6 \
-    --hash=sha256:175873691124f3d0da55aeea1d90660a6ea7a3cfea137c38afa0a5ffabe37b88 \
-    --hash=sha256:177f55a886d74f1808763976ac4efd29b7ed15c69f4d838bbd74d9d09cf6fa86 \
-    --hash=sha256:19c0fa39fa154e7e0b7f82f88ef85faa2a4c23cc65aae2f5aea625e3c13c735a \
-    --hash=sha256:1eedfeb6089ed3fad42e81a67755846ad4dcc14d73698c120a82e4ccf0f1f9f6 \
-    --hash=sha256:225b67a1f6d602de0ce7f6c1c3ae89a4aa25d3de9be857999e9124f15dab486a \
-    --hash=sha256:242b8feb3c493ab78be289c034a1f659e8826e2233786e36f2893a950a719bb6 \
-    --hash=sha256:254ec27fdb5b1ee60684f91683be95e5133c994cc54e86a0b0963afa25c8f8a6 \
-    --hash=sha256:25e9185e2d06c16ee438ed39bf62935ec436474a6ac4f9358524220f1b236e43 \
-    --hash=sha256:26ab812fa0c845df815e506be30337e2df27e88399b985d0bb4e3ecfe72df31c \
-    --hash=sha256:26ca695eeee5f9f1aeeb211ffc12f10bcb6f71e2989988fda61dabd65db878d4 \
-    --hash=sha256:26dc97754b57d2fd00ac2b24dfa341abffc380b823211994c4efac7f13b9e90e \
-    --hash=sha256:270755f15174fb983890c49881e93f8f1b80f0b5e3a3cc1394a255706cabd203 \
-    --hash=sha256:2aafc5a503855ea5885559eae883978c9b6d8c8993d67766ee73d82e841300dd \
-    --hash=sha256:2d036c7187b9422ae5b262badb87a20a49eb6c5238b2004e96d4da1231badef1 \
-    --hash=sha256:33499e85e739a4b60c9dac710c20a08dc73cb3240c9a0e22325e671b27b70d24 \
-    --hash=sha256:37eee5b638f0e0dcd18d21f59b679686bbd18917b87db0193ae36f9c23c355fc \
-    --hash=sha256:38cf1c40a921d05c5edc61a785c0ddb4bed67827069f535d794ce6bcded919fc \
-    --hash=sha256:3acae97ffd19bf091c72df4d726d552c473f3576409b2a7ca36b2f535ffff4a3 \
-    --hash=sha256:3c5ebac750d9d5f2706654c638c041635c385596caf68f81342011ddfa1e5598 \
-    --hash=sha256:3d482efec8b7dc6bfaedc0f166b2ce349df0011f5d2f1f25537ced4cfc34fd98 \
-    --hash=sha256:407653af5617f0757261ae249d3fba09504d7a71ab36ac057c938572d1bc9331 \
-    --hash=sha256:40a783fb7ee353c50bd3853e626f15677ea527ae556429453685ae32280c19c2 \
-    --hash=sha256:41e81317dd6a0127cabce83c0c9c3fbecceae981c8391e6f1dec88a77c8a569a \
-    --hash=sha256:41f4c96227a67a013e7de5ff8f20fb496ce573893b7f4f2707d065907bffdbd6 \
-    --hash=sha256:469f29f9093c9d834432034d33f5fe45699e664f12a13bf38c04967ce233d688 \
-    --hash=sha256:4745f4ac52cc6686390c40eaa01d48b18997cb130833154801a442323cc78f91 \
-    --hash=sha256:4868f6bd7c9d98904b748a2653031fc9c2f85b6237009d475b1008bfaeb0a5aa \
-    --hash=sha256:4aa223cd1e36b642092c326d694d8bf59b71ddddc94cdb752bbbb1c5c91d833b \
-    --hash=sha256:4dd484681c15e6b9a977c785a345d3e378d72678fd5f1f3c0509608da24f2ac0 \
-    --hash=sha256:4f2790949cf385d985a31984907fecb3896999329103df4e4983a4a41e13e840 \
-    --hash=sha256:512ecfbefef6dac7bc5eaaf46177b2de58cdf7acac8793fe033b24ece0b9566c \
-    --hash=sha256:516d9227919612425c8ef1c9b869bbbee249bc91912c8aaffb66116c0b447ebd \
-    --hash=sha256:53e431da3fc53360db73eedf6f7124d1076e1b4ee4276b36fb25514544ceb4a3 \
-    --hash=sha256:595ba5be69b35777474fa07f80fc260ea71255656191adb22a8c53aba4479231 \
-    --hash=sha256:5b5ff4911aea936a47d9376fd3ab17e970cc543d1b68921886e7f64bd28308d1 \
-    --hash=sha256:5d41e6daee2813ecceea8eda38062d69e280b39df793f5a942fa515b8ed67953 \
-    --hash=sha256:5e999ba8dd90e93d57410c5e67ebb67ffcaadcea0ad973240fdfd3a135506250 \
-    --hash=sha256:5f239eb799a2081495ea659d8d4a43a8f42cd1fe9ff2e7e436295c38a10c286a \
-    --hash=sha256:635fee4e041ab9c479e31edda27fcf966ea9614fff1317e280d99eb3e5ab6fe2 \
-    --hash=sha256:65db0f2eefcaad1a3950f498aabb4875c8890438bc80b19362cf633b87a8ab20 \
-    --hash=sha256:6b507132dcfc0dea440cce23ee2182c0ce7aba7054576efc65634f080dbe9434 \
-    --hash=sha256:6b9d9bb600328a1ce523ab4f454859e9d439150abb0906c5a1983c146580ebab \
-    --hash=sha256:70c8daf4faca8da5a6d655f9af86faf6ec2e1768f4b8b9d0226c02f3d6209703 \
-    --hash=sha256:77bf3ac639c1ff567ae3b47f8d4cc3dc20f9966a2a6dd2311dcc055d3d04fb8a \
-    --hash=sha256:784c1214cb6dd1e3b15dd8b91b9a53852aed16671cc3fbe4786f4f1db07089e2 \
-    --hash=sha256:7eb6a0587eded33aeefea9f916899d42b1799b7b14b8f8ff2753c0ac1741edac \
-    --hash=sha256:7ed1b0132f24beeec5a78b67d9388656d03e6a7c837394f99257e2d55b461611 \
-    --hash=sha256:8ad4aeb3e9a97286573c03df758fc7627aecdd02f1da04516a86dc159bf70121 \
-    --hash=sha256:964faa8a861d2664f0c7ab0c181af0bea66098b1919439815ca8803ef136fc4e \
-    --hash=sha256:9dc1b507c12eb0481d071f3c1808f0529ad41dc415d0ca11f7ebfc666e66a18b \
-    --hash=sha256:9ebfef07dbe1d93efb94b4700f2d278494e9162565a54f124c404a5656d7ff09 \
-    --hash=sha256:a45f84b09ac9c3d35dfcf6a27fd0634d30d183205230a0ebe8373a0e8cfa0906 \
-    --hash=sha256:a4f55095ad087474999ee28d3398bae183a66be4823f753cd7d67dd0153427c9 \
-    --hash=sha256:a6d511cc297ff0883bc3708b465ff82d7560193169a8b93260f74ecb0a5e08a7 \
-    --hash=sha256:a8ad4c766d3f33ba8fd692f9aa297c9058970530a32c728a2c4bfd2616d3358b \
-    --hash=sha256:aa2f457b4af386254372dfa78a2eda2563680d982422641a85f271c859df1987 \
-    --hash=sha256:b03f7941783b4c4a26051846dea594628b38f6940a2fdc0df00b221aed39314c \
-    --hash=sha256:b0dae11d8f5ded51699c74d9548dcc5938e0804cc8298ec0aa0da95c21fff57b \
-    --hash=sha256:b91ced227c41aa29c672814f50dbb05ec93536abf8f43cd14ec9521ea09afe4e \
-    --hash=sha256:bc633a9fe1eb87e250b5c57d389cf28998e4292336926b0b6cdaee353f89a237 \
-    --hash=sha256:bebb4d6715c814597f85297c332297c6ce81e29436125ca59d1159b07f423eb1 \
-    --hash=sha256:c336a6d235522a62fef872c6295a42ecb0c4e1d0f1a3e500fe949415761b8a19 \
-    --hash=sha256:c6514f963b023aeee506678a1cf821fe31159b925c4b76fe2afa94cc70b3222b \
-    --hash=sha256:c693e916709c2465b02ca0ad7b387c4f8423d1db7b4649c551f27a529181c5ad \
-    --hash=sha256:c81131869240e3e568916ef4c307f8b99583efaa60a8112ef27a366eefba8ef0 \
-    --hash=sha256:d02a72df14dfdbaf228424573a07af10637bd490f0901cee872c4f434a735b94 \
-    --hash=sha256:d2a8fa9d6d6f891f3deec72f5cc668e6f66b188ab14bb1ab52422fe8e644f312 \
-    --hash=sha256:d2b27e6af28f07e2f195552b37d7d66b150adbaa39a6d327766ffd695799780f \
-    --hash=sha256:d2fe69c5434391727efa54b47a1e7986bb0186e72a41b203df8f5b0a19a4f669 \
-    --hash=sha256:d3f3ed29cd9f978c604708511a1f9c2fdcb6c38b9aae36a51905b8811ee5cbf1 \
-    --hash=sha256:d573faf8eb7e6b1cbbcb4f5b247c60ca8be39fe2c674495df0eb4318303137fe \
-    --hash=sha256:e0bbdd76ce9aa5d4209d65f2b27fc6e5ef1312ae6c5333c26db3f5ade53a1e99 \
-    --hash=sha256:e7c4ea22b6739b162c9ecaaa41d718dfad48a244909fe7ef4b54c0b530effc5a \
-    --hash=sha256:e93e1a4b4b33daed65d781a57a522ff153dcf748dee70b40c7258c5861e1768a \
-    --hash=sha256:e97fdf088d4b31ff4ba35db26d9cc472ac7ef4a2ff2badeabf8d727b3377fc52 \
-    --hash=sha256:e9fa4c9bf273ca41f940bceb86922a7667cd5bf90e95dbb157cbb8441008482c \
-    --hash=sha256:eaad4ff2de1c3823fddf82f41121bdf453d922e9a238642b1dedb33c4e4f98ad \
-    --hash=sha256:f1f62b2413c3a0e846c3b838b2ecd6c7a19ec6793b2a522745b0869e37ab5bc1 \
-    --hash=sha256:f6d6cff3538391e8486a431569b77921adfcdef14eb18fbf19b7c0a5294d4e6a \
-    --hash=sha256:f9aa05d09ecf4c75157197f27cdc9cfaeb7c5f15021c6373932bf3e124af029f \
-    --hash=sha256:fa2fddcb7107e0d1808086ca306dcade7df60a13a6c347a7acf1ec139aa6789a \
-    --hash=sha256:faa6b09ee09433b87992fb5a2859efd1c264ddc37280d2dd5db502126d0e7f27
-pydantic-settings==2.3.4 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a \
-    --hash=sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7
-pydantic==2.8.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a \
-    --hash=sha256:73ee9fddd406dc318b885c7a2eab8a6472b68b8fb5ba8150949fc3db939f23c8
+pydantic-core==2.23.4 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0a7df63886be5e270da67e0966cf4afbae86069501d35c8c1b3b6c168f42cb36 \
+    --hash=sha256:0cb3da3fd1b6a5d0279a01877713dbda118a2a4fc6f0d821a57da2e464793f05 \
+    --hash=sha256:0dbd8dbed2085ed23b5c04afa29d8fd2771674223135dc9bc937f3c09284d071 \
+    --hash=sha256:0dff76e0602ca7d4cdaacc1ac4c005e0ce0dcfe095d5b5259163a80d3a10d327 \
+    --hash=sha256:1278e0d324f6908e872730c9102b0112477a7f7cf88b308e4fc36ce1bdb6d58c \
+    --hash=sha256:128585782e5bfa515c590ccee4b727fb76925dd04a98864182b22e89a4e6ed36 \
+    --hash=sha256:1498bec4c05c9c787bde9125cfdcc63a41004ff167f495063191b863399b1a29 \
+    --hash=sha256:19442362866a753485ba5e4be408964644dd6a09123d9416c54cd49171f50744 \
+    --hash=sha256:1b84d168f6c48fabd1f2027a3d1bdfe62f92cade1fb273a5d68e621da0e44e6d \
+    --hash=sha256:1e90d2e3bd2c3863d48525d297cd143fe541be8bbf6f579504b9712cb6b643ec \
+    --hash=sha256:20152074317d9bed6b7a95ade3b7d6054845d70584216160860425f4fbd5ee9e \
+    --hash=sha256:216f9b2d7713eb98cb83c80b9c794de1f6b7e3145eef40400c62e86cee5f4e1e \
+    --hash=sha256:233710f069d251feb12a56da21e14cca67994eab08362207785cf8c598e74577 \
+    --hash=sha256:255a8ef062cbf6674450e668482456abac99a5583bbafb73f9ad469540a3a232 \
+    --hash=sha256:2584f7cf844ac4d970fba483a717dbe10c1c1c96a969bf65d61ffe94df1b2863 \
+    --hash=sha256:2971bb5ffe72cc0f555c13e19b23c85b654dd2a8f7ab493c262071377bfce9f6 \
+    --hash=sha256:29d2c342c4bc01b88402d60189f3df065fb0dda3654744d5a165a5288a657368 \
+    --hash=sha256:2e203fdf807ac7e12ab59ca2bfcabb38c7cf0b33c41efeb00f8e5da1d86af480 \
+    --hash=sha256:33e3d65a85a2a4a0dc3b092b938a4062b1a05f3a9abde65ea93b233bca0e03f2 \
+    --hash=sha256:374a5e5049eda9e0a44c696c7ade3ff355f06b1fe0bb945ea3cac2bc336478a2 \
+    --hash=sha256:37b0fe330e4a58d3c58b24d91d1eb102aeec675a3db4c292ec3928ecd892a9a6 \
+    --hash=sha256:3d5639516376dce1940ea36edf408c554475369f5da2abd45d44621cb616f769 \
+    --hash=sha256:42c6dcb030aefb668a2b7009c85b27f90e51e6a3b4d5c9bc4c57631292015b0d \
+    --hash=sha256:4a7cd62e831afe623fbb7aabbb4fe583212115b3ef38a9f6b71869ba644624a2 \
+    --hash=sha256:4ba762ed58e8d68657fc1281e9bb72e1c3e79cc5d464be146e260c541ec12d84 \
+    --hash=sha256:4fc714bdbfb534f94034efaa6eadd74e5b93c8fa6315565a222f7b6f42ca1166 \
+    --hash=sha256:4ffa2ebd4c8530079140dd2d7f794a9d9a73cbb8e9d59ffe24c63436efa8f271 \
+    --hash=sha256:5a1504ad17ba4210df3a045132a7baeeba5a200e930f57512ee02909fc5c4cb5 \
+    --hash=sha256:5c364564d17da23db1106787675fc7af45f2f7b58b4173bfdd105564e132e6fb \
+    --hash=sha256:5e11661ce0fd30a6790e8bcdf263b9ec5988e95e63cf901972107efc49218b13 \
+    --hash=sha256:5f54b118ce5de9ac21c363d9b3caa6c800341e8c47a508787e5868c6b79c9323 \
+    --hash=sha256:5f5ff8d839f4566a474a969508fe1c5e59c31c80d9e140566f9a37bba7b8d556 \
+    --hash=sha256:61817945f2fe7d166e75fbfb28004034b48e44878177fc54d81688e7b85a3665 \
+    --hash=sha256:624e278a7d29b6445e4e813af92af37820fafb6dcc55c012c834f9e26f9aaaef \
+    --hash=sha256:63e46b3169866bd62849936de036f901a9356e36376079b05efa83caeaa02ceb \
+    --hash=sha256:6531b7ca5f951d663c339002e91aaebda765ec7d61b7d1e3991051906ddde119 \
+    --hash=sha256:68665f4c17edcceecc112dfed5dbe6f92261fb9d6054b47d01bf6371a6196126 \
+    --hash=sha256:696dd8d674d6ce621ab9d45b205df149399e4bb9aa34102c970b721554828510 \
+    --hash=sha256:6f783e0ec4803c787bcea93e13e9932edab72068f68ecffdf86a99fd5918878b \
+    --hash=sha256:723314c1d51722ab28bfcd5240d858512ffd3116449c557a1336cbe3919beb87 \
+    --hash=sha256:74b9127ffea03643e998e0c5ad9bd3811d3dac8c676e47db17b0ee7c3c3bf35f \
+    --hash=sha256:7530e201d10d7d14abce4fb54cfe5b94a0aefc87da539d0346a484ead376c3cc \
+    --hash=sha256:77733e3892bb0a7fa797826361ce8a9184d25c8dffaec60b7ffe928153680ba8 \
+    --hash=sha256:78ddaaa81421a29574a682b3179d4cf9e6d405a09b99d93ddcf7e5239c742e21 \
+    --hash=sha256:7c9129eb40958b3d4500fa2467e6a83356b3b61bfff1b414c7361d9220f9ae8f \
+    --hash=sha256:7d32706badfe136888bdea71c0def994644e09fff0bfe47441deaed8e96fdbc6 \
+    --hash=sha256:81965a16b675b35e1d09dd14df53f190f9129c0202356ed44ab2728b1c905658 \
+    --hash=sha256:8394d940e5d400d04cad4f75c0598665cbb81aecefaca82ca85bd28264af7f9b \
+    --hash=sha256:86d2f57d3e1379a9525c5ab067b27dbb8a0642fb5d454e17a9ac434f9ce523e3 \
+    --hash=sha256:883a91b5dd7d26492ff2f04f40fbb652de40fcc0afe07e8129e8ae779c2110eb \
+    --hash=sha256:88ad334a15b32a791ea935af224b9de1bf99bcd62fabf745d5f3442199d86d59 \
+    --hash=sha256:9261d3ce84fa1d38ed649c3638feefeae23d32ba9182963e465d58d62203bd24 \
+    --hash=sha256:97df63000f4fea395b2824da80e169731088656d1818a11b95f3b173747b6cd9 \
+    --hash=sha256:98d134c954828488b153d88ba1f34e14259284f256180ce659e8d83e9c05eaa3 \
+    --hash=sha256:996a38a83508c54c78a5f41456b0103c30508fed9abcad0a59b876d7398f25fd \
+    --hash=sha256:9a5bce9d23aac8f0cf0836ecfc033896aa8443b501c58d0602dbfd5bd5b37753 \
+    --hash=sha256:9a6b5099eeec78827553827f4c6b8615978bb4b6a88e5d9b93eddf8bb6790f55 \
+    --hash=sha256:9d18368b137c6295db49ce7218b1a9ba15c5bc254c96d7c9f9e924a9bc7825ad \
+    --hash=sha256:a4fa4fc04dff799089689f4fd502ce7d59de529fc2f40a2c8836886c03e0175a \
+    --hash=sha256:a5c7ba8ffb6d6f8f2ab08743be203654bb1aaa8c9dcb09f82ddd34eadb695605 \
+    --hash=sha256:aea443fffa9fbe3af1a9ba721a87f926fe548d32cab71d188a6ede77d0ff244e \
+    --hash=sha256:b10bd51f823d891193d4717448fab065733958bdb6a6b351967bd349d48d5c9b \
+    --hash=sha256:ba1a0996f6c2773bd83e63f18914c1de3c9dd26d55f4ac302a7efe93fb8e7433 \
+    --hash=sha256:bb2802e667b7051a1bebbfe93684841cc9351004e2badbd6411bf357ab8d5ac8 \
+    --hash=sha256:cfdd16ab5e59fc31b5e906d1a3f666571abc367598e3e02c83403acabc092e07 \
+    --hash=sha256:d06b0c8da4f16d1d1e352134427cb194a0a6e19ad5db9161bf32b2113409e728 \
+    --hash=sha256:d0776dea117cf5272382634bd2a5c1b6eb16767c223c6a5317cd3e2a757c61a0 \
+    --hash=sha256:d18ca8148bebe1b0a382a27a8ee60350091a6ddaf475fa05ef50dc35b5df6327 \
+    --hash=sha256:d4488a93b071c04dc20f5cecc3631fc78b9789dd72483ba15d423b5b3689b555 \
+    --hash=sha256:d5f7a395a8cf1621939692dba2a6b6a830efa6b3cee787d82c7de1ad2930de64 \
+    --hash=sha256:d7a80d21d613eec45e3d41eb22f8f94ddc758a6c4720842dc74c0581f54993d6 \
+    --hash=sha256:d97683ddee4723ae8c95d1eddac7c192e8c552da0c73a925a89fa8649bf13eea \
+    --hash=sha256:dcedcd19a557e182628afa1d553c3895a9f825b936415d0dbd3cd0bbcfd29b4b \
+    --hash=sha256:de6d1d1b9e5101508cb37ab0d972357cac5235f5c6533d1071964c47139257df \
+    --hash=sha256:df49e7a0861a8c36d089c1ed57d308623d60416dab2647a4a17fe050ba85de0e \
+    --hash=sha256:df933278128ea1cd77772673c73954e53a1c95a4fdf41eef97c2b779271bd0bd \
+    --hash=sha256:e08277a400de01bc72436a0ccd02bdf596631411f592ad985dcee21445bd0068 \
+    --hash=sha256:e38e63e6f3d1cec5a27e0afe90a085af8b6806ee208b33030e65b6516353f1a3 \
+    --hash=sha256:e55541f756f9b3ee346b840103f32779c695a19826a4c442b7954550a0972040 \
+    --hash=sha256:ec4e55f79b1c4ffb2eecd8a0cfba9955a2588497d96851f4c8f99aa4a1d39b12 \
+    --hash=sha256:ed1a53de42fbe34853ba90513cea21673481cd81ed1be739f7f2efb931b24916 \
+    --hash=sha256:ed541d70698978a20eb63d8c5d72f2cc6d7079d9d90f6b50bad07826f1320f5f \
+    --hash=sha256:f09e2ff1f17c2b51f2bc76d1cc33da96298f0a036a137f5440ab3ec5360b624f \
+    --hash=sha256:f220b0eea5965dec25480b6333c788fb72ce5f9129e8759ef876a1d805d00801 \
+    --hash=sha256:f3e0da4ebaef65158d4dfd7d3678aad692f7666877df0002b8a522cdf088f231 \
+    --hash=sha256:f455ee30a9d61d3e1a15abd5068827773d6e4dc513e795f380cdd59932c782d5 \
+    --hash=sha256:f5ef8f42bec47f21d07668a043f077d507e5bf4e668d5c6dfe6aaba89de1a5b8 \
+    --hash=sha256:f69a8e0b033b747bb3e36a44e7732f0c99f7edd5cea723d45bc0d6e95377ffee \
+    --hash=sha256:ff02b6d461a6de369f07ec15e465a88895f3223eb75073ffea56b84d9331f607
+pydantic-settings==2.5.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:2c912e55fd5794a59bf8c832b9de832dcfdf4778d79ff79b708744eed499a907 \
+    --hash=sha256:f90b139682bee4d2065273d5185d71d37ea46cfe57e1b5ae184fc6a0b2484ca0
+pydantic==2.9.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:d155cef71265d1e9807ed1c32b4c8deec042a44a50a4188b25ac67ecd81a9c0f \
+    --hash=sha256:f048cec7b26778210e28a0459867920654d48e5e62db0958433636cde4254f12
 pydyf==0.8.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:901186a2e9f897108139426a6486f5225bdcc9b70be2ec965f25111e42f8ac5d \
     --hash=sha256:b22b1ef016141b54941ad66ed4e036a7bdff39c0b360993b283875c3f854dd9a
@@ -984,9 +984,9 @@ wrapt==1.16.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d \
     --hash=sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a \
     --hash=sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4
-zipp==3.19.2 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:bf1dcf6450f873a13e952a29504887c89e6de7506209e5b1bcc3460135d4de19 \
-    --hash=sha256:f091755f667055f2d02b32c53771a7a6c8b47e1fdbc4b72a8b9072b3eef8015c
+zipp==3.20.2 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350 \
+    --hash=sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29
 zopfli==0.2.3 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:0574372283befa5af98fb31407e1fe6822f2f9c437ef69e7fa260e49022d8a65 \
     --hash=sha256:082f030b2b7d6d4597ac517816e499c63b92130aa8f4f74a3788ebaa5770f974 \
diff --git a/rocky/rocky/bytes_client.py b/rocky/rocky/bytes_client.py
index 837d586ebc9..839e9444a6f 100644
--- a/rocky/rocky/bytes_client.py
+++ b/rocky/rocky/bytes_client.py
@@ -1,4 +1,5 @@
 import uuid
+from base64 import b64encode
 from collections.abc import Set
 from datetime import datetime, timezone
 
@@ -27,11 +28,11 @@ def health(self) -> ServiceHealth:
         response = self.session.get("/health")
         response.raise_for_status()
 
-        return ServiceHealth.parse_obj(response.json())
+        return ServiceHealth.model_validate(response.json())
 
     @staticmethod
     def raw_from_declarations(declarations: list[Declaration]):
-        json_string = f"[{','.join([declaration.json() for declaration in declarations])}]"
+        json_string = f"[{','.join([declaration.model_dump_json() for declaration in declarations])}]"
 
         return json_string.encode("utf-8")
 
@@ -113,15 +114,25 @@ def _save_normalizer_meta(self, normalizer_meta: NormalizerMeta) -> None:
         response.raise_for_status()
 
     def _save_raw(self, boefje_meta_id: uuid.UUID, raw: bytes, mime_types: Set[str] = frozenset()) -> str:
+        file_name = "raw"  # The name provides a key for all ids returned, so this is arbitrary as we only upload 1 file
+
         response = self.session.post(
             "/bytes/raw",
-            content=raw,
-            headers={"content-type": "application/octet-stream"},
-            params={"mime_types": list(mime_types), "boefje_meta_id": str(boefje_meta_id)},
+            json={
+                "files": [
+                    {
+                        "name": file_name,
+                        "content": b64encode(raw).decode(),
+                        "tags": list(mime_types),
+                    }
+                ]
+            },
+            params={"boefje_meta_id": str(boefje_meta_id)},
         )
 
         response.raise_for_status()
-        return response.json()["id"]
+
+        return response.json()[file_name]
 
     def get_raw(self, raw_id: str) -> bytes:
         # Note: we assume organization permissions are handled before requesting raw data.
diff --git a/rocky/rocky/locale/de/LC_MESSAGES/django.po b/rocky/rocky/locale/de/LC_MESSAGES/django.po
index e76c5abc371..631023f8bd4 100644
--- a/rocky/rocky/locale/de/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/de/LC_MESSAGES/django.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # alster <alsternerd@users.noreply.hosted.weblate.org>, 2024.
 # LibreTranslate <noreply-mt-libretranslate@weblate.org>, 2024.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: 2024-07-17 09:09+0000\n"
 "Last-Translator: LibreTranslate <noreply-mt-libretranslate@weblate.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/openkat/nl-kat-"
@@ -28,13 +29,13 @@ msgid "Important dates"
 msgstr "Wichtige Daten"
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -345,6 +346,10 @@ msgstr ""
 msgid "date joined"
 msgstr "Beitrittsdatum"
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr "Name"
@@ -625,7 +630,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -646,7 +650,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -654,11 +671,15 @@ msgid "Show all"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr ""
 
@@ -679,7 +700,6 @@ msgid "Sorting options"
 msgstr ""
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr ""
 
@@ -697,8 +717,9 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
@@ -714,21 +735,11 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr ""
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr ""
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -747,19 +758,80 @@ msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr ""
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr ""
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -800,8 +872,8 @@ msgstr ""
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr ""
@@ -861,9 +933,6 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr ""
@@ -887,6 +956,17 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr ""
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -906,6 +986,7 @@ msgstr ""
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr ""
@@ -923,6 +1004,30 @@ msgstr ""
 msgid "You don't have permission to enable"
 msgstr ""
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr ""
@@ -1018,7 +1123,6 @@ msgid "Required settings"
 msgstr "Erforderliche Einstellungen"
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1029,6 +1133,23 @@ msgstr "Hinzufügen"
 msgid "Required for:"
 msgstr "Erforderlich für:"
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr "Plugins Übersicht:"
@@ -1058,11 +1179,6 @@ msgstr "Aktionen"
 msgid "Plugins Navigation"
 msgstr "Plugins-Navigation"
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr "Alle"
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1075,6 +1191,155 @@ msgstr "Boefjes"
 msgid "Normalizers"
 msgstr "Normalisierer"
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr "Alle"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1160,48 +1425,32 @@ msgstr ""
 "löschen wollen?"
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr "Löschen"
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr " Details"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr "Übersicht der Einstellungen"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr "Erforderlich"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr "Aktion"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
-msgstr "Nicht gesetzt"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
-msgstr "Ja"
+msgid "Configure Settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr "Nein"
+msgid "Overview of settings"
+msgstr "Übersicht der Einstellungen"
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
-msgstr "Bearbeiten"
+msgid "Variable"
+msgstr ""
 
 #: katalogus/views/change_clearance_level.py
 msgid "Session has terminated, please select objects again."
@@ -1241,21 +1490,25 @@ msgid "{} '{}' disabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
+msgid "{} '{}' enabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "{} '{}' enabled."
+msgid ""
+"Your clearance level is not set. Go to your profile page to see your "
+"clearance or contact the administrator to set a clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
-"Your clearance level is not set. Go to your profile page to see your "
-"clearance or contact the administrator to set a clearance level."
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
@@ -1951,6 +2204,10 @@ msgstr "URL"
 msgid "Type"
 msgstr "Typ"
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr ""
@@ -2303,8 +2560,76 @@ msgstr ""
 msgid "Filter by OOI types"
 msgstr ""
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
@@ -2471,8 +2796,6 @@ msgid "Export"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr ""
 
@@ -2825,10 +3148,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2843,6 +3162,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr "Ja"
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr "Nein"
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2880,30 +3207,6 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr ""
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -2934,6 +3237,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr ""
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3375,15 +3686,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr ""
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3460,13 +3762,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr ""
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3538,67 +3833,19 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3656,12 +3903,61 @@ msgid ""
 "the other."
 msgstr ""
 
-#: reports/templates/partials/report_introduction.html
+#: reports/templates/partials/report_introduction.html
+msgid ""
+"This report gives an overview of the current state of security for your "
+"organisation for the selected date. The summary section provides an overview "
+"of the selected systems (objects), plugins and reports. This is followed "
+"with the findings for each report."
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
 msgid ""
-"This report gives an overview of the current state of security for your "
-"organisation for the selected date. The summary section provides an overview "
-"of the selected systems (objects), plugins and reports. This is followed "
-"with the findings for each report."
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
 msgstr ""
 
 #: reports/templates/partials/report_navigation.html
@@ -3672,13 +3968,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3693,17 +3987,6 @@ msgstr[1] ""
 msgid "Select which objects you want to include in your report."
 msgstr ""
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr ""
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr ""
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr ""
@@ -3739,9 +4022,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr ""
 
@@ -3766,11 +4048,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3808,11 +4086,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3820,15 +4098,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3837,6 +4119,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3852,7 +4138,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -3888,6 +4173,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -3900,6 +4189,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -3927,11 +4221,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -4094,47 +4383,48 @@ msgstr ""
 msgid "Save report"
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -4171,6 +4461,28 @@ msgstr ""
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr ""
@@ -4276,11 +4588,11 @@ msgstr ""
 msgid "Please explain how to reproduce your finding"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr ""
 
@@ -4308,6 +4620,14 @@ msgstr ""
 msgid "Filter by muted findings"
 msgstr ""
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr ""
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr ""
@@ -4382,10 +4702,6 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr ""
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr ""
@@ -4442,6 +4758,10 @@ msgstr ""
 msgid "Add the date and time of your finding (UTC)"
 msgstr ""
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4449,6 +4769,55 @@ msgid ""
 "the view to represent that moment in time."
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
@@ -4515,6 +4884,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr ""
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr ""
@@ -4538,7 +4915,6 @@ msgstr ""
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr ""
@@ -4599,11 +4975,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4771,6 +5147,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr ""
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -5043,6 +5423,10 @@ msgstr ""
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -5089,11 +5473,14 @@ msgstr ""
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr ""
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr ""
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -5121,6 +5508,10 @@ msgid ""
 "start scans."
 msgstr ""
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr ""
@@ -5374,6 +5765,11 @@ msgstr ""
 msgid "Total findings:"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr ""
@@ -5402,6 +5798,10 @@ msgstr ""
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5498,31 +5898,6 @@ msgid ""
 "deleted and is no longer available."
 msgstr ""
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr ""
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr ""
@@ -5551,14 +5926,6 @@ msgstr ""
 msgid "shows the same objects."
 msgstr ""
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr ""
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5607,6 +5974,10 @@ msgstr ""
 msgid "Save organization"
 msgstr ""
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr ""
@@ -5877,12 +6248,6 @@ msgstr ""
 msgid "Close explanation"
 msgstr ""
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr ""
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -5960,10 +6325,6 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr ""
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -5981,7 +6342,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -6142,10 +6503,6 @@ msgstr ""
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6223,6 +6580,17 @@ msgstr ""
 msgid "Input object"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr ""
@@ -6231,12 +6599,20 @@ msgstr ""
 msgid "List of tasks for boefjes"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr ""
@@ -6253,6 +6629,10 @@ msgstr ""
 msgid "Boefje input OOI"
 msgstr ""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6295,14 +6675,6 @@ msgstr ""
 msgid "Download task data"
 msgstr ""
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr ""
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr ""
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr ""
@@ -6542,6 +6914,15 @@ msgstr ""
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr ""
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr ""
@@ -6679,22 +7060,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr ""
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr ""
@@ -6703,6 +7068,10 @@ msgstr ""
 msgid "Graph Visualisation"
 msgstr ""
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr ""
@@ -6835,8 +7204,8 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr ""
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
 msgstr ""
 
 #: rocky/views/scheduler.py
@@ -6846,6 +7215,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
@@ -6893,5 +7271,17 @@ msgstr ""
 msgid "Raw file successfully added."
 msgstr ""
 
+#~ msgid " Details"
+#~ msgstr " Details"
+
+#~ msgid "Required"
+#~ msgstr "Erforderlich"
+
+#~ msgid "Action"
+#~ msgstr "Aktion"
+
+#~ msgid "Unset"
+#~ msgstr "Nicht gesetzt"
+
 #~ msgid "Please select an OOI to start scan."
 #~ msgstr "Bitte wählen Sie einen OOI, um den Scan zu starten."
diff --git a/rocky/rocky/locale/django.pot b/rocky/rocky/locale/django.pot
index 8d7603aad8a..52c6a62fd8b 100644
--- a/rocky/rocky/locale/django.pot
+++ b/rocky/rocky/locale/django.pot
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: reports/forms.py
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-09-05 08:44+0000\n"
+"POT-Creation-Date: 2024-10-02 08:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,13 +28,14 @@ msgid "Important dates"
 msgstr ""
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/scheduled_reports_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -317,6 +319,10 @@ msgstr ""
 msgid "date joined"
 msgstr ""
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr ""
@@ -595,7 +601,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -604,12 +623,14 @@ msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
 #: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
 #: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr ""
 
@@ -647,8 +668,9 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
@@ -665,21 +687,10 @@ msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr ""
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr ""
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -709,10 +720,69 @@ msgstr ""
 msgid "%(plugin_name)s can produce the following output:"
 msgstr ""
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr ""
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -748,12 +818,14 @@ msgstr ""
 #: reports/templates/partials/report_ooi_list.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/summary/ooi_selection.html
+#: rocky/templates/oois/ooi_list.html
 msgid "Object"
 msgstr ""
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_list.html
 #: rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
@@ -837,6 +909,17 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr ""
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -990,7 +1073,6 @@ msgid "Required settings"
 msgstr ""
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1007,6 +1089,7 @@ msgstr ""
 
 #: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
 #: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/scheduled_reports_table.html
 msgid "Report types"
 msgstr ""
 
@@ -1064,6 +1147,153 @@ msgstr ""
 msgid "All"
 msgstr ""
 
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/report_overview/scheduled_reports_table.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/report_overview/scheduled_reports_table.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/scheduled_reports_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1123,47 +1353,31 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
+msgid "Configure Settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
+msgid "Overview of settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
+msgid "Variable"
 msgstr ""
 
 #: katalogus/views/change_clearance_level.py
@@ -1199,21 +1413,25 @@ msgid "{} '{}' disabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
+msgid "{} '{}' enabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "{} '{}' enabled."
+msgid ""
+"Your clearance level is not set. Go to your profile page to see your "
+"clearance or contact the administrator to set a clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
-"Your clearance level is not set. Go to your profile page to see your "
-"clearance or contact the administrator to set a clearance level."
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
@@ -1803,6 +2021,7 @@ msgstr ""
 #: reports/report_types/dns_report/report.html
 #: reports/templates/partials/report_ooi_list.html
 #: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
+#: rocky/templates/oois/ooi_list.html
 #: rocky/templates/partials/elements/ooi_tree_condensed_table.html
 #: rocky/templates/partials/explanations.html
 #: rocky/templates/partials/ooi_detail_related_object.html
@@ -2166,6 +2385,78 @@ msgstr ""
 msgid "Filter by OOI types"
 msgstr ""
 
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
+msgstr ""
+
 #: reports/report_types/aggregate_organisation_report/appendix.html
 #: reports/report_types/multi_organization_report/appendix.html
 #: reports/templates/partials/report_sidemenu.html
@@ -2189,6 +2480,7 @@ msgstr ""
 #: reports/report_types/aggregate_organisation_report/appendix.html
 #: reports/templates/partials/plugin_overview_table.html
 #: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/scheduled_reports_table.html
 #: reports/templates/report_overview/subreports_table.html
 #: reports/templates/summary/report_asset_overview.html
 msgid "Report type"
@@ -2330,8 +2622,6 @@ msgid "Export"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr ""
 
@@ -2684,10 +2974,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2702,6 +2988,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr ""
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr ""
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2739,30 +3033,6 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr ""
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -2793,6 +3063,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr ""
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3234,15 +3512,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr ""
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3319,13 +3588,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr ""
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3368,81 +3630,49 @@ msgstr ""
 msgid "Offers HTTPS"
 msgstr ""
 
-#: reports/report_types/web_system_report/report.html
-msgid "Has a Security.txt"
-msgstr ""
-
-#: reports/report_types/web_system_report/report.html
-msgid "Has a certificate"
-msgstr ""
-
-#: reports/report_types/web_system_report/report.html
-msgid "Certificate is not expired"
-msgstr ""
-
-#: reports/report_types/web_system_report/report.html
-msgid "Certificate is not expiring soon"
-msgstr ""
-
-#: reports/report_types/web_system_report/report.html
-msgid "No webservers have been found on this system."
-msgstr ""
-
-#: reports/report_types/web_system_report/report.py
-msgid "Web System Report"
-msgstr ""
-
-#: reports/report_types/web_system_report/report.py
-msgid "Web System Reports check web systems on basic security standards."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid ""
-"Give your report a custom name and optionally add the reports' reference "
-"date to the name. To do so you can select a standard option or use a <a "
-"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
-"the report name."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
+#: reports/report_types/web_system_report/report.html
+msgid "Has a Security.txt"
 msgstr ""
 
-#: reports/templates/partials/export_report_settings.html
-msgid "(Required)"
+#: reports/report_types/web_system_report/report.html
+msgid "Has a certificate"
 msgstr ""
 
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
+#: reports/report_types/web_system_report/report.html
+msgid "Certificate is not expired"
 msgstr ""
 
-#: reports/templates/partials/export_report_settings.html
-#: rocky/views/scan_profile.py
-msgid "Reset"
+#: reports/report_types/web_system_report/report.html
+msgid "Certificate is not expiring soon"
 msgstr ""
 
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
+#: reports/report_types/web_system_report/report.html
+msgid "No webservers have been found on this system."
 msgstr ""
 
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
+#: reports/report_types/web_system_report/report.py
+msgid "Web System Report"
+msgstr ""
+
+#: reports/report_types/web_system_report/report.py
+msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Week"
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Month"
+msgid ""
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Year"
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3508,6 +3738,55 @@ msgid ""
 "with the findings for each report."
 msgstr ""
 
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid ""
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
+msgstr ""
+
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr ""
@@ -3516,13 +3795,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3572,14 +3849,14 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr ""
 
 #: reports/templates/partials/report_ooi_list.html
 #: reports/templates/summary/ooi_selection.html
+#: rocky/templates/oois/ooi_list.html
 msgid "Clearance type"
 msgstr ""
 
@@ -3599,6 +3876,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3636,11 +3914,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3648,15 +3926,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3665,6 +3947,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3680,7 +3966,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -3760,15 +4045,11 @@ msgid "Input Objects"
 msgstr ""
 
 #: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/scheduled_reports_table.html
 #: reports/templates/report_overview/subreports_table.html
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -3819,23 +4100,55 @@ msgid "Overview of reports"
 msgstr ""
 
 #: reports/templates/report_overview/report_overview_navigation.html
-msgid "Recent"
+msgid "Scheduled"
 msgstr ""
 
 #: reports/templates/report_overview/report_overview_navigation.html
-msgid "Presets"
+msgid "History"
 msgstr ""
 
-#: reports/templates/report_overview/report_overview_navigation.html
-msgid "Scheduled"
+#: reports/templates/report_overview/scheduled_reports.html
+msgid "Scheduled reports"
 msgstr ""
 
-#: reports/templates/report_overview/report_overview_navigation.html
-msgid "Folders"
+#: reports/templates/report_overview/scheduled_reports.html
+msgid "View your scheduled reports."
 msgstr ""
 
-#: reports/templates/report_overview/report_overview_navigation.html
-msgid "History"
+#: reports/templates/report_overview/scheduled_reports.html
+#, python-format
+msgid "Showing %(length)s scheduled reports"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Scheduled reports:"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Report Name"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Subreport Name"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Scheduled for"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Scheduled Reports:"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+#: reports/templates/report_overview/subreports_table.html
+#: rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Input Object"
+msgstr ""
+
+#: reports/templates/report_overview/scheduled_reports_table.html
+msgid "Show report details"
 msgstr ""
 
 #: reports/templates/report_overview/subreports.html
@@ -3860,12 +4173,6 @@ msgstr ""
 msgid "Subreports:"
 msgstr ""
 
-#: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/tasks/boefjes.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Input Object"
-msgstr ""
-
 #: reports/templates/summary/report_asset_overview.html
 msgid ""
 "The objects listed in the table below were used to generate this report. For "
@@ -3935,43 +4242,38 @@ msgstr ""
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/base.py reports/views/multi_report.py
-msgid "Select at least one report type to proceed."
-msgstr ""
-
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
+msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-msgid "Week %W, %Y"
-msgstr ""
-
-#: reports/views/generate_report.py
-msgid "Empty name should not be possible."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
 #: reports/views/mixins.py
 msgid ""
 "No data could be found for %(report_types). Object(s) did not exist on "
@@ -4014,6 +4316,28 @@ msgstr ""
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours. For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr ""
@@ -4300,6 +4624,55 @@ msgid ""
 "the view to represent that moment in time."
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
@@ -4456,6 +4829,10 @@ msgstr ""
 msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
+#: rocky/scheduler.py
+msgid "Schedule list: "
+msgstr ""
+
 #: rocky/scheduler.py
 msgid "Task list: "
 msgstr ""
@@ -4957,7 +5334,8 @@ msgstr ""
 msgid "Crisis room"
 msgstr ""
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -4985,6 +5363,10 @@ msgid ""
 "start scans."
 msgstr ""
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr ""
@@ -5313,6 +5695,14 @@ msgid ""
 "object for additional information."
 msgstr ""
 
+#: rocky/templates/oois/ooi_list.html
+msgid "Objects "
+msgstr ""
+
+#: rocky/templates/oois/ooi_list.html
+msgid "column headers with buttons are sortable"
+msgstr ""
+
 #: rocky/templates/oois/ooi_list.html
 msgid "Delete object(s)"
 msgstr ""
@@ -5371,31 +5761,6 @@ msgid ""
 "deleted and is no longer available."
 msgstr ""
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr ""
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr ""
@@ -5746,12 +6111,6 @@ msgstr ""
 msgid "Close explanation"
 msgstr ""
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr ""
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -5829,10 +6188,6 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr ""
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -5850,7 +6205,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -6088,6 +6443,17 @@ msgstr ""
 msgid "Input object"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr ""
@@ -6126,6 +6492,10 @@ msgstr ""
 msgid "Boefje input OOI"
 msgstr ""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6553,22 +6923,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr ""
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr ""
@@ -6593,6 +6947,10 @@ msgstr ""
 msgid "Clearance type: "
 msgstr ""
 
+#: rocky/views/ooi_view.py
+msgid "Searching for: "
+msgstr ""
+
 #: rocky/views/organization_add.py
 msgid "Setup"
 msgstr ""
@@ -6713,6 +7071,10 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr ""
 
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
+msgstr ""
+
 #: rocky/views/scheduler.py
 msgid ""
 "Your task is scheduled and will soon be started in the background. Results "
diff --git a/rocky/rocky/locale/en@pirate/LC_MESSAGES/django.po b/rocky/rocky/locale/en@pirate/LC_MESSAGES/django.po
index d3c74e2404d..0e748242577 100644
--- a/rocky/rocky/locale/en@pirate/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/en@pirate/LC_MESSAGES/django.po
@@ -2,11 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # jan klopper <jan@underdark.nl>, 2023.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: 2023-11-18 13:03+0000\n"
 "Last-Translator: jan klopper <jan@underdark.nl>\n"
 "Language-Team: English (Pirate) <https://hosted.weblate.org/projects/openkat/"
@@ -27,13 +28,13 @@ msgid "Important dates"
 msgstr ""
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -318,6 +319,10 @@ msgstr ""
 msgid "date joined"
 msgstr ""
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr ""
@@ -576,7 +581,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -597,7 +601,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -605,11 +622,15 @@ msgid "Show all"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr ""
 
@@ -630,7 +651,6 @@ msgid "Sorting options"
 msgstr ""
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr ""
 
@@ -648,8 +668,9 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
@@ -665,21 +686,11 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr ""
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr ""
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -698,19 +709,80 @@ msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr ""
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr ""
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -751,8 +823,8 @@ msgstr ""
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr ""
@@ -812,9 +884,6 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr ""
@@ -838,6 +907,17 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr ""
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -857,6 +937,7 @@ msgstr ""
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr ""
@@ -874,6 +955,30 @@ msgstr ""
 msgid "You don't have permission to enable"
 msgstr ""
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr ""
@@ -966,7 +1071,6 @@ msgid "Required settings"
 msgstr ""
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -977,6 +1081,23 @@ msgstr ""
 msgid "Required for:"
 msgstr ""
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr ""
@@ -1006,11 +1127,6 @@ msgstr ""
 msgid "Plugins Navigation"
 msgstr ""
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr ""
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1023,6 +1139,155 @@ msgstr ""
 msgid "Normalizers"
 msgstr ""
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1082,47 +1347,31 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
+msgid "Configure Settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
+msgid "Overview of settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
+msgid "Variable"
 msgstr ""
 
 #: katalogus/views/change_clearance_level.py
@@ -1158,21 +1407,25 @@ msgid "{} '{}' disabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
+msgid "{} '{}' enabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "{} '{}' enabled."
+msgid ""
+"Your clearance level is not set. Go to your profile page to see your "
+"clearance or contact the administrator to set a clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
-"Your clearance level is not set. Go to your profile page to see your "
-"clearance or contact the administrator to set a clearance level."
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
@@ -1769,6 +2022,10 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr ""
@@ -2121,8 +2378,76 @@ msgstr ""
 msgid "Filter by OOI types"
 msgstr ""
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
@@ -2289,8 +2614,6 @@ msgid "Export"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr ""
 
@@ -2643,10 +2966,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2661,6 +2980,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr ""
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr ""
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2698,30 +3025,6 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr ""
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -2752,6 +3055,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr ""
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3193,15 +3504,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr ""
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3278,13 +3580,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr ""
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3356,67 +3651,19 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3468,18 +3715,67 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
-#: reports/templates/partials/report_header.html
-msgid ""
-"All selected report types for the selected objects are displayed one below "
-"the other."
+#: reports/templates/partials/report_header.html
+msgid ""
+"All selected report types for the selected objects are displayed one below "
+"the other."
+msgstr ""
+
+#: reports/templates/partials/report_introduction.html
+msgid ""
+"This report gives an overview of the current state of security for your "
+"organisation for the selected date. The summary section provides an overview "
+"of the selected systems (objects), plugins and reports. This is followed "
+"with the findings for each report."
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
 msgstr ""
 
-#: reports/templates/partials/report_introduction.html
+#: reports/templates/partials/report_names_header.html
 msgid ""
-"This report gives an overview of the current state of security for your "
-"organisation for the selected date. The summary section provides an overview "
-"of the selected systems (objects), plugins and reports. This is followed "
-"with the findings for each report."
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
 msgstr ""
 
 #: reports/templates/partials/report_navigation.html
@@ -3490,13 +3786,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3511,17 +3805,6 @@ msgstr[1] ""
 msgid "Select which objects you want to include in your report."
 msgstr ""
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr ""
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr ""
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr ""
@@ -3557,9 +3840,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr ""
 
@@ -3584,11 +3866,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3626,11 +3904,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3638,15 +3916,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3655,6 +3937,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3670,7 +3956,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -3706,6 +3991,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -3718,6 +4007,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -3745,11 +4039,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -3912,47 +4201,48 @@ msgstr ""
 msgid "Save report"
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -3989,6 +4279,28 @@ msgstr ""
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr ""
@@ -4094,11 +4406,11 @@ msgstr ""
 msgid "Please explain how to reproduce your finding"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr ""
 
@@ -4126,6 +4438,14 @@ msgstr ""
 msgid "Filter by muted findings"
 msgstr ""
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr ""
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr ""
@@ -4200,10 +4520,6 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr ""
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr ""
@@ -4260,6 +4576,10 @@ msgstr ""
 msgid "Add the date and time of your finding (UTC)"
 msgstr ""
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4267,6 +4587,55 @@ msgid ""
 "the view to represent that moment in time."
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
@@ -4333,6 +4702,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr ""
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr ""
@@ -4356,7 +4733,6 @@ msgstr ""
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr ""
@@ -4417,11 +4793,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4589,6 +4965,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr ""
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -4861,6 +5241,10 @@ msgstr ""
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -4907,11 +5291,14 @@ msgstr ""
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr ""
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr ""
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -4939,6 +5326,10 @@ msgid ""
 "start scans."
 msgstr ""
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr ""
@@ -5192,6 +5583,11 @@ msgstr ""
 msgid "Total findings:"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr ""
@@ -5220,6 +5616,10 @@ msgstr ""
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5316,31 +5716,6 @@ msgid ""
 "deleted and is no longer available."
 msgstr ""
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr ""
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr ""
@@ -5369,14 +5744,6 @@ msgstr ""
 msgid "shows the same objects."
 msgstr ""
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr ""
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5425,6 +5792,10 @@ msgstr ""
 msgid "Save organization"
 msgstr ""
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr ""
@@ -5695,12 +6066,6 @@ msgstr ""
 msgid "Close explanation"
 msgstr ""
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr ""
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -5778,10 +6143,6 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr ""
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -5799,7 +6160,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -5960,10 +6321,6 @@ msgstr ""
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6041,6 +6398,17 @@ msgstr ""
 msgid "Input object"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr ""
@@ -6049,12 +6417,20 @@ msgstr ""
 msgid "List of tasks for boefjes"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr ""
@@ -6071,6 +6447,10 @@ msgstr ""
 msgid "Boefje input OOI"
 msgstr ""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6113,14 +6493,6 @@ msgstr ""
 msgid "Download task data"
 msgstr ""
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr ""
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr ""
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr ""
@@ -6360,6 +6732,15 @@ msgstr ""
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr ""
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr ""
@@ -6497,22 +6878,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr ""
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr ""
@@ -6521,6 +6886,10 @@ msgstr ""
 msgid "Graph Visualisation"
 msgstr ""
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr ""
@@ -6653,8 +7022,8 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr ""
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
 msgstr ""
 
 #: rocky/views/scheduler.py
@@ -6664,6 +7033,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
diff --git a/rocky/rocky/locale/fr/LC_MESSAGES/django.po b/rocky/rocky/locale/fr/LC_MESSAGES/django.po
index 4c4546e71e3..91a83efb671 100644
--- a/rocky/rocky/locale/fr/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/fr/LC_MESSAGES/django.po
@@ -2,11 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # jan klopper <jan@underdark.nl>, 2023.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -25,13 +26,13 @@ msgid "Important dates"
 msgstr ""
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -315,6 +316,10 @@ msgstr ""
 msgid "date joined"
 msgstr ""
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr ""
@@ -573,7 +578,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -594,7 +598,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -602,11 +619,15 @@ msgid "Show all"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr ""
 
@@ -627,7 +648,6 @@ msgid "Sorting options"
 msgstr ""
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr ""
 
@@ -645,8 +665,9 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
@@ -662,21 +683,11 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr ""
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr ""
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -695,19 +706,80 @@ msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr ""
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr ""
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr ""
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -748,8 +820,8 @@ msgstr ""
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr ""
@@ -809,9 +881,6 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr ""
@@ -835,6 +904,17 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr ""
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -854,6 +934,7 @@ msgstr ""
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr ""
@@ -871,6 +952,30 @@ msgstr ""
 msgid "You don't have permission to enable"
 msgstr ""
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr ""
@@ -963,7 +1068,6 @@ msgid "Required settings"
 msgstr ""
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -974,6 +1078,23 @@ msgstr ""
 msgid "Required for:"
 msgstr ""
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr ""
@@ -1003,11 +1124,6 @@ msgstr ""
 msgid "Plugins Navigation"
 msgstr ""
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr ""
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1020,6 +1136,155 @@ msgstr ""
 msgid "Normalizers"
 msgstr ""
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1079,47 +1344,31 @@ msgid ""
 msgstr ""
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr ""
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
+msgid "Configure Settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
+msgid "Overview of settings"
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
+msgid "Variable"
 msgstr ""
 
 #: katalogus/views/change_clearance_level.py
@@ -1155,21 +1404,25 @@ msgid "{} '{}' disabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
+msgid "{} '{}' enabled."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
-msgid "{} '{}' enabled."
+msgid ""
+"Your clearance level is not set. Go to your profile page to see your "
+"clearance or contact the administrator to set a clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
-"Your clearance level is not set. Go to your profile page to see your "
-"clearance or contact the administrator to set a clearance level."
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
 msgstr ""
 
 #: katalogus/views/plugin_enable_disable.py
@@ -1766,6 +2019,10 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr ""
@@ -2118,8 +2375,76 @@ msgstr ""
 msgid "Filter by OOI types"
 msgstr ""
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
@@ -2286,8 +2611,6 @@ msgid "Export"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr ""
 
@@ -2640,10 +2963,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2658,6 +2977,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr ""
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr ""
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2695,30 +3022,6 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr ""
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -2749,6 +3052,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr ""
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3190,15 +3501,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr ""
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3275,13 +3577,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr ""
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3353,67 +3648,19 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3465,18 +3712,67 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
-#: reports/templates/partials/report_header.html
-msgid ""
-"All selected report types for the selected objects are displayed one below "
-"the other."
+#: reports/templates/partials/report_header.html
+msgid ""
+"All selected report types for the selected objects are displayed one below "
+"the other."
+msgstr ""
+
+#: reports/templates/partials/report_introduction.html
+msgid ""
+"This report gives an overview of the current state of security for your "
+"organisation for the selected date. The summary section provides an overview "
+"of the selected systems (objects), plugins and reports. This is followed "
+"with the findings for each report."
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
 msgstr ""
 
-#: reports/templates/partials/report_introduction.html
+#: reports/templates/partials/report_names_header.html
 msgid ""
-"This report gives an overview of the current state of security for your "
-"organisation for the selected date. The summary section provides an overview "
-"of the selected systems (objects), plugins and reports. This is followed "
-"with the findings for each report."
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
 msgstr ""
 
 #: reports/templates/partials/report_navigation.html
@@ -3487,13 +3783,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3508,17 +3802,6 @@ msgstr[1] ""
 msgid "Select which objects you want to include in your report."
 msgstr ""
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr ""
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr ""
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr ""
@@ -3554,9 +3837,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr ""
 
@@ -3581,11 +3863,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3623,11 +3901,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3635,15 +3913,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3652,6 +3934,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3667,7 +3953,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -3703,6 +3988,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -3715,6 +4004,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -3742,11 +4036,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -3909,47 +4198,48 @@ msgstr ""
 msgid "Save report"
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -3986,6 +4276,28 @@ msgstr ""
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr ""
@@ -4091,11 +4403,11 @@ msgstr ""
 msgid "Please explain how to reproduce your finding"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr ""
 
@@ -4123,6 +4435,14 @@ msgstr ""
 msgid "Filter by muted findings"
 msgstr ""
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr ""
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr ""
@@ -4197,10 +4517,6 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr ""
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr ""
@@ -4257,6 +4573,10 @@ msgstr ""
 msgid "Add the date and time of your finding (UTC)"
 msgstr ""
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4264,6 +4584,55 @@ msgid ""
 "the view to represent that moment in time."
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
@@ -4330,6 +4699,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr ""
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr ""
@@ -4353,7 +4730,6 @@ msgstr ""
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr ""
@@ -4414,11 +4790,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4586,6 +4962,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr ""
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -4858,6 +5238,10 @@ msgstr ""
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -4904,11 +5288,14 @@ msgstr ""
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr ""
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr ""
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -4936,6 +5323,10 @@ msgid ""
 "start scans."
 msgstr ""
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr ""
@@ -5189,6 +5580,11 @@ msgstr ""
 msgid "Total findings:"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr ""
@@ -5217,6 +5613,10 @@ msgstr ""
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5313,31 +5713,6 @@ msgid ""
 "deleted and is no longer available."
 msgstr ""
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr ""
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr ""
@@ -5366,14 +5741,6 @@ msgstr ""
 msgid "shows the same objects."
 msgstr ""
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr ""
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5422,6 +5789,10 @@ msgstr ""
 msgid "Save organization"
 msgstr ""
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr ""
@@ -5692,12 +6063,6 @@ msgstr ""
 msgid "Close explanation"
 msgstr ""
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr ""
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -5775,10 +6140,6 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr ""
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -5796,7 +6157,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -5957,10 +6318,6 @@ msgstr ""
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6038,6 +6395,17 @@ msgstr ""
 msgid "Input object"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr ""
@@ -6046,12 +6414,20 @@ msgstr ""
 msgid "List of tasks for boefjes"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr ""
@@ -6068,6 +6444,10 @@ msgstr ""
 msgid "Boefje input OOI"
 msgstr ""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6110,14 +6490,6 @@ msgstr ""
 msgid "Download task data"
 msgstr ""
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr ""
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr ""
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr ""
@@ -6357,6 +6729,15 @@ msgstr ""
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr ""
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr ""
@@ -6494,22 +6875,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr ""
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr ""
@@ -6518,6 +6883,10 @@ msgstr ""
 msgid "Graph Visualisation"
 msgstr ""
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr ""
@@ -6650,8 +7019,8 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr ""
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
 msgstr ""
 
 #: rocky/views/scheduler.py
@@ -6661,6 +7030,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
diff --git a/rocky/rocky/locale/fy/LC_MESSAGES/django.po b/rocky/rocky/locale/fy/LC_MESSAGES/django.po
index 8934e8ab792..627835ae75a 100644
--- a/rocky/rocky/locale/fy/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/fy/LC_MESSAGES/django.po
@@ -4,12 +4,13 @@
 # jan klopper <jan@underdark.nl>, 2023.
 # Wim Benes <fryskefirefox@gmail.com>, 2024.
 # Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>, 2024.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
-"PO-Revision-Date: 2024-07-05 07:09+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
+"PO-Revision-Date: 2024-10-02 14:16+0000\n"
 "Last-Translator: Wim Benes <fryskefirefox@gmail.com>\n"
 "Language-Team: Frisian <https://hosted.weblate.org/projects/openkat/nl-kat-"
 "coordination/fy/>\n"
@@ -18,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.7-dev\n"
+"X-Generator: Weblate 5.8-dev\n"
 
 #: account/admin.py
 msgid "Permissions"
@@ -29,13 +30,13 @@ msgid "Important dates"
 msgstr "Wichtige datums"
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -342,6 +343,10 @@ msgstr ""
 msgid "date joined"
 msgstr "startdatum"
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr "namme"
@@ -628,7 +633,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -653,20 +657,36 @@ msgstr ""
 "foar mear details."
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
-"Der is in HTTP-flater bard. Kontrolearje de lochboeken foar mear ynformaasje."
 
 #: katalogus/forms/katalogus_filter.py
 msgid "Show all"
 msgstr "Alles toane"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr "Ynskeakele"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr "Utskeakele"
 
@@ -687,7 +707,6 @@ msgid "Sorting options"
 msgstr "Sortearopsjes"
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr "Dit fjild is ferplichte."
 
@@ -708,11 +727,10 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
-"Boefkes sammelje feitlike ynformaasje, bygelyks troch in eksterne scantool, "
-"lykas Nmap te brûken of it gebrûk fan in database, lykas Shodan."
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
 msgid ""
@@ -731,21 +749,11 @@ msgstr ""
 "gegevensset. Se sykje nei spesifike ynsichten en lûke dêr konklúzjes út."
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr "Scannivo"
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr "Omskriuwing"
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -764,19 +772,80 @@ msgstr "%(plugin_name)s hat gjin ynfierobjekten nedich."
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr "Produsearret"
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr "%(plugin_name)s kin it folgjende produsearje:"
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr "Bewurkje"
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr "beskikber"
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -822,8 +891,8 @@ msgstr "Objekt"
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr "Frijwarringsnivo"
@@ -897,9 +966,6 @@ msgstr ""
 "ynstekkerdetailside."
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr "Gean werom"
@@ -923,6 +989,17 @@ msgstr "Ynstekker"
 msgid "Value"
 msgstr "Wearde"
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr "Omskriuwing"
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -942,6 +1019,7 @@ msgstr "Utjouwer:"
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr "Details besjen"
@@ -959,6 +1037,30 @@ msgstr "Utskeakelje"
 msgid "You don't have permission to enable"
 msgstr "Jo hawwe gjin tastimming om yn te skeakeljen"
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr ""
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr "Ynstekkers filterje"
@@ -1066,7 +1168,6 @@ msgid "Required settings"
 msgstr "Ferplichte ynstellingen"
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1077,6 +1178,23 @@ msgstr "Tafoegje"
 msgid "Required for:"
 msgstr "Fereaske foar:"
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr "Rapporttypen"
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr "Oersjoch ynstekkers:"
@@ -1106,11 +1224,6 @@ msgstr "Aksjes"
 msgid "Plugins Navigation"
 msgstr "Ynstekkersnavigaasje"
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr "Alle"
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1123,6 +1236,155 @@ msgstr "Boefkes"
 msgid "Normalizers"
 msgstr "Normalizers"
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr "Alle"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1208,48 +1470,32 @@ msgstr ""
 "fuortsmite wolle?"
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr "Fuortsmite"
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr " Details"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr "Ynstellingenoersjoch"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr "Ferplichte"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr "Aksje"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
-msgstr "Net ynfolle"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
-msgstr "Ja"
+msgid "Configure Settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr "Nee"
+msgid "Overview of settings"
+msgstr "Ynstellingenoersjoch"
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
-msgstr "Bewurkje"
+msgid "Variable"
+msgstr ""
 
 #: katalogus/views/change_clearance_level.py
 msgid "Session has terminated, please select objects again."
@@ -1287,18 +1533,16 @@ msgstr ""
 msgid "{} '{}' disabled."
 msgstr "{} ‘{}’ útskeakele."
 
-#: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
-msgstr "Opheljen fan ynstellingen {} mislearre. Is de Katalogus aktyf?"
-
-#: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
-msgstr "Stel foar it ynskeakeljen de fereaske ynstellingen yn foar ‘{}’."
-
 #: katalogus/views/plugin_enable_disable.py
 msgid "{} '{}' enabled."
 msgstr "{} ‘{}’ ynskeakele."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
 "Your clearance level is not set. Go to your profile page to see your "
@@ -1308,6 +1552,12 @@ msgstr ""
 "te kontrolearjen of nim kontakt op mei de behearder om in frijwarringsnivo "
 "yn te stellen."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid "To enable {} you need at least a clearance level of L{}. "
 msgstr ""
@@ -1861,10 +2111,14 @@ msgid ""
 "generate a report. Such as a pentest, a DNS-report or a Mail Report to give "
 "some examples."
 msgstr ""
+"Binnen OpenKAT kinne jo rapporten besjen foar elk fan jo aktuele objekten. "
+"Foar spesifike rapporten kinne jo ien fan de beskikbere rapporttypen kieze "
+"en in rapport generearje. Lykas in pentest, in DNS-rapport of in mailrapport."
 
 #: onboarding/templates/step_2b_choose_report_type.html
 msgid "For this tutorial we will create a DNS-report to get you started."
 msgstr ""
+"Foar dizze útlis sille wy in DNS-rapport kreëarje om jo op wei te helpen."
 
 #: onboarding/templates/step_2b_choose_report_type.html
 msgid ""
@@ -1993,6 +2247,10 @@ msgstr "URL"
 msgid "Type"
 msgstr "Type"
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr "Paad"
@@ -2300,11 +2558,11 @@ msgstr "1: Yntroduksje"
 
 #: onboarding/view_helpers.py
 msgid "2: Choose a report"
-msgstr ""
+msgstr "2: Kies in rapport"
 
 #: onboarding/view_helpers.py
 msgid "3: Setup scan"
-msgstr ""
+msgstr "3: Start de scan"
 
 #: onboarding/view_helpers.py
 msgid "4: Open report"
@@ -2371,9 +2629,77 @@ msgstr "{name} mei sukses oanmakke."
 msgid "Filter by OOI types"
 msgstr "Filterje op OOI-typen"
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
-msgstr "Rapporttypen"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
+msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
 #: reports/report_types/multi_organization_report/appendix.html
@@ -2539,8 +2865,6 @@ msgid "Export"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr ""
 
@@ -2893,10 +3217,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2911,6 +3231,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr "Ja"
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr "Nee"
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2948,30 +3276,6 @@ msgstr ""
 msgid "Details"
 msgstr "Details"
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr ""
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -3002,6 +3306,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr ""
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3222,7 +3534,7 @@ msgstr ""
 #: reports/report_types/multi_organization_report/open_ports.html
 #: reports/templates/summary/service_health.html
 msgid "Services"
-msgstr ""
+msgstr "Services"
 
 #: reports/report_types/multi_organization_report/recommendations.html
 msgid "Overview of recommendations"
@@ -3324,7 +3636,7 @@ msgstr ""
 
 #: reports/report_types/open_ports_report/report.html
 msgid "Hostnames"
-msgstr ""
+msgstr "Hostnammen"
 
 #: reports/report_types/open_ports_report/report.html
 msgid "Direct scan"
@@ -3443,15 +3755,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr ""
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3462,7 +3765,7 @@ msgstr ""
 
 #: reports/report_types/tls_report/report.html
 msgid "Bits"
-msgstr ""
+msgstr "Bits"
 
 #: reports/report_types/tls_report/report.html
 msgid "Key Size"
@@ -3528,13 +3831,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr ""
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3606,74 +3902,26 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Year"
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 #: reports/templates/report_overview/report_overview_header.html
 #: reports/views/generate_report.py
 msgid "Generate report"
-msgstr ""
+msgstr "Rapport generearje"
 
 #: reports/templates/partials/generate_report_sidemenu.html
 #: reports/templates/partials/report_sidemenu.html
@@ -3732,21 +3980,68 @@ msgid ""
 "with the findings for each report."
 msgstr ""
 
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr "(Fereaske)"
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid ""
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
+msgstr ""
+
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr ""
 
 #: reports/templates/partials/report_navigation.html
 msgid "Generate Report"
-msgstr ""
+msgstr "Rapport generearje"
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
-msgstr ""
+msgstr "Rapport aggregearje"
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3758,18 +4053,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: reports/templates/partials/report_ooi_list.html
-msgid "Select which objects you want to include in your report."
-msgstr ""
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr ""
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
+msgid "Select which objects you want to include in your report."
 msgstr ""
 
 #: reports/templates/partials/report_ooi_list.html
@@ -3807,9 +4091,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr "Objekten"
 
@@ -3834,11 +4117,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr "Ynstekkers"
 
@@ -3876,11 +4155,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3888,15 +4167,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3905,6 +4188,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3920,13 +4207,12 @@ msgid "Selected Objects"
 msgstr "Selektearre objekten"
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
 msgid "Used Config Objects"
-msgstr ""
+msgstr "Brûkte konfiguraasjeobjekten"
 
 #: reports/templates/partials/report_types_selection.html
 msgid "Choose report types"
@@ -3956,6 +4242,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -3968,6 +4258,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -3984,7 +4279,7 @@ msgstr ""
 
 #: reports/templates/report_overview/report_history_table.html
 msgid "Reports:"
-msgstr ""
+msgstr "Rapporten:"
 
 #: reports/templates/report_overview/report_history_table.html
 msgid "Input Objects"
@@ -3995,11 +4290,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -4146,7 +4436,7 @@ msgstr "Aggregearje rapport"
 #: reports/views/aggregate_report.py reports/views/generate_report.py
 #: reports/views/multi_report.py
 msgid "Select objects"
-msgstr ""
+msgstr "Selektearje objekten"
 
 #: reports/views/aggregate_report.py reports/views/generate_report.py
 #: reports/views/multi_report.py
@@ -4162,47 +4452,48 @@ msgstr ""
 msgid "Save report"
 msgstr "Rapport bewarje"
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr "Selektearje op syn minst ien OOI om troch te gean."
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -4239,6 +4530,28 @@ msgstr ""
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr ""
@@ -4344,11 +4657,11 @@ msgstr ""
 msgid "Please explain how to reproduce your finding"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr ""
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr ""
 
@@ -4376,6 +4689,14 @@ msgstr ""
 msgid "Filter by muted findings"
 msgstr ""
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr ""
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr ""
@@ -4450,10 +4771,6 @@ msgstr ""
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr ""
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr ""
@@ -4510,6 +4827,10 @@ msgstr ""
 msgid "Add the date and time of your finding (UTC)"
 msgstr ""
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4517,6 +4838,55 @@ msgid ""
 "the view to represent that moment in time."
 msgstr ""
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr ""
@@ -4583,6 +4953,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr ""
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr "De namme fan de organisaasje"
@@ -4606,7 +4984,6 @@ msgstr ""
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr ""
@@ -4667,11 +5044,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4839,6 +5216,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr ""
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -5111,6 +5492,10 @@ msgstr ""
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -5157,11 +5542,14 @@ msgstr ""
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr ""
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr ""
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -5181,7 +5569,7 @@ msgstr ""
 
 #: rocky/templates/indemnification_present.html
 msgid "Indemnification"
-msgstr ""
+msgstr "Frijwarring"
 
 #: rocky/templates/indemnification_present.html
 msgid ""
@@ -5189,6 +5577,10 @@ msgid ""
 "start scans."
 msgstr ""
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr ""
@@ -5442,6 +5834,11 @@ msgstr ""
 msgid "Total findings:"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr ""
@@ -5470,6 +5867,10 @@ msgstr ""
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5566,34 +5967,6 @@ msgid ""
 "deleted and is no longer available."
 msgstr ""
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr ""
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-"Dit binne de befiningen fan in OpenKAT-analyze %(observed_at)s. Klik op in "
-"befining foar mear detaillearre ynformaasje oer it probleem, de oarsprong, "
-"earnst en mooglike oplossingen."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr ""
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr ""
@@ -5622,14 +5995,6 @@ msgstr ""
 msgid "shows the same objects."
 msgstr ""
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr ""
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5678,6 +6043,10 @@ msgstr ""
 msgid "Save organization"
 msgstr ""
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr ""
@@ -5948,12 +6317,6 @@ msgstr ""
 msgid "Close explanation"
 msgstr ""
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr ""
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -6031,10 +6394,6 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr ""
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -6052,7 +6411,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -6213,10 +6572,6 @@ msgstr ""
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6294,6 +6649,17 @@ msgstr ""
 msgid "Input object"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr ""
@@ -6302,12 +6668,20 @@ msgstr ""
 msgid "List of tasks for boefjes"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr ""
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr ""
@@ -6324,6 +6698,10 @@ msgstr "Normalizer"
 msgid "Boefje input OOI"
 msgstr ""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6366,14 +6744,6 @@ msgstr ""
 msgid "Download task data"
 msgstr ""
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr ""
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr ""
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr ""
@@ -6613,6 +6983,15 @@ msgstr ""
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr ""
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr ""
@@ -6758,22 +7137,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr ""
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr ""
@@ -6782,6 +7145,10 @@ msgstr ""
 msgid "Graph Visualisation"
 msgstr ""
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr ""
@@ -6914,8 +7281,8 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr ""
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
 msgstr ""
 
 #: rocky/views/scheduler.py
@@ -6925,6 +7292,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
@@ -6972,6 +7348,46 @@ msgstr ""
 msgid "Raw file successfully added."
 msgstr ""
 
+#~ msgid "A HTTP error occurred. Check logs for more info."
+#~ msgstr ""
+#~ "Der is in HTTP-flater bard. Kontrolearje de lochboeken foar mear "
+#~ "ynformaasje."
+
+#, python-format
+#~ msgid ""
+#~ "These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
+#~ "finding for more detailed information about the issue, its origin, "
+#~ "severity and possible solutions."
+#~ msgstr ""
+#~ "Dit binne de befiningen fan in OpenKAT-analyze %(observed_at)s. Klik op "
+#~ "in befining foar mear detaillearre ynformaasje oer it probleem, de "
+#~ "oarsprong, earnst en mooglike oplossingen."
+
+#~ msgid ""
+#~ "Boefjes gather factual information, such as by calling an external "
+#~ "scanning tool like nmap or using a database like shodan."
+#~ msgstr ""
+#~ "Boefkes sammelje feitlike ynformaasje, bygelyks troch in eksterne "
+#~ "scantool, lykas Nmap te brûken of it gebrûk fan in database, lykas Shodan."
+
+#~ msgid " Details"
+#~ msgstr " Details"
+
+#~ msgid "Required"
+#~ msgstr "Ferplichte"
+
+#~ msgid "Action"
+#~ msgstr "Aksje"
+
+#~ msgid "Unset"
+#~ msgstr "Net ynfolle"
+
+#~ msgid "Failed fetching settings for {}. Is the Katalogus up?"
+#~ msgstr "Opheljen fan ynstellingen {} mislearre. Is de Katalogus aktyf?"
+
+#~ msgid "Before enabling, please set the required settings for '{}'."
+#~ msgstr "Stel foar it ynskeakeljen de fereaske ynstellingen yn foar ‘{}’."
+
 #~ msgid "Select Objects"
 #~ msgstr "Selektearje objekten"
 
diff --git a/rocky/rocky/locale/it/LC_MESSAGES/django.po b/rocky/rocky/locale/it/LC_MESSAGES/django.po
index 9568f85580d..db148544695 100644
--- a/rocky/rocky/locale/it/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/it/LC_MESSAGES/django.po
@@ -1,10 +1,11 @@
 # Brenno de Winter <brenno@dewinter.com>, 2023.
 # Luca Racchetti <razzo1987@gmail.com>, 2023.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: 2023-11-16 20:05+0000\n"
 "Last-Translator: Luca Racchetti <razzo1987@gmail.com>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/openkat/nl-kat-"
@@ -25,13 +26,13 @@ msgid "Important dates"
 msgstr "Date importanti"
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -340,6 +341,10 @@ msgstr ""
 msgid "date joined"
 msgstr "data di registrazione"
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr ""
@@ -620,7 +625,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -643,7 +647,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -651,11 +668,15 @@ msgid "Show all"
 msgstr "Mostra tutto"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr "Abilitato"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr "Disabilitato"
 
@@ -676,7 +697,6 @@ msgid "Sorting options"
 msgstr "Opzioni di ordinamento"
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr "Questo campo è obbligatorio."
 
@@ -697,11 +717,10 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
-"Boefjes raccoglie informazioni reali, ad esempio richiamando uno strumento "
-"di scansione esterno come nmap o utilizzando un database come shodan."
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
 msgid ""
@@ -720,21 +739,11 @@ msgstr ""
 "dati corrente, cercano informazioni specifiche e traggono conclusioni."
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr "Livello di scansione"
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr "Descrizione"
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -755,19 +764,80 @@ msgstr "%(plugin_name)s non ha bisogno di oggetti di input."
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr "Produzione"
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr "%(plugin_name)s può produrre il seguente output:"
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr "Modifica"
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr "disponibile"
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -813,8 +883,8 @@ msgstr "Oggetto"
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr "Livello di autorizzazione"
@@ -892,9 +962,6 @@ msgstr ""
 "pagina dettagli del plugin."
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr "Torna indietro"
@@ -918,6 +985,17 @@ msgstr "Plugin"
 msgid "Value"
 msgstr "Valore"
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr "Descrizione"
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -937,6 +1015,7 @@ msgstr ""
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr "Vedi dettagli"
@@ -955,6 +1034,30 @@ msgstr "Disabilita"
 msgid "You don't have permission to enable"
 msgstr ""
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr "Nascondi filtri"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr "Mostra filtri"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 #, fuzzy
 msgid "Filter plugins"
@@ -1063,7 +1166,6 @@ msgid "Required settings"
 msgstr "Impostazioni richieste"
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1074,6 +1176,23 @@ msgstr "Aggiungi"
 msgid "Required for:"
 msgstr ""
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 #, fuzzy
 msgid "Plugins overview:"
@@ -1108,11 +1227,6 @@ msgstr "Azioni"
 msgid "Plugins Navigation"
 msgstr "Navigazione principale"
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr "Tutto"
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1125,6 +1239,155 @@ msgstr "Boefjes"
 msgid "Normalizers"
 msgstr "Normalizzatori"
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr "Tutto"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr "conferma"
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr "Stato"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr "Chiudi dettagli"
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr "Apri dettagli"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr "spiegazione"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1204,48 +1467,32 @@ msgstr ""
 "%(plugin_name)s?"
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr "Elimina"
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr " Dettagli"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr "Richiesto"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr "Azione"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
-msgstr "Non impostato"
-
-#: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
-msgstr "Sì"
+msgid "Configure Settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr "No"
+msgid "Overview of settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
-msgstr "Modifica"
+msgid "Variable"
+msgstr ""
 
 #: katalogus/views/change_clearance_level.py
 msgid "Session has terminated, please select objects again."
@@ -1287,21 +1534,18 @@ msgstr ""
 "Recupero delle impostazioni del boefje {boefje_name} non riuscito. Katalogus "
 "è attivo?"
 
-#: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
-msgstr "Impossibile recuperare le impostazioni per {}. Il catalogo è attivo?"
-
-#: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
-msgstr ""
-"Prima dell'abilitazione, configurare le impostazioni richieste per '{}'."
-
 #: katalogus/views/plugin_enable_disable.py
 msgid "{} '{}' enabled."
 msgstr ""
 "Recupero delle impostazioni del boefje {boefje_name} non riuscito. Katalogus "
 "è attivo?"
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
 "Your clearance level is not set. Go to your profile page to see your "
@@ -1310,6 +1554,12 @@ msgstr ""
 "Prima di abilitare, impostare le impostazioni richieste per il boefje "
 "'{boefje_name}'."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 #, fuzzy
 msgid "To enable {} you need at least a clearance level of L{}. "
@@ -2007,6 +2257,10 @@ msgstr "URL"
 msgid "Type"
 msgstr "Tipo"
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr "Percorso"
@@ -2458,8 +2712,76 @@ msgstr "{name} creato con successo."
 msgid "Filter by OOI types"
 msgstr "Filtra per tipi di OOI"
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
@@ -2626,8 +2948,6 @@ msgid "Export"
 msgstr "Esporta"
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr "Scarica PDF"
 
@@ -2980,10 +3300,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2998,6 +3314,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr "Sì"
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr "No"
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -3035,30 +3359,6 @@ msgstr "Rilevamento"
 msgid "Details"
 msgstr "Dettagli"
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr "Chiudi dettagli"
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr "Apri dettagli"
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -3089,6 +3389,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr "Fonte"
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3530,15 +3838,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr "Stato"
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3615,13 +3914,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr "Fonte"
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3693,67 +3985,19 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3819,6 +4063,55 @@ msgid ""
 "with the findings for each report."
 msgstr ""
 
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr "Reimposta"
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid ""
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
+msgstr ""
+
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr ""
@@ -3827,13 +4120,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3848,17 +4139,6 @@ msgstr[1] ""
 msgid "Select which objects you want to include in your report."
 msgstr ""
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr "Filtro"
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr "Attualmente filtrato su:"
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr ""
@@ -3894,9 +4174,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr "Oggetti"
 
@@ -3921,11 +4200,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3963,11 +4238,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3975,15 +4250,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3992,6 +4271,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -4007,7 +4290,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -4043,6 +4325,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -4055,6 +4341,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -4082,11 +4373,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -4249,47 +4535,48 @@ msgstr ""
 msgid "Save report"
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -4326,6 +4613,28 @@ msgstr "Data"
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr "KAT-ID"
@@ -4431,11 +4740,11 @@ msgstr "Riproduci il rilevamento"
 msgid "Please explain how to reproduce your finding"
 msgstr "Spiega come riprodurre il tuo rilevamento"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr "Data/Ora (UTC)"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr "Dottore! Vengo dal futuro, sono qui per riportarti indietro!"
 
@@ -4463,6 +4772,14 @@ msgstr "Filtra per gravità"
 msgid "Filter by muted findings"
 msgstr "Filtra per rilevamenti mutati"
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr "Ricerca"
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr "Filtra per tipi"
@@ -4541,10 +4858,6 @@ msgstr "In coda"
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr "Ricerca"
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr "Cerca per nome oggetto"
@@ -4601,6 +4914,10 @@ msgstr "Aggiungi un ID di tipo di rilevamento per riga."
 msgid "Add the date and time of your finding (UTC)"
 msgstr "Aggiungi data e ora del tuo rilevamento (UTC)"
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4611,6 +4928,55 @@ msgstr ""
 "possibile vedere lo stato della tua rete nel tempo. Seleziona una data/ora "
 "per cambiare la visualizzazione e rappresentare quel momento nel tempo."
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr "Profondità dell'albero."
@@ -4683,6 +5049,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr "Carica file raw"
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr "Il nome dell'organizzazione"
@@ -4710,7 +5084,6 @@ msgstr "nuovo"
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr "Membri"
@@ -4775,11 +5148,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4951,6 +5324,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr "Filtro"
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -5228,6 +5605,10 @@ msgstr "Silenzia rilevamenti"
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -5277,11 +5658,14 @@ msgstr "Menu"
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr "Logo di OpenKAT, vai alla homepage di OpenKAT"
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr "Sala di crisi"
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -5311,6 +5695,10 @@ msgstr ""
 "Indennizzo sull'organizzazione presente. Ora puoi aggiungere oggetti e "
 "iniziare scansioni."
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr "Vai a"
@@ -5597,6 +5985,11 @@ msgstr "Vedi i dettagli del rilevamento"
 msgid "Total findings:"
 msgstr "Rilevamenti totali:"
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr "Dichiarazioni"
@@ -5625,6 +6018,10 @@ msgstr "ID Attività"
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5733,36 +6130,6 @@ msgstr ""
 "Non sarai in grado di aggiungere Rilevamenti o altri OOI, questo oggetto è "
 "stato eliminato e non è più disponibile."
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr "Report dei rilevamenti per %(name)s"
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-"Questi sono i risultati di un'analisi OpenKAT effettuata il %(observed_at)s. "
-"Fai clic su una scoperta per ottenere informazioni più dettagliate "
-"sull'argomento, la sua origine, la gravità e possibili soluzioni."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr "Non è stato trovato un report per %(name)s."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-"Forse non è mai esistito, forse semplicemente non esisteva in data "
-"%(observed_at)s <br> Prova altre date!"
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr "Sommario per"
@@ -5791,14 +6158,6 @@ msgstr "di"
 msgid "shows the same objects."
 msgstr "mostra gli stessi oggetti."
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr "Albero degli oggetti"
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5857,6 +6216,10 @@ msgstr "Modifica organizzazione"
 msgid "Save organization"
 msgstr "Salva organizzazione"
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr "Aggiungi nuova organizzazione"
@@ -6140,12 +6503,6 @@ msgstr "Apri spiegazione"
 msgid "Close explanation"
 msgstr "Chiudi spiegazione"
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr "spiegazione"
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -6228,10 +6585,6 @@ msgstr "Pagina successiva"
 msgid "Next"
 msgstr "Successivo"
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr "conferma"
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -6249,7 +6602,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -6417,10 +6770,6 @@ msgstr "Vai al contenuto"
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6523,6 +6872,17 @@ msgstr "Scarica dati meta"
 msgid "Input object"
 msgstr "Oggetto di input"
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr "Non ci sono compiti per boefjes"
@@ -6531,12 +6891,20 @@ msgstr "Non ci sono compiti per boefjes"
 msgid "List of tasks for boefjes"
 msgstr "Elenco dei compiti per boefjes"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr "Data di creazione"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr "Non ci sono compiti per i normalizzatori"
@@ -6553,6 +6921,10 @@ msgstr "Normalizer"
 msgid "Boefje input OOI"
 msgstr "OOI di input Boefje"
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6595,14 +6967,6 @@ msgstr "Ripianifica"
 msgid "Download task data"
 msgstr "Scarica dati del compito"
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr "Nascondi filtri"
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr "Mostra filtri"
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr "Accedi"
@@ -6884,6 +7248,15 @@ msgstr "Automatizza la creazione di oggetti multipli caricando un file CSV."
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr "Automatizza la creazione di oggetti multipli caricando un file raw."
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr "Carica raw"
@@ -7040,26 +7413,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr "Risultato/i mutato/i con successo."
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr "Non è possibile generare un rapporto per un OOI in una data futura."
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr "Rapporto dei risultati"
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-"Generazione del rapporto fallita. Consulta i log di Keiko per ulteriori "
-"informazioni."
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-"Timeout raggiunto durante la generazione del rapporto. Consulta i log di "
-"Keiko per ulteriori informazioni."
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr "Visualizzazione ad albero"
@@ -7068,6 +7421,10 @@ msgstr "Visualizzazione ad albero"
 msgid "Graph Visualisation"
 msgstr "Visualizzazione grafica"
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr "Tipi di OOI: "
@@ -7211,9 +7568,9 @@ msgstr ""
 "Impossibile reimpostare il livello di scansione. Livello di scansione di "
 "{ooi_name} non dichiarato"
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
-msgstr "Reimposta"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
+msgstr ""
 
 #: rocky/views/scheduler.py
 msgid ""
@@ -7222,6 +7579,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
@@ -7276,6 +7642,84 @@ msgstr ""
 msgid "Raw file successfully added."
 msgstr "File raw aggiunto con successo."
 
+#, python-format
+#~ msgid "Findings report for %(name)s"
+#~ msgstr "Report dei rilevamenti per %(name)s"
+
+#, python-format
+#~ msgid ""
+#~ "These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
+#~ "finding for more detailed information about the issue, its origin, "
+#~ "severity and possible solutions."
+#~ msgstr ""
+#~ "Questi sono i risultati di un'analisi OpenKAT effettuata il "
+#~ "%(observed_at)s. Fai clic su una scoperta per ottenere informazioni più "
+#~ "dettagliate sull'argomento, la sua origine, la gravità e possibili "
+#~ "soluzioni."
+
+#, python-format
+#~ msgid "A report for %(name)s wasn't found."
+#~ msgstr "Non è stato trovato un report per %(name)s."
+
+#, python-format
+#~ msgid ""
+#~ "Perhaps it never was, perhaps it just didn't exist on %(observed_at)s "
+#~ "<br> Try some other dates!"
+#~ msgstr ""
+#~ "Forse non è mai esistito, forse semplicemente non esisteva in data "
+#~ "%(observed_at)s <br> Prova altre date!"
+
+#~ msgid "You can't generate a report for an OOI on a date in the future."
+#~ msgstr "Non è possibile generare un rapporto per un OOI in una data futura."
+
+#~ msgid "Findings report"
+#~ msgstr "Rapporto dei risultati"
+
+#~ msgid "Generating report failed. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Generazione del rapporto fallita. Consulta i log di Keiko per ulteriori "
+#~ "informazioni."
+
+#~ msgid ""
+#~ "Timeout reached generating report. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Timeout raggiunto durante la generazione del rapporto. Consulta i log di "
+#~ "Keiko per ulteriori informazioni."
+
+#~ msgid ""
+#~ "Boefjes gather factual information, such as by calling an external "
+#~ "scanning tool like nmap or using a database like shodan."
+#~ msgstr ""
+#~ "Boefjes raccoglie informazioni reali, ad esempio richiamando uno "
+#~ "strumento di scansione esterno come nmap o utilizzando un database come "
+#~ "shodan."
+
+#~ msgid " Details"
+#~ msgstr " Dettagli"
+
+#~ msgid "Required"
+#~ msgstr "Richiesto"
+
+#~ msgid "Action"
+#~ msgstr "Azione"
+
+#~ msgid "Unset"
+#~ msgstr "Non impostato"
+
+#~ msgid "Failed fetching settings for {}. Is the Katalogus up?"
+#~ msgstr ""
+#~ "Impossibile recuperare le impostazioni per {}. Il catalogo è attivo?"
+
+#~ msgid "Before enabling, please set the required settings for '{}'."
+#~ msgstr ""
+#~ "Prima dell'abilitazione, configurare le impostazioni richieste per '{}'."
+
+#~ msgid "Currently filtered on:"
+#~ msgstr "Attualmente filtrato su:"
+
+#~ msgid "Object tree"
+#~ msgstr "Albero degli oggetti"
+
 #~ msgid "Please select an OOI to start scan."
 #~ msgstr "Seleziona un OOI per avviare la scansione."
 
diff --git a/rocky/rocky/locale/nl/LC_MESSAGES/django.po b/rocky/rocky/locale/nl/LC_MESSAGES/django.po
index 8f46f352d1c..81d3a94ad53 100644
--- a/rocky/rocky/locale/nl/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/nl/LC_MESSAGES/django.po
@@ -9,11 +9,12 @@
 # Joost Krapels <joost.krapels@ictinstitute.nl>, 2024.
 # Jeroen Dekkers <jeroen@dekkers.ch>, 2024.
 # Wim Benes <fryskefirefox@gmail.com>, 2024.
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: 2024-08-01 11:09+0000\n"
 "Last-Translator: Wim Benes <fryskefirefox@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/openkat/nl-kat-"
@@ -34,13 +35,13 @@ msgid "Important dates"
 msgstr "Belangrijke datums"
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -346,6 +347,10 @@ msgstr ""
 msgid "date joined"
 msgstr "startdatum"
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr "naam"
@@ -634,7 +639,6 @@ msgstr "Modal sluiten"
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -659,20 +663,36 @@ msgstr ""
 "voor verdere details."
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
-"Er is een HTTP-fout opgetreden. Controleer de logboeken voor meer informatie."
 
 #: katalogus/forms/katalogus_filter.py
 msgid "Show all"
 msgstr "Alles tonen"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr "Uitgeschakeld"
 
@@ -693,7 +713,6 @@ msgid "Sorting options"
 msgstr "Sorteeropties"
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr "Dit veld is verplicht."
 
@@ -714,12 +733,10 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
-"Boefjes verzamelen feitelijke informatie, bijvoorbeeld door een externe "
-"scantool zoals Nmap te gebruiken of het gebruik van een database zoals "
-"Shodan."
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
 msgid ""
@@ -739,21 +756,11 @@ msgstr ""
 "uit."
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr "Scanniveau"
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr "Omschrijving"
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -772,19 +779,80 @@ msgstr "%(plugin_name)s heeft geen invoerobjecten nodig."
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr "Produceert"
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr "%(plugin_name)s kan het volgende produceren:"
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr "Bewerken"
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr "beschikbaar"
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -830,8 +898,8 @@ msgstr "Object"
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr "Vrijwaringsniveau"
@@ -905,9 +973,6 @@ msgstr ""
 "indetailpagina."
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr "Ga terug"
@@ -931,6 +996,17 @@ msgstr "Plug-in"
 msgid "Value"
 msgstr "Waarde"
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr "Omschrijving"
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -950,6 +1026,7 @@ msgstr "Uitgever:"
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr "Details bekijken"
@@ -967,6 +1044,30 @@ msgstr "Uitschakelen"
 msgid "You don't have permission to enable"
 msgstr "U hebt geen toestemming om in te schakelen"
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr "Filters verbergen"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr "Filters tonen"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr "Plug-ins filteren"
@@ -1075,7 +1176,6 @@ msgid "Required settings"
 msgstr "Verplichte instellingen"
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1086,6 +1186,23 @@ msgstr "Toevoegen"
 msgid "Required for:"
 msgstr "Vereist voor:"
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr "Rapporttypes"
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr "Overzicht plug-ins:"
@@ -1115,11 +1232,6 @@ msgstr "Acties"
 msgid "Plugins Navigation"
 msgstr "Plug-insnavigatie"
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr "Alle"
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1132,6 +1244,155 @@ msgstr "Boefjes"
 msgid "Normalizers"
 msgstr "Normalizers"
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr "Alle"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr "bevestiging"
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr "Status"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr "minuten"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr "Details sluiten"
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr "Details openen"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr "Aanmaakdatum"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr "toelichting"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1217,48 +1478,32 @@ msgstr ""
 "verwijderen?"
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr "Verwijderen"
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr " Details"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
-msgstr "Instellingenoverzicht"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr "Verplicht"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr "Actie"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
-msgstr "Niet ingevuld"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
-msgstr "Ja"
+msgid "Configure Settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr "Nee"
+msgid "Overview of settings"
+msgstr "Instellingenoverzicht"
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
-msgstr "Bewerken"
+msgid "Variable"
+msgstr ""
 
 #: katalogus/views/change_clearance_level.py
 msgid "Session has terminated, please select objects again."
@@ -1296,18 +1541,16 @@ msgstr ""
 msgid "{} '{}' disabled."
 msgstr "{} ‘{}’ uitgeschakeld."
 
-#: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
-msgstr "Ophalen van instellingen {} mislukt. Is de Katalogus actief?"
-
-#: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
-msgstr "Stel vóór het inschakelen de vereiste instellingen in voor ‘{}’."
-
 #: katalogus/views/plugin_enable_disable.py
 msgid "{} '{}' enabled."
 msgstr "{} ‘{}’ ingeschakeld."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
 "Your clearance level is not set. Go to your profile page to see your "
@@ -1317,6 +1560,12 @@ msgstr ""
 "vrijwaring te controleren of neem contact op met de beheerder om een "
 "vrijwaringsniveau in te stellen."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid "To enable {} you need at least a clearance level of L{}. "
 msgstr ""
@@ -2019,6 +2268,10 @@ msgstr "URL"
 msgid "Type"
 msgstr "Type"
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr "Pad"
@@ -2464,9 +2717,77 @@ msgstr "{name} met succes aangemaakt."
 msgid "Filter by OOI types"
 msgstr "Filter op OOI-types"
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
-msgstr "Rapporttypes"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
+msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
 #: reports/report_types/multi_organization_report/appendix.html
@@ -2640,8 +2961,6 @@ msgid "Export"
 msgstr "Exporteren"
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr "PDF downloaden"
 
@@ -3063,10 +3382,6 @@ msgstr "Record"
 msgid "TTL"
 msgstr "TTL"
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr "minuten"
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr "Er zijn geen records gevonden."
@@ -3084,6 +3399,14 @@ msgstr ""
 "veiligheidsmaatregelen zijn geactiveerd volgens de inhoud van de DNS-"
 "gegevens."
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr "Ja"
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr "Nee"
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -3121,30 +3444,6 @@ msgstr "Bevinding"
 msgid "Details"
 msgstr "Details"
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr "Details sluiten"
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr "Details openen"
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr "Bevindingeninformatie"
@@ -3183,6 +3482,14 @@ msgstr ""
 "de bevinding. Het risiconiveau is wellicht anders voor uw specifieke "
 "omgeving."
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr "Bron"
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr "Impact"
@@ -3679,15 +3986,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr "Ciphers"
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr "Status"
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr "Protocol"
@@ -3776,13 +4074,6 @@ msgstr "Kwetsbaarhedenrapport"
 msgid "Vulnerabilities found are grouped for each system."
 msgstr "De gevonden kwetsbaarheden zijn per systeem gegroepeerd."
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr "Bron"
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr "Laatst gezien"
@@ -3861,67 +4152,19 @@ msgstr ""
 "Websysteemrapport controleert websystemen op basisbeveiligingsstandaarden."
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3995,6 +4238,55 @@ msgstr ""
 "de geselecteerde systemen, plug-ins en rapporten. Dit wordt gevolgd door de "
 "bevindingen voor elk rapport."
 
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr "Opnieuw instellen"
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid ""
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
+msgstr ""
+
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr "Rapportnavigatie"
@@ -4003,13 +4295,11 @@ msgstr "Rapportnavigatie"
 msgid "Generate Report"
 msgstr "Rapport genereren"
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr "Rapport aggregeren"
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr "Multi-rapport"
 
@@ -4024,17 +4314,6 @@ msgstr[1] "Selecteer objecten (%(total_oois)s)"
 msgid "Select which objects you want to include in your report."
 msgstr "Selecteer de objecten die u op wilt nemen in het rapport."
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr "Filteren"
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr "Momenteel gefilterd op:"
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr "Geen objecten gevonden."
@@ -4070,9 +4349,8 @@ msgstr[1] "Selecteer alle %(total_oois)s objecten"
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr "Objecten"
 
@@ -4097,11 +4375,7 @@ msgid "Set up the required plugins for this report."
 msgstr "Configureer de benodigde plug-ins voor dit rapport."
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr "Selectie aanpassen"
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr "Plug-ins"
 
@@ -4154,18 +4428,26 @@ msgstr ""
 "resulteren in onnauwkeurige rapporten, aangezien plug-ins dan wellicht nog "
 "niet klaar zijn met het verzamelen van gegevens."
 
-#: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
-msgstr "Dit rapport vereist dat de volgende plug-ins zijn ingeschakeld:"
-
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All required plugins are enabled."
 msgstr "Goed gedaan. Alle vereiste plug-ins zijn ingeschakeld."
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "This report type requires the following plugins to be enabled:"
+msgstr "Dit rapport vereist dat de volgende plug-ins zijn ingeschakeld:"
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Show enabled plugins"
 msgstr "Ingeschakelde plug-ins tonen"
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no required plugins."
+msgstr ""
+
+#: reports/templates/partials/report_setup_scan.html
+msgid "Good job! All suggested plugins are enabled"
+msgstr "Goed gedaan! Alle voorgestelde plug-ins zijn ingeschakeld"
+
 #: reports/templates/partials/report_setup_scan.html
 msgid ""
 "This report requires at least one of the following plugins to be enabled to "
@@ -4174,10 +4456,6 @@ msgstr ""
 "Dit rapport vereist dat tenminste één van de volgende plug-ins is "
 "geactiveerd om het rapport te genereren:"
 
-#: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All suggested plugins are enabled"
-msgstr "Goed gedaan! Alle voorgestelde plug-ins zijn ingeschakeld"
-
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr "Voorgestelde plug-ins verbergen"
@@ -4186,6 +4464,10 @@ msgstr "Voorgestelde plug-ins verbergen"
 msgid "Show more suggested plugins"
 msgstr "Meer voorgestelde plug-ins tonen"
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -4201,7 +4483,6 @@ msgid "Selected Objects"
 msgstr "Geselecteerde objecten"
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr "Geselecteerde plug-ins"
 
@@ -4243,6 +4524,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] "U hebt in de vorige stap %(total_oois)s object geselecteerd."
 msgstr[1] "U hebt in de vorige stap %(total_oois)s objecten geselecteerd."
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr "Selectie aanpassen"
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr "Beschikbare rapporttypes"
@@ -4255,6 +4540,11 @@ msgstr "Alle rapporten die beschikbaar zijn voor uw selectie."
 msgid "Toggle all report types"
 msgstr "Selecteer alle rapporttypes"
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -4282,11 +4572,6 @@ msgstr "Input objecten"
 msgid "Reference date"
 msgstr "Referentiedatum"
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr "Aanmaakdatum"
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr "Bovenliggende rapportdetails tonen"
@@ -4467,49 +4752,50 @@ msgstr ""
 msgid "Save report"
 msgstr "Rapport opslaan"
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr "Selecteer minstens één OOI om door te gaan."
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-"Er zijn geen gegevens gevonden voor %(report_types). Object(en) bestaan niet "
-"op %(date)s."
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr "Selecteer minstens één rapporttype om door te gaan."
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr "Rapporttype ‘%s’ bestaat niet."
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+"Er zijn geen gegevens gevonden voor %(report_types). Object(en) bestaan niet "
+"op %(date)s."
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr "Multi-rapport"
@@ -4546,6 +4832,28 @@ msgstr "Datum"
 msgid "The selected date is in the future. Please select a different date."
 msgstr "De gekozen datum ligt in de toekomst. Kies een andere datum."
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr "KAT-ID"
@@ -4651,11 +4959,11 @@ msgstr "Reproduceer bevinding"
 msgid "Please explain how to reproduce your finding"
 msgstr "Leg uit hoe deze bevinding kan worden gereproduceerd"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr "Datum/Tijd (UTC)"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr "Doc! Ik kom uit de toekomst, ik ben hier om je terug te brengen!"
 
@@ -4683,6 +4991,14 @@ msgstr "Filteren op ernst"
 msgid "Filter by muted findings"
 msgstr "Gedempte bevindingen uitsluiten"
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr "Zoeken"
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr "Filtertypes"
@@ -4757,10 +5073,6 @@ msgstr "In de wachtrij"
 msgid "Running"
 msgstr "Draaiend"
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr "Zoeken"
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr "Zoeken op objectnaam"
@@ -4817,6 +5129,10 @@ msgstr "Voeg één bevindingstype per regel toe."
 msgid "Add the date and time of your finding (UTC)"
 msgstr "Voer de datum en tijd van uw bevinding in (UTC)"
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4827,6 +5143,55 @@ msgstr ""
 "mogelijk de status van de objecten op elk moment van de tijd in de historie "
 "te bekijken. Selecteer een datum om naar die weergave te springen."
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr "Diepte van de boom."
@@ -4899,6 +5264,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr "Raw-bestand uploaden"
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr "De naam van de organisatie"
@@ -4926,7 +5299,6 @@ msgstr "nieuw"
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr "Leden"
@@ -4999,12 +5371,12 @@ msgstr ""
 "Er is een HTTP-fout gebeurd. Zie Scheduler-logboeken voor meer informatie."
 
 #: rocky/scheduler.py
-msgid "Task list: "
-msgstr "Taaklijst: "
+msgid "Schedule list: "
+msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
-msgstr "Taakstatistieken: "
+msgid "Task list: "
+msgstr "Taaklijst: "
 
 #: rocky/settings.py
 msgid "Blue light"
@@ -5175,6 +5547,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] "Verbeter de volgende fout."
 msgstr[1] "Verbeter de volgende fouten."
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr "Filteren"
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr "Aantallen verbergen"
@@ -5467,6 +5843,10 @@ msgstr "Bevindingen dempen"
 msgid "Reason:"
 msgstr "Reden:"
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr "Bevindingen dempen opheffen"
@@ -5515,11 +5895,14 @@ msgstr "Menu"
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr "OpenKAT-logo, ga naar de startpagina van OpenKAT"
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr "Crisiscentrum"
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -5549,6 +5932,10 @@ msgstr ""
 "Vrijwaring op de aanwezige organisatie. U kunt nu objecten toevoegen en "
 "scans starten."
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr "Ga naar"
@@ -5827,6 +6214,11 @@ msgstr "Bevindingsdetails bekijken"
 msgid "Total findings:"
 msgstr "Totaal aantal bevindingen:"
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr "Inactief"
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr "Declaraties"
@@ -5855,6 +6247,10 @@ msgstr "Taak-ID"
 msgid "When"
 msgstr "Wanneer"
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr "Het boefje is sindsdien verwijderd of uitgeschakeld."
@@ -5958,36 +6354,6 @@ msgstr ""
 "Dit object is gewist. Er kunnen geen bevindingen of objecten aan worden "
 "toegevoegd."
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr "Bevindingenrapport voor %(name)s"
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-"Dit zijn de bevindingen van een OpenKAT-analyse op %(observed_at)s. Klik op "
-"een bevinding voor gedetailleerde informatie over het probleem, de "
-"oorsprong, ernst en mogelijke oplossingen."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr "Kan rapport voor %(name)s niet vinden."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-"Misschien heeft het nooit bestaan, misschien alleen niet op "
-"%(observed_at)s<br>. Probeer eens een ander tijdstip!"
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr "Samenvatting van"
@@ -6016,14 +6382,6 @@ msgstr "van de"
 msgid "shows the same objects."
 msgstr "toont dezelfde objecten."
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr "Objectenboom"
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr "Crisiscentrum:"
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -6082,6 +6440,10 @@ msgstr "Organisatie bewerken"
 msgid "Save organization"
 msgstr "Organisatie opslaan"
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr "Nieuwe organisatie toevoegen"
@@ -6365,12 +6727,6 @@ msgstr "Toelichting openen"
 msgid "Close explanation"
 msgstr "Toelichting sluiten"
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr "toelichting"
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -6451,10 +6807,6 @@ msgstr "Volgende pagina"
 msgid "Next"
 msgstr "Volgende"
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr "bevestiging"
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr "Bevestiging:"
@@ -6472,8 +6824,8 @@ msgid "Use the button below to add a related object."
 msgstr "Gebruik de knop hieronder om een gerelateerd object toe te voegen."
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
-msgstr "Bevindingenrapport genereren"
+msgid "Generate Findings Report"
+msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
 msgid "Mute Finding"
@@ -6638,10 +6990,6 @@ msgstr "Ga direct naar de inhoud"
 msgid "Current clearance level"
 msgstr "Actuele vrijwaringsniveau"
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr "Inactief"
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr "Verklaard:"
@@ -6744,6 +7092,17 @@ msgstr "Meta-gegevens downloaden"
 msgid "Input object"
 msgstr "Inputobject"
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr "Er zijn geen taken voor Boefjes"
@@ -6752,12 +7111,20 @@ msgstr "Er zijn geen taken voor Boefjes"
 msgid "List of tasks for boefjes"
 msgstr "Takenlijst van Boefjes"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr "Datum toegevoegd"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr "Er zijn geen taken voor normalizers"
@@ -6774,6 +7141,10 @@ msgstr "Normalizer"
 msgid "Boefje input OOI"
 msgstr "Boefje invoer OOI"
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6816,14 +7187,6 @@ msgstr "Opnieuw plannen"
 msgid "Download task data"
 msgstr "Taakgegevens downloaden"
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr "Filters verbergen"
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr "Filters tonen"
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr "Aanmelden"
@@ -7102,6 +7465,15 @@ msgstr ""
 "Automatiseer het maken van meerdere objecten door een raw-bestand te "
 "uploaden."
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr "Raw-bestand uploaden"
@@ -7255,26 +7627,6 @@ msgstr "Bevinding(en) met succes dempen opgeheven."
 msgid "Finding(s) successfully muted."
 msgstr "Bevinding(en) met succes gedempt."
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr "Een rapport kan niet voor een toekomstig tijdstip worden aangemaakt."
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr "Bevindingenrapport"
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr ""
-"Het genereren van het rapport is mislukt. Zie de Keiko-logboeken voor meer "
-"informatie."
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-"Time-out bereikt bij genereren van rapport. Zie Keiko-logboeken voor meer "
-"informatie."
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr "Boomvisualisatie"
@@ -7283,6 +7635,10 @@ msgstr "Boomvisualisatie"
 msgid "Graph Visualisation"
 msgstr "Grafiekvisualisatie"
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr "OOI-typen: "
@@ -7423,9 +7779,9 @@ msgstr ""
 "Kan het scanniveau niet opnieuw instellen. Scanniveau van {ooi_name} is niet "
 "gedeclareerd"
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
-msgstr "Opnieuw instellen"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
+msgstr ""
 
 #: rocky/views/scheduler.py
 msgid ""
@@ -7437,6 +7793,15 @@ msgstr ""
 "worden toegevoegd aan de objectenlijst als ze binnen zijn. Het kan even "
 "duren, een verversing van de pagina is nodig om nieuwe resultaten te tonen."
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
@@ -7494,6 +7859,100 @@ msgstr "Raw-bestand kan niet naar Bytes worden geüpload: %s"
 msgid "Raw file successfully added."
 msgstr "Raw-bestand met succes toegevoegd."
 
+#~ msgid "A HTTP error occurred. Check logs for more info."
+#~ msgstr ""
+#~ "Er is een HTTP-fout opgetreden. Controleer de logboeken voor meer "
+#~ "informatie."
+
+#, python-format
+#~ msgid "Report type '%s' does not exist."
+#~ msgstr "Rapporttype ‘%s’ bestaat niet."
+
+#, python-format
+#~ msgid "Findings report for %(name)s"
+#~ msgstr "Bevindingenrapport voor %(name)s"
+
+#, python-format
+#~ msgid ""
+#~ "These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
+#~ "finding for more detailed information about the issue, its origin, "
+#~ "severity and possible solutions."
+#~ msgstr ""
+#~ "Dit zijn de bevindingen van een OpenKAT-analyse op %(observed_at)s. Klik "
+#~ "op een bevinding voor gedetailleerde informatie over het probleem, de "
+#~ "oorsprong, ernst en mogelijke oplossingen."
+
+#, python-format
+#~ msgid "A report for %(name)s wasn't found."
+#~ msgstr "Kan rapport voor %(name)s niet vinden."
+
+#, python-format
+#~ msgid ""
+#~ "Perhaps it never was, perhaps it just didn't exist on %(observed_at)s "
+#~ "<br> Try some other dates!"
+#~ msgstr ""
+#~ "Misschien heeft het nooit bestaan, misschien alleen niet op "
+#~ "%(observed_at)s<br>. Probeer eens een ander tijdstip!"
+
+#~ msgid "Generate findings report"
+#~ msgstr "Bevindingenrapport genereren"
+
+#~ msgid "You can't generate a report for an OOI on a date in the future."
+#~ msgstr ""
+#~ "Een rapport kan niet voor een toekomstig tijdstip worden aangemaakt."
+
+#~ msgid "Findings report"
+#~ msgstr "Bevindingenrapport"
+
+#~ msgid "Generating report failed. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Het genereren van het rapport is mislukt. Zie de Keiko-logboeken voor "
+#~ "meer informatie."
+
+#~ msgid ""
+#~ "Timeout reached generating report. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Time-out bereikt bij genereren van rapport. Zie Keiko-logboeken voor meer "
+#~ "informatie."
+
+#~ msgid ""
+#~ "Boefjes gather factual information, such as by calling an external "
+#~ "scanning tool like nmap or using a database like shodan."
+#~ msgstr ""
+#~ "Boefjes verzamelen feitelijke informatie, bijvoorbeeld door een externe "
+#~ "scantool zoals Nmap te gebruiken of het gebruik van een database zoals "
+#~ "Shodan."
+
+#~ msgid " Details"
+#~ msgstr " Details"
+
+#~ msgid "Required"
+#~ msgstr "Verplicht"
+
+#~ msgid "Action"
+#~ msgstr "Actie"
+
+#~ msgid "Unset"
+#~ msgstr "Niet ingevuld"
+
+#~ msgid "Failed fetching settings for {}. Is the Katalogus up?"
+#~ msgstr "Ophalen van instellingen {} mislukt. Is de Katalogus actief?"
+
+#~ msgid "Before enabling, please set the required settings for '{}'."
+#~ msgstr "Stel vóór het inschakelen de vereiste instellingen in voor ‘{}’."
+
+#~ msgid "Currently filtered on:"
+#~ msgstr "Momenteel gefilterd op:"
+
+#~ msgid "Task statistics: "
+#~ msgstr "Taakstatistieken: "
+
+#~ msgid "Object tree"
+#~ msgstr "Objectenboom"
+
+#~ msgid "Crisis room:"
+#~ msgstr "Crisiscentrum:"
+
 #~ msgid "OpenKAT Aggregate Report"
 #~ msgstr "OpenKAT Geaggregeerd Rapport"
 
diff --git a/rocky/rocky/locale/pap/LC_MESSAGES/django.po b/rocky/rocky/locale/pap/LC_MESSAGES/django.po
index cf8c4ca8f94..dbfb9fc5e5c 100644
--- a/rocky/rocky/locale/pap/LC_MESSAGES/django.po
+++ b/rocky/rocky/locale/pap/LC_MESSAGES/django.po
@@ -1,8 +1,9 @@
+#: reports/forms.py
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-29 14:05+0000\n"
+"POT-Creation-Date: 2024-10-01 14:17+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,13 +22,13 @@ msgid "Important dates"
 msgstr "Fechanan importante"
 
 #: account/forms/account_setup.py katalogus/templates/katalogus_settings.html
-#: katalogus/templates/plugin_settings_list.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/tls_report/report.html
-#: reports/templates/partials/export_report_settings.html
+#: reports/templates/partials/report_names_form.html
 #: reports/templates/report_overview/report_history_table.html
 #: reports/templates/report_overview/subreports_table.html
-#: rocky/templates/organizations/organization_list.html
+#: tools/forms/boefje.py rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_settings.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 msgid "Name"
@@ -330,6 +331,10 @@ msgstr ""
 msgid "date joined"
 msgstr "fecha di registro"
 
+#: account/models.py
+msgid "The clearance level of the user for all organizations."
+msgstr ""
+
 #: account/models.py
 msgid "name"
 msgstr ""
@@ -605,7 +610,6 @@ msgstr ""
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/confirmation_clone_settings.html
 #: katalogus/templates/plugin_settings_delete.html
-#: reports/templates/partials/export_report_settings.html
 #: rocky/templates/oois/ooi_delete.html
 #: rocky/templates/oois/ooi_mute_finding.html
 #: rocky/templates/organizations/organization_edit.html
@@ -628,7 +632,20 @@ msgid ""
 msgstr ""
 
 #: katalogus/client.py
-msgid "A HTTP error occurred. Check logs for more info."
+msgid "Boefje with this name already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Boefje with this ID already exists."
+msgstr ""
+
+#: katalogus/client.py
+msgid "Editing this boefje is not allowed because it is static."
+msgstr ""
+
+#: katalogus/client.py
+#, python-format
+msgid "An HTTP %d error occurred. Check logs for more info."
 msgstr ""
 
 #: katalogus/forms/katalogus_filter.py
@@ -636,11 +653,15 @@ msgid "Show all"
 msgstr "Mustra tur"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 #: reports/report_types/dns_report/report.html
 msgid "Enabled"
 msgstr "Aktivá"
 
 #: katalogus/forms/katalogus_filter.py
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Disabled"
 msgstr "Desaktivá"
 
@@ -661,7 +682,6 @@ msgid "Sorting options"
 msgstr "Opshonnan súrtí"
 
 #: katalogus/forms/plugin_settings.py
-#: reports/templates/partials/export_report_settings.html
 msgid "This field is required."
 msgstr "E vèld aki ta obligatorio"
 
@@ -682,11 +702,10 @@ msgstr ""
 
 #: katalogus/templates/about_plugins.html katalogus/templates/boefjes.html
 msgid ""
-"Boefjes gather factual information, such as by calling an external scanning "
-"tool like nmap or using a database like shodan."
+"Boefjes are used to scan for objects. They detect vulnerabilities, security "
+"issues, and give insight. Each boefje is a separate scan that can run on a "
+"selection of objects."
 msgstr ""
-"Boefjes ta reuni informashon faktuál, huzando tools manera nmap òf usando un "
-"base di datos manera shodan."
 
 #: katalogus/templates/about_plugins.html katalogus/templates/normalizers.html
 msgid ""
@@ -705,21 +724,11 @@ msgstr ""
 "buska bista spesífiko i trese konklushonnan."
 
 #: katalogus/templates/boefje_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
+#: katalogus/templates/plugin_container_image.html
 msgid "Scan level"
 msgstr "Nivél di skan"
 
-#: katalogus/templates/boefje_detail.html
-#: katalogus/templates/normalizer_detail.html
-#: reports/report_types/aggregate_organisation_report/appendix.html
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: reports/templates/summary/report_asset_overview.html
-#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
-#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
-msgid "Description"
-msgstr "Deklarashon"
-
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
 msgid "Consumes"
@@ -738,19 +747,80 @@ msgstr "%(plugin_name)s no ta nesesitá ningun ophetonan di entrada."
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 msgid "Produces"
 msgstr "Ta Produsí"
 
 #: katalogus/templates/boefje_detail.html
 #: katalogus/templates/normalizer_detail.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #, python-format
 msgid "%(plugin_name)s can produce the following output:"
 msgstr "%(plugin_name)s por produsi lo sigiente:"
 
+#: katalogus/templates/boefje_detail.html
+#, python-format
+msgid "%(plugin_name)s doesn't produce any output mime types."
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje variant setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/organizations/organization_settings.html
+#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
+msgid "Edit"
+msgstr "Editá"
+
+#: katalogus/templates/boefje_setup.html
+msgid "Boefje setup"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid ""
+"\n"
+"                        You can create a new Boefje. If you want more "
+"information on this,\n"
+"                        you can check out the <a href=\"https://docs.openkat."
+"nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html\">documentation</a>.\n"
+"                    "
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Save changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard changes"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard variant"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Create new Boefje"
+msgstr ""
+
+#: katalogus/templates/boefje_setup.html
+msgid "Discard new Boefje"
+msgstr ""
+
 #: katalogus/templates/boefjes.html katalogus/templates/normalizers.html
 msgid "available"
 msgstr "disponibel"
 
+#: katalogus/templates/boefjes.html
+msgid "Add Boefje"
+msgstr ""
+
 #: katalogus/templates/change_clearance_level.html
 #: katalogus/templates/partials/objects_to_scan.html
 #: reports/templates/partials/report_setup_scan.html
@@ -796,8 +866,8 @@ msgstr "Opheto"
 
 #: katalogus/templates/change_clearance_level.html onboarding/forms.py
 #: reports/templates/partials/report_ooi_list.html
-#: reports/templates/summary/ooi_selection.html tools/forms/ooi.py
-#: rocky/templates/oois/ooi_page_tabs.html
+#: reports/templates/summary/ooi_selection.html tools/forms/boefje.py
+#: tools/forms/ooi.py rocky/templates/oois/ooi_page_tabs.html
 #: rocky/templates/partials/explanations.html
 msgid "Clearance level"
 msgstr "Nivél di autorisashon"
@@ -871,9 +941,6 @@ msgstr ""
 "di plugin."
 
 #: katalogus/templates/katalogus_settings.html
-#: reports/templates/partials/export_report_settings.html
-#: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
 #: rocky/templates/two_factor/core/otp_required.html
 msgid "Go back"
 msgstr "Bai bèk"
@@ -897,6 +964,17 @@ msgstr "Plugin"
 msgid "Value"
 msgstr "Balor"
 
+#: katalogus/templates/normalizer_detail.html
+#: reports/report_types/aggregate_organisation_report/appendix.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: reports/templates/summary/report_asset_overview.html tools/forms/boefje.py
+#: tools/forms/finding_type.py rocky/templates/oois/ooi_detail.html
+#: rocky/templates/oois/ooi_detail_findings_list.html rocky/templates/scan.html
+msgid "Description"
+msgstr "Deklarashon"
+
 #: katalogus/templates/normalizer_detail.html
 #, python-format
 msgid "%(plugin_name)s is able to process the following mime types:"
@@ -916,6 +994,7 @@ msgstr ""
 
 #: katalogus/templates/partials/boefje_tile.html
 #: katalogus/templates/partials/plugin_tile.html
+#: katalogus/templates/partials/plugin_tile_modal.html
 #: katalogus/templates/partials/plugins.html
 msgid "See details"
 msgstr "Habri detayes"
@@ -933,6 +1012,30 @@ msgstr "Desactivá"
 msgid "You don't have permission to enable"
 msgstr ""
 
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Hide filters"
+msgstr "Skonde filters"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "Show filters"
+msgstr "Mustra filters"
+
+#: katalogus/templates/partials/katalogus_filter.html
+#: rocky/templates/findings/findings_filter.html
+#: rocky/templates/partials/ooi_list_filters.html
+#: rocky/templates/partials/organization_member_list_filters.html
+#: rocky/templates/tasks/partials/task_filter.html
+msgid "applied"
+msgstr ""
+
 #: katalogus/templates/partials/katalogus_filter.html
 msgid "Filter plugins"
 msgstr "Filtro di plug-in"
@@ -1041,7 +1144,6 @@ msgid "Required settings"
 msgstr "Settings requeri"
 
 #: katalogus/templates/partials/plugin_settings_required.html
-#: katalogus/templates/plugin_settings_list.html
 #: rocky/templates/findings/finding_add.html
 #: rocky/templates/partials/ooi_detail_related_object.html
 #: rocky/templates/partials/ooi_list_toolbar.html
@@ -1052,6 +1154,23 @@ msgstr "Añadí"
 msgid "Required for:"
 msgstr ""
 
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Boefje details"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html reports/forms.py
+#: reports/templates/report_overview/report_history_table.html
+msgid "Report types"
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "This boefje is required by the following report types."
+msgstr ""
+
+#: katalogus/templates/partials/plugin_tile_modal.html
+msgid "Go to boefje detail page"
+msgstr ""
+
 #: katalogus/templates/partials/plugins.html
 msgid "Plugins overview:"
 msgstr "Resumen di Plug-innan:"
@@ -1081,11 +1200,6 @@ msgstr "Akshonnan"
 msgid "Plugins Navigation"
 msgstr "Navegashon di Plug-innan"
 
-#: katalogus/templates/partials/plugins_navigation.html
-#: tools/forms/scheduler.py
-msgid "All"
-msgstr "Tur"
-
 #: katalogus/templates/partials/plugins_navigation.html
 #: rocky/templates/scan.html rocky/templates/tasks/boefjes.html
 #: rocky/templates/tasks/partials/tab_navigation.html
@@ -1098,6 +1212,155 @@ msgstr "Boefjes"
 msgid "Normalizers"
 msgstr "Normalizers"
 
+#: katalogus/templates/partials/plugins_navigation.html
+#: tools/forms/scheduler.py
+msgid "All"
+msgstr "Tur"
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Container image"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The container image for this Boefje is:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"\n"
+"                    Boefje variants that use the same container image. For "
+"more\n"
+"                    information about Boefje variants you can read the "
+"documentation.\n"
+"                "
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Add variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/notifications_block.html
+msgid "confirmation"
+msgstr "konfirmashon"
+
+#: katalogus/templates/plugin_container_image.html
+#, python-format
+msgid "Variant %(plugin.name)s created."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The Boefje variant is successfully created and can now be used."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Overview of variants"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/tls_report/report.html
+#: reports/templates/partials/plugin_overview_table.html
+#: rocky/templates/organizations/organization_member_list.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Status"
+msgstr "Estádo"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Age"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "current"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+msgid "minutes"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Default system scan frequency"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Close details"
+msgstr "Sera detayes"
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/report_types/dns_report/report.html
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.html
+#: rocky/templates/crisis_room/crisis_room_findings_block.html
+#: rocky/templates/findings/finding_list.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/tasks/plugin_detail_task_list.html
+msgid "Open details"
+msgstr "Habri detayes"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Boefje ID"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: reports/templates/report_overview/report_history_table.html
+#: reports/templates/report_overview/subreports_table.html
+msgid "Creation date"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html tools/forms/boefje.py
+msgid "Arguments"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "The following arguments are used for this Boefje variant:"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+#: rocky/templates/partials/form/field_input_help_text.html
+#: rocky/templates/partials/notifications_block.html
+#: rocky/templates/two_factor/core/login.html
+msgid "explanation"
+msgstr "explikashon"
+
+#: katalogus/templates/plugin_container_image.html
+msgid "There are no arguments used for this Boefje variant."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "Edit variant"
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid "This Boefje has no variants yet."
+msgstr ""
+
+#: katalogus/templates/plugin_container_image.html
+msgid ""
+"You can make a variant and change the arguments and JSON Schema to customize "
+"it to fit your needs."
+msgstr ""
+
 #: katalogus/templates/plugin_settings_add.html
 msgid ""
 "\n"
@@ -1175,48 +1438,32 @@ msgid ""
 msgstr "Segur bo ke bo ke eliminá tur ajuste pa e plug-in %(plugin_name)s?"
 
 #: katalogus/templates/plugin_settings_delete.html
-#: katalogus/templates/plugin_settings_list.html
 #: katalogus/views/plugin_settings_delete.py
 #: rocky/templates/admin/delete_confirmation.html rocky/views/ooi_delete.py
 msgid "Delete"
 msgstr "Eliminá"
 
 #: katalogus/templates/plugin_settings_list.html
-msgid " Details"
-msgstr "Detayes"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Overview of settings"
+msgid ""
+"\n"
+"                        In the table below the settings for this specific "
+"Boefje can be seen.\n"
+"                        Set or change the value of the variables by editing "
+"the settings.\n"
+"                    "
 msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-msgid "Required"
-msgstr "Requerido"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Action"
-msgstr "Akshon"
-
-#: katalogus/templates/plugin_settings_list.html
-msgid "Unset"
-msgstr "Bashi"
-
-#: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "Yes"
-msgstr "Si"
+msgid "Configure Settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: reports/report_types/dns_report/report.html
-msgid "No"
-msgstr "Nò"
+msgid "Overview of settings"
+msgstr ""
 
 #: katalogus/templates/plugin_settings_list.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/organizations/organization_settings.html
-#: rocky/views/ooi_edit.py rocky/views/organization_edit.py
-msgid "Edit"
-msgstr "Editá"
+msgid "Variable"
+msgstr ""
 
 #: katalogus/views/change_clearance_level.py
 msgid "Session has terminated, please select objects again."
@@ -1254,18 +1501,16 @@ msgstr ""
 msgid "{} '{}' disabled."
 msgstr "{} '{}' desaktivá."
 
-#: katalogus/views/plugin_enable_disable.py
-msgid "Failed fetching settings for {}. Is the Katalogus up?"
-msgstr "No por a enkontra e ajustamentunan pa {}. Katalogus ta disponibel?"
-
-#: katalogus/views/plugin_enable_disable.py
-msgid "Before enabling, please set the required settings for '{}'."
-msgstr "Promé ku aktivá, por fabor pone e ajustamentunan necesario pa '{}'."
-
 #: katalogus/views/plugin_enable_disable.py
 msgid "{} '{}' enabled."
 msgstr "{} '{}' aktiva."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"You have not acknowledged your clearance level. Go to your profile page to "
+"acknowledge your clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid ""
 "Your clearance level is not set. Go to your profile page to see your "
@@ -1275,6 +1520,12 @@ msgstr ""
 "bo autorisashon òf kontakta e administradó pa establésí un nivel di "
 "autorisashon."
 
+#: katalogus/views/plugin_enable_disable.py
+msgid ""
+"Your clearance level is L{}. Contact your administrator to get a higher "
+"clearance level."
+msgstr ""
+
 #: katalogus/views/plugin_enable_disable.py
 msgid "To enable {} you need at least a clearance level of L{}. "
 msgstr "Pa aktivá {} bo mester tin mínimo un nivel di autorisashon di L{}."
@@ -1960,6 +2211,10 @@ msgstr "URL"
 msgid "Type"
 msgstr "Tipo"
 
+#: onboarding/templates/step_3c_setup_scan_ooi_detail.html
+msgid "Owner"
+msgstr ""
+
 #: onboarding/templates/step_3c_setup_scan_ooi_detail.html
 msgid "Path"
 msgstr "Routa"
@@ -2399,8 +2654,76 @@ msgstr "{name} a wòrdu krea ku èksito."
 msgid "Filter by OOI types"
 msgstr "Filtra pa tiponan di OOI"
 
-#: reports/forms.py reports/templates/report_overview/report_history_table.html
-msgid "Report types"
+#: reports/forms.py
+msgid "Today"
+msgstr ""
+
+#: reports/forms.py
+msgid "Different date"
+msgstr ""
+
+#: reports/forms.py
+msgid "No, just once"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yes, repeat"
+msgstr ""
+
+#: reports/forms.py
+msgid "Daily"
+msgstr ""
+
+#: reports/forms.py
+msgid "Weekly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Monthly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Yearly"
+msgstr ""
+
+#: reports/forms.py
+msgid "Start date"
+msgstr ""
+
+#: reports/forms.py
+msgid "day"
+msgstr ""
+
+#: reports/forms.py
+msgid "week"
+msgstr ""
+
+#: reports/forms.py
+msgid "month"
+msgstr ""
+
+#: reports/forms.py
+msgid "year"
+msgstr ""
+
+#: reports/forms.py
+msgid "Never"
+msgstr ""
+
+#: reports/forms.py
+msgid "On"
+msgstr ""
+
+#: reports/forms.py
+msgid "After"
+msgstr ""
+
+#: reports/forms.py
+msgid "Report name format"
+msgstr ""
+
+#: reports/forms.py
+msgid "Subreports name format"
 msgstr ""
 
 #: reports/report_types/aggregate_organisation_report/appendix.html
@@ -2567,8 +2890,6 @@ msgid "Export"
 msgstr "Exportá"
 
 #: reports/report_types/aggregate_organisation_report/introduction.html
-#: rocky/templates/oois/ooi_report.html
-#: rocky/templates/partials/findings_list_toolbar.html
 msgid "Download PDF"
 msgstr "Download PDF"
 
@@ -2921,10 +3242,6 @@ msgstr ""
 msgid "TTL"
 msgstr ""
 
-#: reports/report_types/dns_report/report.html
-msgid "minutes"
-msgstr ""
-
 #: reports/report_types/dns_report/report.html
 msgid "No records have been found."
 msgstr ""
@@ -2939,6 +3256,14 @@ msgid ""
 "are enabled based on the contents of the DNS records."
 msgstr ""
 
+#: reports/report_types/dns_report/report.html
+msgid "Yes"
+msgstr "Si"
+
+#: reports/report_types/dns_report/report.html
+msgid "No"
+msgstr "Nò"
+
 #: reports/report_types/dns_report/report.html
 #: reports/report_types/findings_report/report.html
 msgid "Other findings found"
@@ -2976,30 +3301,6 @@ msgstr "Diskubrimentu"
 msgid "Details"
 msgstr "Detayes"
 
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Close details"
-msgstr "Sera detayes"
-
-#: reports/report_types/dns_report/report.html
-#: reports/report_types/findings_report/report.html
-#: reports/report_types/vulnerability_report/report.html
-#: rocky/templates/crisis_room/crisis_room_findings_block.html
-#: rocky/templates/findings/finding_list.html
-#: rocky/templates/organizations/organization_crisis_room.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Open details"
-msgstr "Habri detayes"
-
 #: reports/report_types/dns_report/report.html
 msgid "Findings information"
 msgstr ""
@@ -3030,6 +3331,14 @@ msgid ""
 "level may be different for your specific environment."
 msgstr ""
 
+#: reports/report_types/findings_report/report.html
+#: reports/report_types/vulnerability_report/report.py
+#: rocky/templates/oois/ooi_detail_origins_inference.html
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
+msgid "Source"
+msgstr "Orígen"
+
 #: reports/report_types/findings_report/report.html
 msgid "Impact"
 msgstr ""
@@ -3471,15 +3780,6 @@ msgstr ""
 msgid "Ciphers"
 msgstr ""
 
-#: reports/report_types/tls_report/report.html
-#: reports/templates/partials/plugin_overview_table.html
-#: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
-#: rocky/templates/tasks/ooi_detail_task_list.html
-#: rocky/templates/tasks/plugin_detail_task_list.html
-msgid "Status"
-msgstr "Estádo"
-
 #: reports/report_types/tls_report/report.html
 msgid "Protocol"
 msgstr ""
@@ -3556,13 +3856,6 @@ msgstr ""
 msgid "Vulnerabilities found are grouped for each system."
 msgstr ""
 
-#: reports/report_types/vulnerability_report/report.py
-#: rocky/templates/oois/ooi_detail_origins_inference.html
-#: rocky/templates/oois/ooi_detail_origins_observations.html
-#: rocky/templates/partials/ooi_report_findings_block_table_expanded_row.html
-msgid "Source"
-msgstr "Orígen"
-
 #: reports/report_types/vulnerability_report/report.py
 msgid "Last seen"
 msgstr ""
@@ -3634,67 +3927,19 @@ msgid "Web System Reports check web systems on basic security standards."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Report name"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "You can name individual reports."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report names:"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Edit "
+msgid "Report schedule"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
 msgid ""
-"\n"
-"                                            Give your report a custom name "
-"and optionally add the reports' reference date\n"
-"                                            to the name. To do so you can "
-"select a standard option or use a\n"
-"                                            <a href=\"https://strftime.org/"
-"\">Python strftime code</a> in the report name.\n"
-"                                        "
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Report name settings."
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Add reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Select option"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "No reference date"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Day"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Week"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Month"
+"When scheduling your report, you have two options. You can either choose to "
+"generate it just once now, or set it to run automatically at regular "
+"intervals, like daily, weekly, or monthly. If you need the report just for a "
+"single occasion, select the one-time option."
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
-msgid "Year"
-msgstr ""
-
-#: reports/templates/partials/export_report_settings.html
-msgid "Confirm"
+msgid "Recurrence"
 msgstr ""
 
 #: reports/templates/partials/export_report_settings.html
@@ -3760,6 +4005,55 @@ msgid ""
 "with the findings for each report."
 msgstr ""
 
+#: reports/templates/partials/report_names_form.html
+msgid "Report names:"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "(Required)"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Add reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+#: rocky/views/scan_profile.py
+msgid "Reset"
+msgstr "Resèt"
+
+#: reports/templates/partials/report_names_form.html
+msgid "No reference date"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Day"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Week"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Month"
+msgstr ""
+
+#: reports/templates/partials/report_names_form.html
+msgid "Year"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid "Report name"
+msgstr ""
+
+#: reports/templates/partials/report_names_header.html
+msgid ""
+"Give your report a custom name and optionally add the reports' reference "
+"date to the name. To do so you can select a standard option or use a <a "
+"href=\"https://strftime.org/\" target=\"_blank\">Python strftime code</a> in "
+"the report name."
+msgstr ""
+
 #: reports/templates/partials/report_navigation.html
 msgid "Report Navigation"
 msgstr ""
@@ -3768,13 +4062,11 @@ msgstr ""
 msgid "Generate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/aggregate_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Aggregate Report"
 msgstr ""
 
-#: reports/templates/partials/report_navigation.html
-#: reports/views/multi_report.py
+#: reports/templates/partials/report_navigation.html reports/views/base.py
 msgid "Multi Report"
 msgstr ""
 
@@ -3789,17 +4081,6 @@ msgstr[1] ""
 msgid "Select which objects you want to include in your report."
 msgstr ""
 
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/admin/change_list.html rocky/templates/oois/ooi_list.html
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Filter"
-msgstr "Filtrá"
-
-#: reports/templates/partials/report_ooi_list.html
-#: rocky/templates/oois/ooi_list.html
-msgid "Currently filtered on:"
-msgstr "Aktuálmente filtrá riba:"
-
 #: reports/templates/partials/report_ooi_list.html
 msgid "No objects found."
 msgstr ""
@@ -3835,9 +4116,8 @@ msgstr[1] ""
 #: tools/view_helpers.py rocky/templates/admin/delete_confirmation.html
 #: rocky/templates/admin/delete_selected_confirmation.html
 #: rocky/templates/dashboard_client.html rocky/templates/dashboard_redteam.html
-#: rocky/templates/header.html rocky/templates/indemnification_present.html
-#: rocky/views/ooi_add.py rocky/views/ooi_list.py rocky/views/ooi_view.py
-#: rocky/views/upload_csv.py rocky/views/upload_raw.py
+#: rocky/templates/header.html rocky/views/ooi_add.py rocky/views/ooi_list.py
+#: rocky/views/ooi_view.py rocky/views/upload_csv.py rocky/views/upload_raw.py
 msgid "Objects"
 msgstr "Ophetonan"
 
@@ -3862,11 +4142,7 @@ msgid "Set up the required plugins for this report."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-#: reports/templates/partials/report_types_selection.html
-msgid "Change selection"
-msgstr ""
-
-#: reports/templates/partials/report_setup_scan.html
+#: reports/templates/summary/selected_plugins.html
 msgid "Plugins"
 msgstr ""
 
@@ -3904,11 +4180,11 @@ msgid ""
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "This report type requires the following plugins to be enabled:"
+msgid "Good job! All required plugins are enabled."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid "Good job! All required plugins are enabled."
+msgid "This report type requires the following plugins to be enabled:"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
@@ -3916,15 +4192,19 @@ msgid "Show enabled plugins"
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
-msgid ""
-"This report requires at least one of the following plugins to be enabled to "
-"generate the report:"
+msgid "There are no required plugins."
 msgstr ""
 
 #: reports/templates/partials/report_setup_scan.html
 msgid "Good job! All suggested plugins are enabled"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid ""
+"This report requires at least one of the following plugins to be enabled to "
+"generate the report:"
+msgstr ""
+
 #: reports/templates/partials/report_setup_scan.html
 msgid "Hide suggested plugins"
 msgstr ""
@@ -3933,6 +4213,10 @@ msgstr ""
 msgid "Show more suggested plugins"
 msgstr ""
 
+#: reports/templates/partials/report_setup_scan.html
+msgid "There are no optional plugins."
+msgstr ""
+
 #: reports/templates/partials/report_severity_totals.html
 #: reports/templates/partials/report_severity_totals_table.html
 msgid "Findings overview"
@@ -3948,7 +4232,6 @@ msgid "Selected Objects"
 msgstr ""
 
 #: reports/templates/partials/report_sidemenu.html
-#: reports/templates/summary/selected_plugins.html
 msgid "Selected Plugins"
 msgstr ""
 
@@ -3984,6 +4267,10 @@ msgid_plural "You have selected %(total_oois)s objects in previous step."
 msgstr[0] ""
 msgstr[1] ""
 
+#: reports/templates/partials/report_types_selection.html
+msgid "Change selection"
+msgstr ""
+
 #: reports/templates/partials/report_types_selection.html
 msgid "Available report types"
 msgstr ""
@@ -3996,6 +4283,11 @@ msgstr ""
 msgid "Toggle all report types"
 msgstr ""
 
+#: reports/templates/partials/return_button.html
+#, python-format
+msgid "%(btn_text)s"
+msgstr ""
+
 #: reports/templates/report_overview/report_history.html
 #: reports/views/report_overview.py
 msgid "Reports history"
@@ -4023,11 +4315,6 @@ msgstr ""
 msgid "Reference date"
 msgstr ""
 
-#: reports/templates/report_overview/report_history_table.html
-#: reports/templates/report_overview/subreports_table.html
-msgid "Creation date"
-msgstr ""
-
 #: reports/templates/report_overview/report_history_table.html
 msgid "Shows parent report details"
 msgstr ""
@@ -4190,47 +4477,48 @@ msgstr ""
 msgid "Save report"
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one OOI to proceed."
 msgstr ""
 
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-msgid ""
-"No data could be found for %(report_types). Object(s) did not exist on "
-"%(date)s."
-msgstr ""
-
-#: reports/views/aggregate_report.py reports/views/generate_report.py
-#: reports/views/multi_report.py
+#: reports/views/base.py
 msgid "Select at least one report type to proceed."
 msgstr ""
 
 #: reports/views/base.py
-#, python-format
-msgid "Report type '%s' does not exist."
-msgstr ""
-
-#: reports/views/generate_report.py
 #, python-brace-format
 msgid "Concatenated Report for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "Concatenated Report for {ooi}"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {oois_count} objects"
 msgstr ""
 
-#: reports/views/generate_report.py
+#: reports/views/base.py
 #, python-brace-format
 msgid "{report_type} for {ooi}"
 msgstr ""
 
+#: reports/views/base.py
+msgid "Empty name should not be possible."
+msgstr ""
+
+#: reports/views/base.py
+msgid "Week %W, %Y"
+msgstr ""
+
+#: reports/views/mixins.py
+msgid ""
+"No data could be found for %(report_types). Object(s) did not exist on "
+"%(date)s."
+msgstr ""
+
 #: reports/views/multi_report.py
 msgid "Multi report"
 msgstr ""
@@ -4267,6 +4555,28 @@ msgstr "Fecha"
 msgid "The selected date is in the future. Please select a different date."
 msgstr ""
 
+#: tools/forms/boefje.py
+msgid "For example: -sTU --top-ports 1000"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "JSON Schema"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Input object type"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid "Output mime types"
+msgstr ""
+
+#: tools/forms/boefje.py
+msgid ""
+"Specify the scanning frequency for this Boefje in minutes. The default is 24 "
+"hours.For example: 5 minutes will let the boefje scan every 5 minutes."
+msgstr ""
+
 #: tools/forms/finding_type.py
 msgid "KAT-ID"
 msgstr "KAT-ID"
@@ -4372,11 +4682,11 @@ msgstr "Reprodusí diskubrimentu"
 msgid "Please explain how to reproduce your finding"
 msgstr "Por fabor splika kon ta reprodusí bo diskubrimentu"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Date/Time (UTC)"
 msgstr "Fecha/Tempu (UTC)"
 
-#: tools/forms/finding_type.py
+#: tools/forms/finding_type.py tools/forms/upload_raw.py
 msgid "Doc! I'm from the future, I'm here to take you back!"
 msgstr "Doc! Mi ta bin di futuro, mi tei pa hibabu bèk!"
 
@@ -4404,6 +4714,14 @@ msgstr "Filtra pa gravedat"
 msgid "Filter by muted findings"
 msgstr "Filtra pa diskubrimentu muted"
 
+#: tools/forms/findings.py tools/forms/ooi_form.py tools/forms/scheduler.py
+msgid "Search"
+msgstr "Buska"
+
+#: tools/forms/findings.py
+msgid "Object ID contains (case sensitive)"
+msgstr ""
+
 #: tools/forms/ooi.py
 msgid "Filter types"
 msgstr "Tipo di filternan"
@@ -4480,10 +4798,6 @@ msgstr "Enfila"
 msgid "Running"
 msgstr ""
 
-#: tools/forms/scheduler.py
-msgid "Search"
-msgstr "Buska"
-
 #: tools/forms/scheduler.py
 msgid "Search by object name"
 msgstr "Buska riba nómber di opheto"
@@ -4540,6 +4854,10 @@ msgstr "Añadí un tipo di diskubrimentu ID pa kada liña."
 msgid "Add the date and time of your finding (UTC)"
 msgstr "Agrega e fecha y ora di bo diskubrimentu (UTC)"
 
+#: tools/forms/settings.py
+msgid "Add the date and time of when the raw file was generated (UTC)"
+msgstr ""
+
 #: tools/forms/settings.py
 msgid ""
 "OpenKAT stores a time indication with every observation, so it is possible "
@@ -4550,6 +4868,55 @@ msgstr ""
 "pa mira kada status di bo nètwèrk via di e orario. Selektá un orario pa "
 "kambia e aparensia pa representá e momento ey den tempu."
 
+#: tools/forms/settings.py
+msgid ""
+"<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/"
+"nmap'</i>. In OpenKAT, all Boefjes with the same container image will be "
+"seen as 'variants' and will be shown together on the Boefje detail page. </"
+"p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>A description of the Boefje explaining in short what it can do. This will "
+"both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"Select the object type(s) that your Boefje consumes. To select multiple "
+"objects, press and hold the 'ctrl'/'command' key and then click the items "
+"you want to select. "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>If any other settings are needed for your Boefje, add these as a JSON "
+"Schema, otherwise, leave the field empty or 'null'.</p> <p> This JSON is "
+"used as the basis for a form for the user. When the user enables this Boefje "
+"they can get the option to give extra information. For example, it can "
+"contain an API key that the script requires.</p> <p>More information about "
+"what the schema.json file looks like can be found <a href='https://docs."
+"openkat.nl/developer_documentation/development_tutorial/creating_a_boefje."
+"html'> here</a>.</p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Add a set of mime types that are produced by this Boefje, separated by "
+"commas. For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/"
+"{boefje-id}'</i></p> <p>These output mime types will be shown on the Boefje "
+"detail page as information for other users. </p> "
+msgstr ""
+
+#: tools/forms/settings.py
+msgid ""
+"<p>Select a clearance level for your Boefje. For more information about the "
+"different clearance levels please check the <a href='https://docs.openkat.nl/"
+"manual/usermanual.html#scan-levels-clearance-indemnities'> documentation</a>."
+"</p> "
+msgstr ""
+
 #: tools/forms/settings.py
 msgid "Depth of the tree."
 msgstr "Profundidát di mapa"
@@ -4621,6 +4988,14 @@ msgstr ""
 msgid "Upload raw file"
 msgstr "Subi arkivo"
 
+#: tools/forms/upload_raw.py
+msgid "Click to select one of the available options, or type one yourself"
+msgstr ""
+
+#: tools/forms/upload_raw.py
+msgid "OOI doesn't exist, try another valid time"
+msgstr ""
+
 #: tools/models.py
 msgid "The name of the organisation"
 msgstr "E nòmber di e organisashon"
@@ -4648,7 +5023,6 @@ msgstr "nobo"
 #: tools/view_helpers.py rocky/templates/header.html
 #: rocky/templates/organizations/organization_list.html
 #: rocky/templates/organizations/organization_member_list.html
-#: rocky/templates/partials/organization_member_list_filters.html
 #: rocky/views/organization_member_edit.py
 msgid "Members"
 msgstr "Miembronan"
@@ -4713,11 +5087,11 @@ msgid "A HTTPError occurred. See Scheduler logs for more info."
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task list: "
+msgid "Schedule list: "
 msgstr ""
 
 #: rocky/scheduler.py
-msgid "Task statistics: "
+msgid "Task list: "
 msgstr ""
 
 #: rocky/settings.py
@@ -4887,6 +5261,10 @@ msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
+#: rocky/templates/admin/change_list.html
+msgid "Filter"
+msgstr "Filtrá"
+
 #: rocky/templates/admin/change_list.html
 msgid "Hide counts"
 msgstr ""
@@ -5165,6 +5543,10 @@ msgstr "Muta diskubrimentu"
 msgid "Reason:"
 msgstr ""
 
+#: rocky/templates/findings/finding_list.html
+msgid "Expires by (UTC):"
+msgstr ""
+
 #: rocky/templates/findings/finding_list.html
 msgid "Unmute Findings"
 msgstr ""
@@ -5213,11 +5595,14 @@ msgstr "Menu"
 msgid "OpenKAT logo, go to the homepage of OpenKAT"
 msgstr "KAT logo, bai na e homepage di OpenKAT"
 
-#: rocky/templates/header.html rocky/views/finding_list.py
+#: rocky/templates/header.html
+#: rocky/templates/organizations/organization_crisis_room.html
+#: rocky/views/finding_list.py
 msgid "Crisis room"
 msgstr "Sala di krísis"
 
-#: rocky/templates/header.html rocky/templates/tasks/ooi_detail_task_list.html
+#: rocky/templates/header.html rocky/templates/tasks/boefjes.html
+#: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 #: rocky/views/task_detail.py rocky/views/tasks.py
 msgid "Tasks"
@@ -5247,6 +5632,10 @@ msgstr ""
 "Indemnizashon presente pa e organisashon. Bo por awor añadi ophetonan i "
 "kuminsa skan."
 
+#: rocky/templates/indemnification_present.html
+msgid "Go to Objects"
+msgstr ""
+
 #: rocky/templates/indemnification_present.html
 msgid "Go to"
 msgstr "Bai na:"
@@ -5527,6 +5916,11 @@ msgstr "Habri detaye di diskubrimentu"
 msgid "Total findings:"
 msgstr "Totál diskubrimentu:"
 
+#: rocky/templates/oois/ooi_detail_object.html
+#: rocky/templates/scan_profiles/scan_profile_detail.html
+msgid "Inactive"
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_declarations.html
 msgid "Declarations"
 msgstr "Deklarashon"
@@ -5555,6 +5949,10 @@ msgstr "Tarea ID"
 msgid "When"
 msgstr ""
 
+#: rocky/templates/oois/ooi_detail_origins_observations.html
+msgid "This scan was manually created."
+msgstr ""
+
 #: rocky/templates/oois/ooi_detail_origins_observations.html
 msgid "The boefje has since been deleted or disabled."
 msgstr ""
@@ -5658,36 +6056,6 @@ msgstr ""
 "Bo no por añadi diskubrimentunan òf otro OOI's, e opheto aki a wordu kita i "
 "no ta aktualmente disponibel."
 
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid "Findings report for %(name)s"
-msgstr "Rapport di resultadonan pa %(name)s"
-
-#: rocky/templates/oois/ooi_report.html
-#, python-format
-msgid ""
-"These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
-"finding for more detailed information about the issue, its origin, severity "
-"and possible solutions."
-msgstr ""
-"Esakinan ta e resultadonan di un OpenKAT-analysis riba %(observed_at)s. "
-"Click un resultadopa mas informashon detayá tokante e problema, su orígen, "
-"severidat i posibel solushonnan."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid "A report for %(name)s wasn't found."
-msgstr "Un rapport pa %(name)s no por a wordu haña."
-
-#: rocky/templates/oois/ooi_report_404.html
-#, python-format
-msgid ""
-"Perhaps it never was, perhaps it just didn't exist on %(observed_at)s <br> "
-"Try some other dates!"
-msgstr ""
-"Probablemente e no tabata, probablemente e nunka a eksistí riba "
-"%(observed_at)s<br> Purba algun otro fechanan!"
-
 #: rocky/templates/oois/ooi_summary.html
 msgid "Summary for"
 msgstr "Resúmen pa"
@@ -5716,14 +6084,6 @@ msgstr "di e"
 msgid "shows the same objects."
 msgstr "mustrando e mesun ophetonan."
 
-#: rocky/templates/oois/ooi_tree.html
-msgid "Object tree"
-msgstr "Mapa di opheto"
-
-#: rocky/templates/organizations/organization_crisis_room.html
-msgid "Crisis room:"
-msgstr ""
-
 #: rocky/templates/organizations/organization_crisis_room.html
 #: rocky/templates/organizations/organization_settings.html
 msgid "indemnification warning"
@@ -5780,6 +6140,10 @@ msgstr "Edita organisashon"
 msgid "Save organization"
 msgstr "Warda organisashon"
 
+#: rocky/templates/organizations/organization_list.html
+msgid "Rerun all bits for all my organizations"
+msgstr ""
+
 #: rocky/templates/organizations/organization_list.html
 msgid "Add new organization"
 msgstr "Añadi organisashon nobo"
@@ -6064,12 +6428,6 @@ msgstr "Habri deklarashon"
 msgid "Close explanation"
 msgstr "Sera deklarashon"
 
-#: rocky/templates/partials/form/field_input_help_text.html
-#: rocky/templates/partials/notifications_block.html
-#: rocky/templates/two_factor/core/login.html
-msgid "explanation"
-msgstr "explikashon"
-
 #: rocky/templates/partials/form/field_input_help_text.html
 #: rocky/templates/partials/notifications_block.html
 #: rocky/templates/two_factor/core/login.html
@@ -6150,10 +6508,6 @@ msgstr "Sigiénte página"
 msgid "Next"
 msgstr "Sigiénte"
 
-#: rocky/templates/partials/notifications_block.html
-msgid "confirmation"
-msgstr "konfirmashon"
-
 #: rocky/templates/partials/notifications_block.html
 msgid "Confirmation:"
 msgstr ""
@@ -6171,7 +6525,7 @@ msgid "Use the button below to add a related object."
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
-msgid "Generate findings report"
+msgid "Generate Findings Report"
 msgstr ""
 
 #: rocky/templates/partials/ooi_detail_toolbar.html
@@ -6336,10 +6690,6 @@ msgstr "Bai na e kontenido"
 msgid "Current clearance level"
 msgstr ""
 
-#: rocky/templates/scan_profiles/scan_profile_detail.html
-msgid "Inactive"
-msgstr ""
-
 #: rocky/templates/scan_profiles/scan_profile_detail.html
 msgid "Declared:"
 msgstr ""
@@ -6441,6 +6791,17 @@ msgstr "Deskarga meta datonan"
 msgid "Input object"
 msgstr "Opheto di entrada"
 
+#: rocky/templates/tasks/boefjes.html
+#, python-format
+msgid ""
+"\n"
+"                        An overview of the tasks for %(organization)s. Tasks "
+"are divided in Boefjes and Normalizers.\n"
+"                        Boefjes scan objects and Normalizers dispatch on the "
+"output mime-type.\n"
+"                    "
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html
 msgid "There are no tasks for boefjes"
 msgstr "No tin tareanan pa boefjes"
@@ -6449,12 +6810,20 @@ msgstr "No tin tareanan pa boefjes"
 msgid "List of tasks for boefjes"
 msgstr "Lista di tareanan pa boefjes"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Organization Code"
+msgstr ""
+
 #: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "Created date"
 msgstr "Fecha kreá"
 
+#: rocky/templates/tasks/boefjes.html rocky/templates/tasks/normalizers.html
+msgid "Modified date"
+msgstr ""
+
 #: rocky/templates/tasks/normalizers.html
 msgid "There are no tasks for normalizers"
 msgstr "No tin tareanan pa normalizers"
@@ -6471,6 +6840,10 @@ msgstr "Normalizer"
 msgid "Boefje input OOI"
 msgstr "Opheto di Entrada \"Boefje\""
 
+#: rocky/templates/tasks/normalizers.html
+msgid "Manually added"
+msgstr ""
+
 #: rocky/templates/tasks/ooi_detail_task_list.html
 #: rocky/templates/tasks/plugin_detail_task_list.html
 msgid "There are no tasks for"
@@ -6513,14 +6886,6 @@ msgstr "Kambia fecha"
 msgid "Download task data"
 msgstr "Descarga datonan di tarea"
 
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Hide filters"
-msgstr "Skonde filters"
-
-#: rocky/templates/tasks/partials/task_filter.html
-msgid "Show filters"
-msgstr "Mustra filters"
-
 #: rocky/templates/two_factor/_wizard_actions.html
 msgid "Log in"
 msgstr "Log in"
@@ -6796,6 +7161,15 @@ msgstr ""
 msgid "Automate the creation of multiple objects by uploading a raw file."
 msgstr "Automatizá e kreo di varios ophetonan dor di karga un arkivo."
 
+#: rocky/templates/upload_raw.html
+msgid ""
+"An input OOI can be selected for the normalizer to attach newly yielded OOIs "
+"to. If no input OOI was used for the raw file, a placeholder ExternalScan "
+"OOI can be used. ExternalScan OOIs can be created from the objects page. "
+"When a new version of the raw file is generated, the same ExternalScan OOI "
+"should be chosen to ensure that old results are overwritten."
+msgstr ""
+
 #: rocky/templates/upload_raw.html rocky/views/upload_raw.py
 msgid "Upload raw"
 msgstr "Karga CSV"
@@ -6948,24 +7322,6 @@ msgstr ""
 msgid "Finding(s) successfully muted."
 msgstr "Diskubrimentu(nan) mutá ku éksito."
 
-#: rocky/views/ooi_report.py
-msgid "You can't generate a report for an OOI on a date in the future."
-msgstr "Bo no por generà un rapòrt pa un OOI ku un fecha den futuro."
-
-#: rocky/views/ooi_report.py
-msgid "Findings report"
-msgstr "Rapòrt di diskubrimentu"
-
-#: rocky/views/ooi_report.py
-msgid "Generating report failed. See Keiko logs for more information."
-msgstr "Falamentu den generashon di rapòrt. Wak Keiko logs pa mas informashon."
-
-#: rocky/views/ooi_report.py
-msgid "Timeout reached generating report. See Keiko logs for more information."
-msgstr ""
-"Tempo di espera a yega na su fin den generashon di rapòrt. Wak e Keiko logs "
-"pa mas informashon."
-
 #: rocky/views/ooi_tree.py
 msgid "Tree Visualisation"
 msgstr "Visualisá mapa di resultado"
@@ -6974,6 +7330,10 @@ msgstr "Visualisá mapa di resultado"
 msgid "Graph Visualisation"
 msgstr "Visualisá grafa"
 
+#: rocky/views/ooi_view.py
+msgid "Observed_at: "
+msgstr ""
+
 #: rocky/views/ooi_view.py
 msgid "OOI types: "
 msgstr "OOI-tiponan: "
@@ -7113,9 +7473,9 @@ msgstr ""
 msgid "Can not reset scan level. Scan level of {ooi_name} not declared"
 msgstr "No por resèt nivél di skan. Nivél di skan òf {ooi_name} no ta deklará"
 
-#: rocky/views/scan_profile.py
-msgid "Reset"
-msgstr "Resèt"
+#: rocky/views/scheduler.py
+msgid "Your report has been scheduled."
+msgstr ""
 
 #: rocky/views/scheduler.py
 msgid ""
@@ -7124,6 +7484,15 @@ msgid ""
 "refresh of the page may be needed to show the results."
 msgstr ""
 
+#: rocky/views/tasks.py
+#, python-brace-format
+msgid "Fetching tasks failed: no connection with scheduler: {error}"
+msgstr ""
+
+#: rocky/views/tasks.py
+msgid "All Tasks"
+msgstr ""
+
 #: rocky/views/upload_csv.py
 msgid ""
 "For URL object type, a column 'raw' with URL values is required, starting "
@@ -7177,6 +7546,79 @@ msgstr ""
 msgid "Raw file successfully added."
 msgstr "Arkivo crudo añadi ku èxito."
 
+#, python-format
+#~ msgid "Findings report for %(name)s"
+#~ msgstr "Rapport di resultadonan pa %(name)s"
+
+#, python-format
+#~ msgid ""
+#~ "These are the findings of a OpenKAT-analysis on %(observed_at)s. Click a "
+#~ "finding for more detailed information about the issue, its origin, "
+#~ "severity and possible solutions."
+#~ msgstr ""
+#~ "Esakinan ta e resultadonan di un OpenKAT-analysis riba %(observed_at)s. "
+#~ "Click un resultadopa mas informashon detayá tokante e problema, su "
+#~ "orígen, severidat i posibel solushonnan."
+
+#, python-format
+#~ msgid "A report for %(name)s wasn't found."
+#~ msgstr "Un rapport pa %(name)s no por a wordu haña."
+
+#, python-format
+#~ msgid ""
+#~ "Perhaps it never was, perhaps it just didn't exist on %(observed_at)s "
+#~ "<br> Try some other dates!"
+#~ msgstr ""
+#~ "Probablemente e no tabata, probablemente e nunka a eksistí riba "
+#~ "%(observed_at)s<br> Purba algun otro fechanan!"
+
+#~ msgid "You can't generate a report for an OOI on a date in the future."
+#~ msgstr "Bo no por generà un rapòrt pa un OOI ku un fecha den futuro."
+
+#~ msgid "Findings report"
+#~ msgstr "Rapòrt di diskubrimentu"
+
+#~ msgid "Generating report failed. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Falamentu den generashon di rapòrt. Wak Keiko logs pa mas informashon."
+
+#~ msgid ""
+#~ "Timeout reached generating report. See Keiko logs for more information."
+#~ msgstr ""
+#~ "Tempo di espera a yega na su fin den generashon di rapòrt. Wak e Keiko "
+#~ "logs pa mas informashon."
+
+#~ msgid ""
+#~ "Boefjes gather factual information, such as by calling an external "
+#~ "scanning tool like nmap or using a database like shodan."
+#~ msgstr ""
+#~ "Boefjes ta reuni informashon faktuál, huzando tools manera nmap òf usando "
+#~ "un base di datos manera shodan."
+
+#~ msgid " Details"
+#~ msgstr "Detayes"
+
+#~ msgid "Required"
+#~ msgstr "Requerido"
+
+#~ msgid "Action"
+#~ msgstr "Akshon"
+
+#~ msgid "Unset"
+#~ msgstr "Bashi"
+
+#~ msgid "Failed fetching settings for {}. Is the Katalogus up?"
+#~ msgstr "No por a enkontra e ajustamentunan pa {}. Katalogus ta disponibel?"
+
+#~ msgid "Before enabling, please set the required settings for '{}'."
+#~ msgstr "Promé ku aktivá, por fabor pone e ajustamentunan necesario pa '{}'."
+
+#~ msgid "Currently filtered on:"
+#~ msgstr "Aktuálmente filtrá riba:"
+
+#~ msgid "Object tree"
+#~ msgstr "Mapa di opheto"
+
 #~ msgid "Please select an OOI to start scan."
 #~ msgstr "Por fabor, selekshoná un OOI pa kuminsá skan."
 
diff --git a/rocky/rocky/permissions.py b/rocky/rocky/permissions.py
new file mode 100644
index 00000000000..950fa3636f6
--- /dev/null
+++ b/rocky/rocky/permissions.py
@@ -0,0 +1,15 @@
+from rest_framework.permissions import DjangoModelPermissions
+
+
+class KATModelPermissions(DjangoModelPermissions):
+    # We change the permissions map to include the view permissions for
+    # GET/OPTIONS/HEAD.
+    perms_map = {
+        "GET": ["%(app_label)s.view_%(model_name)s"],
+        "OPTIONS": ["%(app_label)s.view_%(model_name)s"],
+        "HEAD": ["%(app_label)s.view_%(model_name)s"],
+        "POST": ["%(app_label)s.add_%(model_name)s"],
+        "PUT": ["%(app_label)s.change_%(model_name)s"],
+        "PATCH": ["%(app_label)s.change_%(model_name)s"],
+        "DELETE": ["%(app_label)s.delete_%(model_name)s"],
+    }
diff --git a/rocky/rocky/scheduler.py b/rocky/rocky/scheduler.py
index f6c11d1cea0..ac60294d263 100644
--- a/rocky/rocky/scheduler.py
+++ b/rocky/rocky/scheduler.py
@@ -9,13 +9,16 @@
 from typing import Any
 
 import httpx
+import structlog
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from httpx import ConnectError, HTTPError, HTTPStatusError, RequestError, codes
-from pydantic import BaseModel, ConfigDict, Field, SerializeAsAny, ValidationError
+from pydantic import BaseModel, ConfigDict, Field, SerializeAsAny, TypeAdapter, ValidationError
 
 from rocky.health import ServiceHealth
 
+logger = structlog.get_logger(__name__)
+
 
 class Boefje(BaseModel):
     """Boefje representation."""
@@ -82,6 +85,15 @@ class BoefjeTask(BaseModel):
     organization: str
 
 
+class ReportTask(BaseModel):
+    """ReportTask represent data needed for a Report to run."""
+
+    type: str = "report"
+
+    organisation_id: str
+    report_recipe_id: str
+
+
 class TaskStatus(Enum):
     # Task has been created but not yet queued
     PENDING = "pending"
@@ -109,17 +121,56 @@ class TaskStatus(Enum):
 class Task(BaseModel):
     model_config = ConfigDict(from_attributes=True)
 
-    id: uuid.UUID | None = None
+    id: uuid.UUID = Field(default_factory=uuid.uuid4)
     scheduler_id: str
     schedule_id: str | None = None
     priority: int
     status: TaskStatus | None = TaskStatus.PENDING
     type: str | None = None
     hash: str | None = None
-    data: SerializeAsAny[BoefjeTask | NormalizerTask]
+    data: SerializeAsAny[BoefjeTask | NormalizerTask | ReportTask]
     created_at: datetime.datetime | None = None
     modified_at: datetime.datetime | None = None
 
+    def organization_id(self) -> str:
+        if isinstance(self.data, BoefjeTask):
+            return self.data.organization
+
+        if isinstance(self.data, NormalizerTask):
+            return self.data.raw_data.boefje_meta.organization
+
+        if isinstance(self.data, ReportTask):
+            return self.data.organisation_id
+
+        raise ValueError("No organization found related to task")
+
+
+class ScheduleRequest(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    scheduler_id: str
+    data: dict
+    schedule: str
+
+
+class ScheduleResponse(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: uuid.UUID
+    hash: str
+    data: dict
+    enabled: bool
+    schedule: str
+    tasks: list[Task]
+    deadline_at: datetime.datetime
+    created_at: datetime.datetime
+    modified_at: datetime.datetime
+
+
+class Queue(BaseModel):
+    id: str
+    size: int
+
 
 class PaginatedTasksResponse(BaseModel):
     count: int
@@ -128,6 +179,13 @@ class PaginatedTasksResponse(BaseModel):
     results: list[Task]
 
 
+class PaginatedSchedulesResponse(BaseModel):
+    count: int
+    next: str | None = None
+    previous: str | None = None
+    results: list[ScheduleResponse]
+
+
 class LazyTaskList:
     HARD_LIMIT = 500
 
@@ -220,6 +278,36 @@ def __init__(self, base_uri: str, organization_code: str | None):
         self._client = httpx.Client(base_url=base_uri)
         self.organization_code = organization_code
 
+    def list_schedules(self, **kwargs) -> PaginatedSchedulesResponse:
+        try:
+            kwargs = {k: v for k, v in kwargs.items() if v is not None}  # filter Nones from kwargs
+            res = self._client.get("/schedules", params=kwargs)
+            res.raise_for_status()
+            return PaginatedSchedulesResponse.model_validate_json(res.content)
+        except ValidationError:
+            raise SchedulerValidationError(extra_message=_("Schedule list: "))
+        except ConnectError:
+            raise SchedulerConnectError(extra_message=_("Schedule list: "))
+
+    def get_schedule_details(self, schedule_id: str) -> ScheduleResponse:
+        try:
+            res = self._client.get(f"/schedules/{schedule_id}")
+            res.raise_for_status()
+            return ScheduleResponse.model_validate_json(res.content)
+        except ConnectError:
+            raise SchedulerConnectError()
+
+    def post_schedule(self, schedule: ScheduleRequest) -> ScheduleResponse:
+        try:
+            res = self._client.post(
+                "/schedules",
+                json=schedule.model_dump(exclude_none=True),
+            )
+            res.raise_for_status()
+            return ScheduleResponse.model_validate_json(res.content)
+        except (ValidationError, HTTPStatusError, ConnectError):
+            raise SchedulerValidationError(extra_message="Report schedule failed: ")
+
     def list_tasks(
         self,
         **kwargs,
@@ -236,39 +324,42 @@ def list_tasks(
             raise SchedulerConnectError(extra_message=_("Task list: "))
 
     def get_task_details(self, task_id: str) -> Task:
-        if self.organization_code is None:
-            raise SchedulerTaskNotFound("No organization defined in client.")
-        task_details = Task.model_validate_json(self._get(f"/tasks/{task_id}", "content"))
-
-        if task_details.type == "normalizer":
-            organization = task_details.data.raw_data.boefje_meta.organization
-        else:
-            organization = task_details.data.organization
-
-        if organization != self.organization_code:
-            raise SchedulerTaskNotFound()
-
-        return task_details
+        return Task.model_validate_json(self._get(f"/tasks/{task_id}", "content"))
 
     def push_task(self, item: Task) -> None:
         try:
-            queue_name = f"{item.data.type}-{self.organization_code}"
             res = self._client.post(
-                f"/queues/{queue_name}/push",
-                content=item.json(exclude_none=True),
+                f"/queues/{item.scheduler_id}/push",
+                content=item.model_dump_json(exclude_none=True),
                 headers={"Content-Type": "application/json"},
             )
             res.raise_for_status()
         except HTTPStatusError as http_error:
             code = http_error.response.status_code
             if code == codes.TOO_MANY_REQUESTS:
-                raise SchedulerTooManyRequestError()
+                raise SchedulerTooManyRequestError() from http_error
             elif code == codes.BAD_REQUEST:
-                raise SchedulerBadRequestError()
+                raise SchedulerBadRequestError() from http_error
             elif code == codes.CONFLICT:
-                raise SchedulerConflictError()
-        except RequestError:
-            raise SchedulerError()
+                raise SchedulerConflictError() from http_error
+        except RequestError as request_error:
+            raise SchedulerError() from request_error
+
+    def get_queues(self) -> list[Queue]:
+        response = self._client.get("/queues")
+        response.raise_for_status()
+
+        return TypeAdapter(list[Queue]).validate_json(response.content)
+
+    def pop_item(self, queue: str) -> Task | None:
+        response = self._client.post(f"/queues/{queue}/pop")
+        response.raise_for_status()
+
+        return TypeAdapter(Task | None).validate_json(response.content)
+
+    def patch_task(self, task_id: uuid.UUID, status: TaskStatus) -> None:
+        response = self._client.patch(f"/tasks/{task_id}", json={"status": status.value})
+        response.raise_for_status()
 
     def health(self) -> ServiceHealth:
         return ServiceHealth.model_validate_json(self._get("/health", return_type="content"))
@@ -310,6 +401,14 @@ def _get(self, path: str, return_type: str = "json") -> dict | bytes:
             return res.content
         return res.json()
 
+    def get_scheduled_reports(self, **params) -> list[dict[str, Any]]:
+        try:
+            response = self._client.get("/schedules", params=params)
+            response.raise_for_status()
+        except HTTPStatusError:
+            logger.error("A HTTPStatusError occurred. Check logs for more info.")
+        return response.json()["results"]
+
 
 def scheduler_client(organization_code: str | None) -> SchedulerClient:
     return SchedulerClient(settings.SCHEDULER_API, organization_code)
diff --git a/rocky/rocky/settings.py b/rocky/rocky/settings.py
index 6040c32ca5c..269d371ffcf 100644
--- a/rocky/rocky/settings.py
+++ b/rocky/rocky/settings.py
@@ -469,9 +469,7 @@ def immutable_file_test(path, url):
 REST_FRAMEWORK = {
     "DEFAULT_AUTHENTICATION_CLASSES": DEFAULT_AUTHENTICATION_CLASSES,
     "DEFAULT_PERMISSION_CLASSES": [
-        # For now this will provide a safe default, but non-admin users will
-        # need to be able to use the API in the future..
-        "rest_framework.permissions.IsAdminUser",
+        "rocky.permissions.KATModelPermissions",
     ],
     "DEFAULT_RENDERER_CLASSES": DEFAULT_RENDERER_CLASSES,
     "EXCEPTION_HANDLER": "drf_standardized_errors.handler.exception_handler",
@@ -527,14 +525,17 @@ def immutable_file_test(path, url):
         structlog.dev.set_exc_info,
         structlog.stdlib.PositionalArgumentsFormatter(),
         structlog.processors.TimeStamper("iso", utc=False),
-        (
-            structlog.processors.JSONRenderer()
-            if LOGGING_FORMAT == "json"
-            else structlog.dev.ConsoleRenderer(colors=True, pad_level=False)
-        ),
+        structlog.stdlib.ProcessorFormatter.wrap_for_formatter,
     ],
     context_class=dict,
     logger_factory=structlog.stdlib.LoggerFactory(),
     wrapper_class=structlog.stdlib.BoundLogger,
     cache_logger_on_first_use=True,
 )
+
+# Number of workers to run for the report queue
+POOL_SIZE = env.int("POOL_SIZE", default=2)
+# Time to wait before polling for tasks when the queue is empty
+POLL_INTERVAL = env.int("POLL_INTERVAL", default=10)
+# Seconds to wait before checking the workers when queues are full
+WORKER_HEARTBEAT = env.int("WORKER_HEARTBEAT", default=5)
diff --git a/rocky/rocky/templates/finding_type_add.html b/rocky/rocky/templates/finding_type_add.html
index fa00bb72057..f44485c4b17 100644
--- a/rocky/rocky/templates/finding_type_add.html
+++ b/rocky/rocky/templates/finding_type_add.html
@@ -12,7 +12,7 @@
                 <h1>{% translate "Add finding type:" %}</h1>
                 <form action="{% url "finding_type_add" organization_code=organization.code %}"
                       method="post"
-                      class="horizontal-view help">
+                      class="help">
                     {% csrf_token %}
                     {% translate "Finding Type" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/rocky/templates/findings/finding_add.html b/rocky/rocky/templates/findings/finding_add.html
index 2ad238fd8ee..68fac9a1156 100644
--- a/rocky/rocky/templates/findings/finding_add.html
+++ b/rocky/rocky/templates/findings/finding_add.html
@@ -12,7 +12,7 @@
                 <h1>{% translate "Add finding:" %}</h1>
                 <form action="{% url "finding_add" organization.code %}"
                       method="post"
-                      class="horizontal-view help">
+                      class="help">
                     {% csrf_token %}
                     {% translate "Finding" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/rocky/templates/findings/findings_filter.html b/rocky/rocky/templates/findings/findings_filter.html
index 7e9d7553713..be3ba962297 100644
--- a/rocky/rocky/templates/findings/findings_filter.html
+++ b/rocky/rocky/templates/findings/findings_filter.html
@@ -12,13 +12,10 @@
     </div>
     <form method="get" class="help">
         {% include "partials/form/fieldset.html" with fields=observed_at_form %}
+        {% include "partials/form/fieldset.html" with fields=severity_filter fieldset_class="filter-fields-direction column" %}
+        {% include "partials/form/fieldset.html" with fields=muted_findings_filter fieldset_class="filter-fields-direction column" %}
+        {% include "partials/form/fieldset.html" with fields=finding_search_form %}
 
-        <div class="column-3 filter-fields-direction row">
-            {% include "partials/form/fieldset.html" with fields=severity_filter fieldset_class="filter-fields-direction column" %}
-            {% include "partials/form/fieldset.html" with fields=muted_findings_filter fieldset_class="filter-fields-direction column" %}
-            {% include "partials/form/fieldset.html" with fields=finding_search_form %}
-
-        </div>
         <div class="button-container">
             <input type="submit"
                    value="{% if submit_text %}{{ submit_text }}{% else %}{% translate "Set filters" %}{% endif %}" />
diff --git a/rocky/rocky/templates/indemnification_present.html b/rocky/rocky/templates/indemnification_present.html
index 104c9871c40..875e09ec93e 100644
--- a/rocky/rocky/templates/indemnification_present.html
+++ b/rocky/rocky/templates/indemnification_present.html
@@ -2,11 +2,11 @@
 
 <h1>{% translate "Indemnification" %}</h1>
 <div class="explanation">
-    <p>{% translate "Indemnification on the organization present. You may now add objects and start scans." %}</p>
-    <p>
-        {% translate "Go to" %} <a href="{% url 'ooi_list' organization.code %}">{% translate "Objects" %}</a>
-    </p>
-    <p>
-        {% translate "Go to" %} <a href="{% url "katalogus" organization.code %}">KAT-alogus</a>
-    </p>
+    <div>
+        <p>{% translate "Indemnification on the organization present. You may now add objects and start scans." %}</p>
+        <div class="horizontal-view">
+            <a href="{% url 'ooi_list' organization.code %}" class="button ghost">{% translate "Go to Objects" %}</a>
+            <a href="{% url "katalogus" organization.code %}" class="button ghost">{% translate "Go to" %} KAT-alogus</a>
+        </div>
+    </div>
 </div>
diff --git a/rocky/rocky/templates/oois/ooi_detail.html b/rocky/rocky/templates/oois/ooi_detail.html
index 9a55c6511b2..c5647fa7f1a 100644
--- a/rocky/rocky/templates/oois/ooi_detail.html
+++ b/rocky/rocky/templates/oois/ooi_detail.html
@@ -45,7 +45,7 @@ <h2>{% translate "Scan" %} {{ ooi.human_readable }} {% translate "using boefjes"
                 {% if enabled_boefjes_available %}
                     <div class="horizontal-view">
                         <div>
-                            {% if member.acknowledged_clearance_level > 0 and organization_indemnification %}
+                            {% if member.max_clearance_level > 0 and organization_indemnification %}
                                 <form id="show_all_boefjes"
                                       method="get"
                                       action="#show_all_boefjes"
diff --git a/rocky/rocky/templates/oois/ooi_detail_add_related_object.html b/rocky/rocky/templates/oois/ooi_detail_add_related_object.html
index 3309e12c53f..02e5bc5eacf 100644
--- a/rocky/rocky/templates/oois/ooi_detail_add_related_object.html
+++ b/rocky/rocky/templates/oois/ooi_detail_add_related_object.html
@@ -12,7 +12,7 @@
             <section>
                 <div>
                     <h3>{% translate "Add related object" %}</h3>
-                    <form method="get" class="horizontal-view help">
+                    <form method="get" class="help">
                         {% if ooi_id %}<input type="hidden" name="ooi_id" value="{{ ooi_id }}" />{% endif %}
                         <fieldset>
                             <legend>{% translate "Object details" %}</legend>
diff --git a/rocky/rocky/templates/oois/ooi_list.html b/rocky/rocky/templates/oois/ooi_list.html
index 17f316dba27..abf8fe07e21 100644
--- a/rocky/rocky/templates/oois/ooi_list.html
+++ b/rocky/rocky/templates/oois/ooi_list.html
@@ -29,13 +29,67 @@ <h1>
                     {% blocktranslate with length=ooi_list|length total=total_oois %}Showing {{ length }} of {{ total }} objects{% endblocktranslate %}
                 </p>
                 <form method="post"
-                      class="inline layout-wide checkboxes_required"
-                      action="#bulk_clearance_level_submit">
+                      id="ooi_list_form"
+                      class="inline layout-wide checkboxes_required">
                     {% csrf_token %}
                     <div class="horizontal-scroll">
-                        {% include "partials/form/form_errors.html" with form=select_oois_form %}
+                        <table class="nowrap">
+                            <caption class="visually-hidden">
+                                {% translate "Objects " %}
+                                <span class="visually-hidden">, {% translate "column headers with buttons are sortable" %}</span>
+                            </caption>
+                            <thead>
+                                <th>
+                                    <input class="toggle-all" data-toggle-target="ooi" type="checkbox">
+                                </th>
+                                <th>{% translate "Object" %}</th>
+                                <th scope="col"
+                                    class="sortable"
+                                    {% if order_by == "object_type" %}aria-sort="{{ sorting_order_class }}"{% endif %}>
+                                    <button form="ooi_list_settings"
+                                            name="order_by"
+                                            value="object_type"
+                                            class="sort">
+                                        {% translate "Type" %}
+                                        <span aria-hidden="true"
+                                              class="icon ti-{% if order_by == "object_type" and sorting_order == "asc" %}chevron-up{% elif order_by == "object_type" and sorting_order == "desc" %}chevron-down{% else %}direction{% endif %}"></span>
+                                    </button>
+                                </th>
+                                <th scope="col"
+                                    class="sortable"
+                                    {% if order_by == "scan_level" %}aria-sort="{{ sorting_order_class }}"{% endif %}>
+                                    <button form="ooi_list_settings"
+                                            name="order_by"
+                                            value="scan_level"
+                                            lass="sort">
+                                        {% translate "Clearance level" %}
+                                        <span aria-hidden="true"
+                                              class="icon ti-{% if order_by == "scan_level" and sorting_order == "asc" %}chevron-up{% elif order_by == "scan_level" and sorting_order == "desc" %}chevron-down{% else %}direction{% endif %}"></span>
+                                    </button>
+                                </th>
+                                <th>{% translate "Clearance type" %}</th>
+                            </thead>
+                            <tbody>
+                                {% for object in ooi_list %}
+                                    <tr>
+                                        <td>
+                                            <input type="checkbox" name="ooi" value="{{ object.primary_key }}">
+                                        </td>
+                                        <td>
+                                            <a href="{% ooi_url "ooi_detail" object.primary_key organization.code observed_at=observed_at %}">{{ object.human_readable }}</a>
+                                        </td>
+                                        <td>
+                                            <a href="{{ request.path }}?observed_at={{ observed_at|date:"Y-m-d" }}&ooi_type={{ object.ooi_type }}">{{ object.ooi_type }}</a>
+                                        </td>
+                                        <td>
+                                            {% include "partials/scan_level_indicator.html" with value=object.scan_profile.level.value %}
 
-                        {% for field in select_oois_form %}{{ field }}{% endfor %}
+                                        </td>
+                                        <td>{{ object.scan_profile.scan_profile_type|title }}</td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
                     </div>
                     {% if ooi_list %}
                         <fieldset>
@@ -48,9 +102,7 @@ <h1>
                                             class="dropdown-button"
                                             name="action"
                                             value="update-scan-profile"
-                                            id="bulk_clearance_level_submit">
-                                        {% translate "Set clearance level" %}
-                                    </button>
+                                            form="ooi_list_form">{% translate "Set clearance level" %}</button>
                                 {% endif %}
                                 {% if perms.tools.can_delete_oois %}
                                     <button type="submit" class="dropdown-button" name="action" value="delete">{% translate "Delete object(s)" %}</button>
diff --git a/rocky/rocky/templates/oois/ooi_mute_finding.html b/rocky/rocky/templates/oois/ooi_mute_finding.html
index f9723114431..44888d2b17d 100644
--- a/rocky/rocky/templates/oois/ooi_mute_finding.html
+++ b/rocky/rocky/templates/oois/ooi_mute_finding.html
@@ -14,7 +14,7 @@ <h1>{% translate "Mute finding:" %} {{ ooi.human_readable }}</h1>
                 <form action="{% url 'ooi_add' ooi_type=ooi_type organization_code=organization.code %}"
                       novalidate
                       method="post"
-                      class="horizontal-view help">
+                      class="help">
                     {% csrf_token %}
                     {% translate "Mute finding" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/rocky/templates/oois/ooi_report.html b/rocky/rocky/templates/oois/ooi_report.html
deleted file mode 100644
index 105a0f38f4f..00000000000
--- a/rocky/rocky/templates/oois/ooi_report.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "layouts/base.html" %}
-
-{% load i18n %}
-{% load static %}
-{% load compress %}
-
-{% block content %}
-    {% url "object" ooi.primary_key as ooi_detail_url %}
-    {% include "header.html" with breadcrumbList=breadcrumbList %}
-
-    <main class="report-tmp" id="main-content">
-        <section>
-            <div class="horizontal-view toolbar">
-                <a href="{% ooi_url 'ooi_pdf_report' ooi.primary_key organization.code query=mandatory_fields %}"
-                   class="button ghost">{% translate "Download PDF" %}</a>
-            </div>
-            <div>
-                {% include "partials/elements/ooi_report_settings.html" %}
-
-                <h1>
-                    {% blocktranslate trimmed with name=ooi.human_readable %}
-                        Findings report for {{ name }}
-                    {% endblocktranslate %}
-                </h1>
-                <p>
-                    {% blocktranslate trimmed %}
-                        These are the findings of a OpenKAT-analysis on {{ observed_at }}. Click a finding for more detailed
-                        information about the issue, its origin, severity and possible solutions.
-                    {% endblocktranslate %}
-                </p>
-            </div>
-        </section>
-        {% include "partials/ooi_report_severity_totals.html" %}
-        {% include "partials/ooi_report_findings_block.html" %}
-
-    </main>
-{% endblock content %}
-{% block html_at_end_body %}
-    {{ block.super }}
-    {% compress js %}
-        <script src="{% static "js/checkboxToggler.js" %}" nonce="{{ request.csp_nonce }}"></script>
-    {% endcompress %}
-{% endblock html_at_end_body %}
diff --git a/rocky/rocky/templates/oois/ooi_report_404.html b/rocky/rocky/templates/oois/ooi_report_404.html
deleted file mode 100644
index d002cdae143..00000000000
--- a/rocky/rocky/templates/oois/ooi_report_404.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends "layouts/base.html" %}
-
-{% load i18n %}
-{% load static %}
-{% load compress %}
-
-{% block content %}
-    {% url "object" ooi.primary_key as ooi_detail_url %}
-    {% include "header.html" with breadcrumbList=breadcrumbList %}
-
-    <main class="report-tmp" id="main-content">
-        <section>
-            <div>
-                {% include "partials/elements/ooi_report_settings_form.html" %}
-
-                <h1>
-                    {% blocktranslate trimmed with name=ooi.human_readable %}
-                        A report for {{ name }} wasn't found.
-                    {% endblocktranslate %}
-                </h1>
-                <p>
-                    {% blocktranslate trimmed %}
-                        Perhaps it never was, perhaps it just didn't exist on {{ observed_at }}
-                        <br>
-                        Try some other dates!
-                    {% endblocktranslate %}
-                </p>
-            </div>
-        </section>
-    </main>
-{% endblock content %}
-{% block html_at_end_body %}
-    {{ block.super }}
-    {% compress js %}
-        <script src="{% static "js/checkboxToggler.js" %}" nonce="{{ request.csp_nonce }}"></script>
-    {% endcompress %}
-{% endblock html_at_end_body %}
diff --git a/rocky/rocky/templates/organizations/organization_add.html b/rocky/rocky/templates/organizations/organization_add.html
index 63c335f74d5..97acdfe17e8 100644
--- a/rocky/rocky/templates/organizations/organization_add.html
+++ b/rocky/rocky/templates/organizations/organization_add.html
@@ -17,7 +17,7 @@ <h1>{% translate "Organization setup" %}</h1>
                         page within OpenKAT when necessary.
                     {% endblocktranslate %}
                 </p>
-                <form novalidate method="post" class="horizontal-view help layout-form">
+                <form novalidate method="post" class="help layout-form">
                     {% csrf_token %}
                     {% translate "Organization details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/rocky/templates/organizations/organization_edit.html b/rocky/rocky/templates/organizations/organization_edit.html
index 5ee579cc8ab..d8c5dae7358 100644
--- a/rocky/rocky/templates/organizations/organization_edit.html
+++ b/rocky/rocky/templates/organizations/organization_edit.html
@@ -11,7 +11,7 @@
         <section>
             <div>
                 <h1>{% translate "Edit organization" %} {{ organization.name }}</h1>
-                <form method="post" class="horizontal-view help">
+                <form method="post" class="help">
                     {% csrf_token %}
                     <fieldset>
                         {% for field in form %}
diff --git a/rocky/rocky/templates/organizations/organization_member_add.html b/rocky/rocky/templates/organizations/organization_member_add.html
index dea1732b8b0..ccc31f05142 100644
--- a/rocky/rocky/templates/organizations/organization_member_add.html
+++ b/rocky/rocky/templates/organizations/organization_member_add.html
@@ -10,7 +10,7 @@
         <section>
             <div>
                 <h1>{{ view.kwargs.account_type|capfirst }}{% translate " member account setup" %}</h1>
-                <form novalidate  method="post" class="horizontal-view help">
+                <form novalidate  method="post" class="help">
                     {% csrf_token %}
                     {% translate "Member details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
diff --git a/rocky/rocky/templates/organizations/organization_member_add_account_type.html b/rocky/rocky/templates/organizations/organization_member_add_account_type.html
index 0700684e0a6..06809f3ac5c 100644
--- a/rocky/rocky/templates/organizations/organization_member_add_account_type.html
+++ b/rocky/rocky/templates/organizations/organization_member_add_account_type.html
@@ -11,7 +11,7 @@
             <div class="layout-form">
                 <h1>{% translate "Member account type setup" %}</h1>
                 <p>{% translate "Choose an account type for this new member." %}</p>
-                <form novalidate  method="get" class="horizontal-view help">
+                <form novalidate  method="get" class="help">
                     {% translate "Account type details" as fieldset_legend %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
diff --git a/rocky/rocky/templates/organizations/organization_member_edit.html b/rocky/rocky/templates/organizations/organization_member_edit.html
index 38cfbf754ea..ec18f3067be 100644
--- a/rocky/rocky/templates/organizations/organization_member_edit.html
+++ b/rocky/rocky/templates/organizations/organization_member_edit.html
@@ -11,7 +11,7 @@
         <section>
             <div>
                 <h1>{% translate "Edit member" %} {{ object.user.full_name }}</h1>
-                <form method="post" class="horizontal-view help">
+                <form method="post" class="help">
                     {% csrf_token %}
                     {% include "partials/form/fieldset.html" with fields=form %}
 
diff --git a/rocky/rocky/templates/organizations/organization_member_upload.html b/rocky/rocky/templates/organizations/organization_member_upload.html
index 610bb1eca15..5774041b981 100644
--- a/rocky/rocky/templates/organizations/organization_member_upload.html
+++ b/rocky/rocky/templates/organizations/organization_member_upload.html
@@ -20,10 +20,7 @@ <h1>{% translate "Upload a csv file with members for organisation" %} "{{ organi
                 <ul>
                     {% for criterion in criteria %}<li>{{ criterion }}</li>{% endfor %}
                 </ul>
-                <form novalidate
-                      method="post"
-                      class="horizontal-view help"
-                      enctype="multipart/form-data">
+                <form novalidate method="post" class="help" enctype="multipart/form-data">
                     {% csrf_token %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
diff --git a/rocky/rocky/templates/partials/elements/ooi_add_type_select_form.html b/rocky/rocky/templates/partials/elements/ooi_add_type_select_form.html
index 59739ded47c..b00d7eed468 100644
--- a/rocky/rocky/templates/partials/elements/ooi_add_type_select_form.html
+++ b/rocky/rocky/templates/partials/elements/ooi_add_type_select_form.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 {% spaceless %}
-    <form method="get" class="horizontal-view help">
+    <form method="get" class="help">
         {% if ooi %}<input type="hidden" name="ooi_id" value="{{ ooi.primary_key }}" />{% endif %}
         <fieldset>
             <legend>{% translate "Object details" %}</legend>
diff --git a/rocky/rocky/templates/partials/elements/ooi_list_settings_form.html b/rocky/rocky/templates/partials/elements/ooi_list_settings_form.html
index 16fbbc32e9c..e2e3ced0d65 100644
--- a/rocky/rocky/templates/partials/elements/ooi_list_settings_form.html
+++ b/rocky/rocky/templates/partials/elements/ooi_list_settings_form.html
@@ -1,12 +1,13 @@
 {% load i18n %}
 
-<form action="{% if organization.code %}{% url request.resolver_match.url_name organization.code %}{% else %}{% url request.resolver_match.url_name %}{% endif %}"
+<form id="ooi_list_settings"
+      action="{% if organization.code %}{% url request.resolver_match.url_name organization.code %}{% else %}{% url request.resolver_match.url_name %}{% endif %}"
       method="get"
       class="help">
     {% if ooi_id %}<input type="hidden" name="ooi_id" value="{{ ooi_id }}" />{% endif %}
     {% include "partials/form/field_hidden_from_list.html" with list=mandatory_fields form=observed_at_form %}
     {% include "partials/form/fieldset.html" with fields=observed_at_form %}
-    {% include "partials/form/fieldset.html" with fields=ooi_type_form custom_class="column-4" %}
+    {% include "partials/form/fieldset.html" with fields=ooi_type_form custom_class="column-2 checkbox-list" %}
 
     {% if ooi_type_form.fields.ooi_type.choices|length > 4 %}
         <button type="button"
@@ -16,6 +17,10 @@
     {% include "partials/form/fieldset.html" with fields=clearance_level_filter_form fieldset_parent_class="column-2" %}
     {% include "partials/form/fieldset.html" with fields=ooi_search_form %}
 
+    {{ order_by_form }}
+    <input type="hidden"
+           name="sorting_order"
+           value="{% if sorting_order == "asc" %}desc{% else %}asc{% endif %}">
     <div class="button-container">
         <input type="submit"
                value="{% if submit_text %}{{ submit_text }}{% else %}{% translate "Set filters" %}{% endif %}" />
diff --git a/rocky/rocky/templates/partials/findings_list_toolbar.html b/rocky/rocky/templates/partials/findings_list_toolbar.html
index 2f425941068..a1cc07a4081 100644
--- a/rocky/rocky/templates/partials/findings_list_toolbar.html
+++ b/rocky/rocky/templates/partials/findings_list_toolbar.html
@@ -5,6 +5,4 @@
     <a href="{% url "finding_type_add" organization.code %}"
        class="button ghost">{% translate "Add finding type" %}</a>
     <!-- Note that we cannot pass e.g. severity=request.GET.severity explicitly since this is a list parameter -->
-    <a href="{% url "findings_pdf_report" organization.code %}?{{ request.GET.urlencode }}"
-       class="button ghost">{% translate "Download PDF" %}</a>
 </div>
diff --git a/rocky/rocky/templates/partials/form/field_input.html b/rocky/rocky/templates/partials/form/field_input.html
index fcaad77193a..7c55eb623d5 100644
--- a/rocky/rocky/templates/partials/form/field_input.html
+++ b/rocky/rocky/templates/partials/form/field_input.html
@@ -2,6 +2,7 @@
 
 <div {% if field.field.required %}class="required"{% endif %}>
     {{ field.label_tag }}
+    <p id="input-description" class="nota-bene">{{ field.field.widget.attrs.description }}</p>
     {% if form_view != "vertical" %}
         <div>
             {% if field.field.required %}
diff --git a/rocky/rocky/templates/partials/form/field_input_help_text.html b/rocky/rocky/templates/partials/form/field_input_help_text.html
index b45b8b35255..f1db9d1e166 100644
--- a/rocky/rocky/templates/partials/form/field_input_help_text.html
+++ b/rocky/rocky/templates/partials/form/field_input_help_text.html
@@ -3,12 +3,15 @@
 {% spaceless %}
     {% if help_text %}
         <div id="explanation-{{ field.label.split|join:"-"|lower }}"
-             class="explanation help-text"
+             class="explanation"
+             role="group"
              data-open-label="{% translate "Open explanation" %}"
              data-close-label="{% translate "Close explanation" %}"
              aria-label="{% translate "explanation" %}">
-            <span>{% translate "Explanation:" %}</span>
-            {{ help_text }}
+            <div>
+                <span>{% translate "Explanation:" %}</span>
+                {{ help_text }}
+            </div>
         </div>
     {% endif %}
 {% endspaceless %}
diff --git a/rocky/rocky/templates/partials/form/field_input_radio.html b/rocky/rocky/templates/partials/form/field_input_radio.html
index 6e796eddfeb..608b2e94512 100644
--- a/rocky/rocky/templates/partials/form/field_input_radio.html
+++ b/rocky/rocky/templates/partials/form/field_input_radio.html
@@ -7,12 +7,7 @@
     {% endif %}
     {% for choice in field %}
         <div class="radio">
-            <input type="radio"
-                   name="{{ field.name }}"
-                   value="{{ choice.data.value }}"
-                   id="id_{{ field.name }}_{{ forloop.counter0 }}"
-                   {% if choice.data.attrs.disabled %}disabled{% endif %}
-                   {% if choice.data.attrs.checked %}checked{% endif %} />
+            <input type="radio" name="{{ field.name }}" value="{{ choice.data.value }}" {% for key, value in choice.data.attrs.items %}{{ key }}="{{ value }}"{% endfor %} {% if field.initial == choice.data.value %}checked="True"{% endif %}>
             <label for="id_{{ field.name }}_{{ forloop.counter0 }}">
                 {% if choice.data.attrs.radio_paws %}
                     {% include "partials/scan_level_indicator.html" with value=choice.data.value custom_class=choice.data.attrs.class %}
diff --git a/rocky/rocky/templates/partials/notifications_block.html b/rocky/rocky/templates/partials/notifications_block.html
index 7dd32d42375..6589c970d0d 100644
--- a/rocky/rocky/templates/partials/notifications_block.html
+++ b/rocky/rocky/templates/partials/notifications_block.html
@@ -7,27 +7,31 @@
                 <div class="confirmation"
                      role="group"
                      aria-label="{% translate "confirmation" %}">
-                    <span>{% translate "Confirmation:" %}</span>
-                    <p>
-                        {% if "safe" in message.tags %}
-                            {{ message|safe }}
-                        {% else %}
-                            {{ message }}
-                        {% endif %}
-                    </p>
+                    <div>
+                        <span>{% translate "Confirmation:" %}</span>
+                        <p>
+                            {% if "safe" in message.tags %}
+                                {{ message|safe }}
+                            {% else %}
+                                {{ message }}
+                            {% endif %}
+                        </p>
+                    </div>
                 </div>
             </div>
         {% elif "error" in message.tags %}
             <div class="message">
                 <div class="error" role="group" aria-label="{% translate "error" %}">
-                    <span>{% translate "Error:" %}</span>
-                    <p>
-                        {% if "safe" in message.tags %}
-                            {{ message|safe }}
-                        {% else %}
-                            {{ message }}
-                        {% endif %}
-                    </p>
+                    <div>
+                        <span>{% translate "Error:" %}</span>
+                        <p>
+                            {% if "safe" in message.tags %}
+                                {{ message|safe }}
+                            {% else %}
+                                {{ message }}
+                            {% endif %}
+                        </p>
+                    </div>
                 </div>
             </div>
         {% elif "info" in message.tags %}
@@ -35,27 +39,31 @@
                 <div class="explanation"
                      role="group"
                      aria-label="{% translate "explanation" %}">
-                    <span>{% translate "Explanation:" %}</span>
-                    <p>
-                        {% if "safe" in message.tags %}
-                            {{ message|safe }}
-                        {% else %}
-                            {{ message }}
-                        {% endif %}
-                    </p>
+                    <div>
+                        <span>{% translate "Explanation:" %}</span>
+                        <p>
+                            {% if "safe" in message.tags %}
+                                {{ message|safe }}
+                            {% else %}
+                                {{ message }}
+                            {% endif %}
+                        </p>
+                    </div>
                 </div>
             </div>
         {% elif "warning" in message.tags %}
             <div class="message">
                 <div class="warning" role="group" aria-label="{% translate "warning" %}">
-                    <span>{% translate "Warning:" %}</span>
-                    <p>
-                        {% if "safe" in message.tags %}
-                            {{ message|safe }}
-                        {% else %}
-                            {{ message }}
-                        {% endif %}
-                    </p>
+                    <div>
+                        <span>{% translate "Warning:" %}</span>
+                        <p>
+                            {% if "safe" in message.tags %}
+                                {{ message|safe }}
+                            {% else %}
+                                {{ message }}
+                            {% endif %}
+                        </p>
+                    </div>
                 </div>
             </div>
         {% endif %}
diff --git a/rocky/rocky/templates/partials/ooi_detail_toolbar.html b/rocky/rocky/templates/partials/ooi_detail_toolbar.html
index de282053b02..1cca46cf3ee 100644
--- a/rocky/rocky/templates/partials/ooi_detail_toolbar.html
+++ b/rocky/rocky/templates/partials/ooi_detail_toolbar.html
@@ -8,7 +8,7 @@
         {% csrf_token %}
         <input type="hidden" name="ooi" value="{{ ooi_id }}">
         <input type="hidden" name="report_type" value="findings-report">
-        <button>{% translate "Generate findings report" %}</button>
+        <button>{% translate "Generate Findings Report" %}</button>
     </form>
     {% if not ooi_past_due %}
         {% if ooi|is_finding and perms.tools.can_mute_findings %}
diff --git a/rocky/rocky/templates/scan_profiles/scan_profile_detail.html b/rocky/rocky/templates/scan_profiles/scan_profile_detail.html
index e9487403bff..b3d6fb68903 100644
--- a/rocky/rocky/templates/scan_profiles/scan_profile_detail.html
+++ b/rocky/rocky/templates/scan_profiles/scan_profile_detail.html
@@ -36,7 +36,7 @@ <h2 rf-selector="clearance-header">{% translate "Current clearance level" %}</h2
               of objects that inherit from this clearance level will also be recalculated.
             {% endblocktranslate %}
                     </p>
-                    {% if organization_member.acknowledged_clearance_level > -1 and organization_indemnification and organization_member.trusted_clearance_level > -1 %}
+                    {% if organization_member.max_clearance_level > -1 and organization_indemnification %}
                         <div class="horizontal-view">
                             <a href="{% ooi_url "scan_profile_reset" ooi.reference organization.code query=mandatory_fields %}"
                                class="button">{% translate "Set clearance level to inherit" %}</a>
@@ -56,13 +56,13 @@ <h2 rf-selector="clearance-header">{% translate "Current clearance level" %}</h2
                     {% include "partials/explanations.html" %}
 
                 {% endif %}
-                {% if organization_member.acknowledged_clearance_level > -1 and organization_indemnification and organization_member.trusted_clearance_level > -1 %}
+                {% if organization_member.max_clearance_level > -1 and organization_indemnification %}
                     <h2>{% translate "Set clearance level" %}</h2>
                     <form id="set_clearance_level"
                           novalidate
                           action="{% ooi_url "scan_profile_detail" ooi.primary_key organization.code %}#set_clearance_level"
                           method="post"
-                          class="horizontal-view help">
+                          class="help">
                         {% csrf_token %}
                         {% translate "Set clearance level" as fieldset_legend %}
                         <input type="hidden" name="action" value="change_clearance_level">
diff --git a/rocky/rocky/templates/tasks/boefjes.html b/rocky/rocky/templates/tasks/boefjes.html
index e786c0acba9..070546360bf 100644
--- a/rocky/rocky/templates/tasks/boefjes.html
+++ b/rocky/rocky/templates/tasks/boefjes.html
@@ -10,75 +10,87 @@
     <main id="main-content">
         <section>
             <div>
-                {% include "tasks/partials/tab_navigation.html" with view="boefjes_tasks" %}
+                <h1>{% translate "Tasks" %}</h1>
+                <p class="emphasized">
+                    {% blocktranslate %}
+                        An overview of the tasks for {{ organization }}. Tasks are divided in Boefjes and Normalizers.
+                        Boefjes scan objects and Normalizers dispatch on the output mime-type.
+                    {% endblocktranslate%}
+                </p>
+            </div>
+            {% include "tasks/partials/tab_navigation.html" with view="boefjes_tasks" %}
 
-                <h1>{% translate "Boefjes" %}</h1>
-                {% if not task_list %}
-                    <p class="emphasized">{% translate "There are no tasks for boefjes" %}</p>
-                    {% include "tasks/partials/task_filter.html" %}
+            {% if not task_list %}
+                <div>
+                    <h2>{% translate "Boefjes" %}</h2>
+                    <p>{% translate "There are no tasks for boefjes" %}</p>
+                </div>
+                {% include "tasks/partials/task_filter.html" %}
 
-                {% else %}
-                    <p class="emphasized">{% translate "List of tasks for boefjes" %}</p>
-                    {% include "tasks/partials/task_filter.html" %}
+            {% else %}
+                <div>
+                    <h2>{% translate "Boefjes" %}</h2>
+                    <p>{% translate "List of tasks for boefjes" %}</p>
+                </div>
+                {% include "tasks/partials/task_filter.html" %}
 
-                    <div class="horizontal-scroll">
-                        <table rf-selector="table-scan-history">
-                            <thead>
-                                <tr>
+                <div class="horizontal-scroll">
+                    <table rf-selector="table-scan-history">
+                        <thead>
+                            <tr>
+                                {% if not organization.code %}
+                                    <th scope="col">{% translate "Organization Code" %}</th>
+                                {% endif %}
+                                <th scope="col">{% translate "Boefje" %}</th>
+                                <th scope="col">{% translate "Status" %}</th>
+                                <th scope="col">{% translate "Created date" %}</th>
+                                <th scope="col">{% translate "Modified date" %}</th>
+                                <th scope="col">{% translate "Input Object" %}</th>
+                                <th scope="col" class="visually-hidden">{% translate "Details" %}</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for task in task_list %}
+                                <tr data-task-id="{{ task.id }}">
                                     {% if not organization.code %}
-                                        <th scope="col">{% translate "Organization Code" %}</th>
-                                    {% endif %}
-                                    <th scope="col">{% translate "Boefje" %}</th>
-                                    <th scope="col">{% translate "Status" %}</th>
-                                    <th scope="col">{% translate "Created date" %}</th>
-                                    <th scope="col">{% translate "Modified date" %}</th>
-                                    <th scope="col">{% translate "Input Object" %}</th>
-                                    <th scope="col" class="visually-hidden">{% translate "Details" %}</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {% for task in task_list %}
-                                    <tr data-task-id="{{ task.id }}">
-                                        {% if not organization.code %}
-                                            <td>
-                                                <a href="{% url "organization_crisis_room" task.data.organization %}">{{ task.data.organization }}</a>
-                                            </td>
-                                        {% endif %}
                                         <td>
-                                            <a href="{% url "boefje_detail" task.data.organization task.data.boefje.id %}">{{ task.data.boefje.name }}</a>
-                                        </td>
-                                        <td class="nowrap">
-                                            <i class="icon {{ task.status.value }}"></i>&nbsp;{{ task.status.value|capfirst }}
+                                            <a href="{% url "organization_crisis_room" task.data.organization %}">{{ task.data.organization }}</a>
                                         </td>
-                                        <td>{{ task.created_at }}</td>
-                                        <td>{{ task.modified_at }}</td>
-                                        <td>
-                                            <a href="{% ooi_url "ooi_detail" task.data.input_ooi task.data.organization observed_at=task.created_at|date:'c' %}">{{ task.data.input_ooi }}</a>
-                                        </td>
-                                        <td>
-                                            <button type="button"
-                                                    class="expando-button boefjes-task-list-table-row"
-                                                    data-icon-open-class="icon ti-chevron-down"
-                                                    data-icon-close-class="icon ti-chevron-up"
-                                                    data-close-label="{% translate "Close details" %}">
-                                                {% translate "Open details" %}
-                                            </button>
-                                        </td>
-                                    </tr>
-                                    <tr class="expando-row">
-                                        <td colspan="{% if not organization.code %}7{% else %}6{% endif %}">
-                                            {% include "tasks/partials/task_actions.html" %}
+                                    {% endif %}
+                                    <td>
+                                        <a href="{% url "boefje_detail" task.data.organization task.data.boefje.id %}">{{ task.data.boefje.name }}</a>
+                                    </td>
+                                    <td class="nowrap">
+                                        <i class="icon {{ task.status.value }}"></i>&nbsp;{{ task.status.value|capfirst }}
+                                    </td>
+                                    <td>{{ task.created_at }}</td>
+                                    <td>{{ task.modified_at }}</td>
+                                    <td>
+                                        <a href="{% ooi_url "ooi_detail" task.data.input_ooi task.data.organization observed_at=task.created_at|date:'c' %}">{{ task.data.input_ooi }}</a>
+                                    </td>
+                                    <td>
+                                        <button type="button"
+                                                class="expando-button boefjes-task-list-table-row"
+                                                data-icon-open-class="icon ti-chevron-down"
+                                                data-icon-close-class="icon ti-chevron-up"
+                                                data-close-label="{% translate "Close details" %}">
+                                            {% translate "Open details" %}
+                                        </button>
+                                    </td>
+                                </tr>
+                                <tr class="expando-row">
+                                    <td colspan="{% if not organization.code %}7{% else %}6{% endif %}">
+                                        {% include "tasks/partials/task_actions.html" %}
 
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </tbody>
-                        </table>
-                        {% include "partials/list_paginator.html" %}
+                                    </td>
+                                </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                    {% include "partials/list_paginator.html" %}
 
-                    </div>
-                {% endif %}
-            </div>
+                </div>
+            {% endif %}
         </section>
         {% include "tasks/partials/stats.html" %}
 
diff --git a/rocky/rocky/templates/tasks/normalizers.html b/rocky/rocky/templates/tasks/normalizers.html
index 340dad142de..36a644b9d8d 100644
--- a/rocky/rocky/templates/tasks/normalizers.html
+++ b/rocky/rocky/templates/tasks/normalizers.html
@@ -56,10 +56,20 @@ <h1>{% translate "Normalizers" %}</h1>
                                         <td>{{ task.created_at }}</td>
                                         <td>{{ task.modified_at }}</td>
                                         <td>
-                                            <a href="{% url "boefje_detail" task.data.raw_data.boefje_meta.organization task.data.raw_data.boefje_meta.boefje.id %}">{{ task.data.raw_data.boefje_meta.boefje.id }}</a>
+                                            {% if task.data.raw_data.boefje_meta.boefje.name %}
+                                                {% if task.data.raw_data.boefje_meta.boefje.id == "manual" %}
+                                                    <p>{% translate "Manually added" %}</p>
+                                                {% else %}
+                                                    <a href="{% url "boefje_detail" task.data.raw_data.boefje_meta.organization task.data.raw_data.boefje_meta.boefje.id %}">{{ task.data.raw_data.boefje_meta.boefje.name }}</a>
+                                                {% endif %}
+                                            {% else %}
+                                                <a href="{% url "boefje_detail" task.data.raw_data.boefje_meta.organization task.data.raw_data.boefje_meta.boefje.id %}">{{ task.data.raw_data.boefje_meta.boefje.id }}</a>
+                                            {% endif %}
                                         </td>
                                         <td>
-                                            <a href="{% ooi_url "ooi_detail" task.data.raw_data.boefje_meta.input_ooi task.data.raw_data.boefje_meta.organization observed_at=task.created_at|date:'c' %}">{{ task.data.raw_data.boefje_meta.input_ooi }}</a>
+                                            {% if task.data.raw_data.boefje_meta.input_ooi %}
+                                                <a href="{% ooi_url "ooi_detail" task.data.raw_data.boefje_meta.input_ooi task.data.raw_data.boefje_meta.organization observed_at=task.created_at|date:'c' %}">{{ task.data.raw_data.boefje_meta.input_ooi }}</a>
+                                            {% endif %}
                                         </td>
                                         <td>
                                             <button type="button"
diff --git a/rocky/rocky/templates/tasks/partials/tab_navigation.html b/rocky/rocky/templates/tasks/partials/tab_navigation.html
index 16754c651a4..4825b8a65d6 100644
--- a/rocky/rocky/templates/tasks/partials/tab_navigation.html
+++ b/rocky/rocky/templates/tasks/partials/tab_navigation.html
@@ -1,20 +1,22 @@
 {% load i18n %}
 
-<nav class="tabs" aria-label="{% translate "List of tasks" %}">
-    <ul>
-        <li {% if view == "boefjes_tasks" %}aria-current="page"{% endif %}>
-            {% if organization %}
-                <a href="{% url 'boefjes_task_list' organization.code %}">{% translate "Boefjes" %}</a>
-            {% else %}
-                <a href="{% url 'all_boefjes_task_list' %}">{% translate "Boefjes" %}</a>
-            {% endif %}
-        </li>
-        <li {% if view == "normalizers_tasks" %}aria-current="page"{% endif %}>
-            {% if organization %}
-                <a href="{% url 'normalizers_task_list' organization.code %}">{% translate "Normalizers" %}</a>
-            {% else %}
-                <a href="{% url 'all_normalizers_task_list' %}">{% translate "Normalizers" %}</a>
-            {% endif %}
-        </li>
-    </ul>
-</nav>
+<div>
+    <nav class="tabs" aria-label="{% translate "List of tasks" %}">
+        <ul>
+            <li {% if view == "boefjes_tasks" %}aria-current="page"{% endif %}>
+                {% if organization %}
+                    <a href="{% url 'boefjes_task_list' organization.code %}">{% translate "Boefjes" %}</a>
+                {% else %}
+                    <a href="{% url 'all_boefjes_task_list' %}">{% translate "Boefjes" %}</a>
+                {% endif %}
+            </li>
+            <li {% if view == "normalizers_tasks" %}aria-current="page"{% endif %}>
+                {% if organization %}
+                    <a href="{% url 'normalizers_task_list' organization.code %}">{% translate "Normalizers" %}</a>
+                {% else %}
+                    <a href="{% url 'all_normalizers_task_list' %}">{% translate "Normalizers" %}</a>
+                {% endif %}
+            </li>
+        </ul>
+    </nav>
+</div>
diff --git a/rocky/rocky/templates/tasks/plugin_detail_task_list.html b/rocky/rocky/templates/tasks/plugin_detail_task_list.html
index 4e0778c4c76..80240a75031 100644
--- a/rocky/rocky/templates/tasks/plugin_detail_task_list.html
+++ b/rocky/rocky/templates/tasks/plugin_detail_task_list.html
@@ -3,11 +3,9 @@
 <div class="horizontal-scroll">
     <h2>{% translate "Tasks" %}</h2>
     {% if not task_list %}
-        <p class="emphasized">{% translate "There are no tasks for" %} {{ plugin.name }}</p>
-        {% include "tasks/partials/task_filter.html" %}
-
+        <p>{% translate "There are no tasks for" %} {{ plugin.name }}.</p>
     {% else %}
-        <p class="emphasized">{% translate "List of tasks for" %} {{ plugin.name }}</p>
+        <p>{% translate "List of tasks for" %} {{ plugin.name }}:</p>
         {% include "tasks/partials/task_filter.html" %}
 
         <table rf-selector="table-scan-history">
diff --git a/rocky/rocky/templates/two_factor/core/setup.html b/rocky/rocky/templates/two_factor/core/setup.html
index 0bc0cf94a62..c9b0ab2c1c9 100644
--- a/rocky/rocky/templates/two_factor/core/setup.html
+++ b/rocky/rocky/templates/two_factor/core/setup.html
@@ -5,7 +5,7 @@
 
 {% block content %}
     <h1>{% trans "Enable Two-Factor Authentication" %}</h1>
-    <form class="horizontal-view help">
+    <form class="help">
         <fieldset>
             <div class="explanation"
                  role="group"
@@ -39,7 +39,7 @@ <h1>{% trans "Enable Two-Factor Authentication" %}</h1>
             </div>
         </fieldset>
     </form>
-    <form action="" method="post" class="horizontal-view help">
+    <form action="" method="post" class="help">
         {% csrf_token %}
         {% include "two_factor/_wizard_forms.html" with step=wizard.steps.current %}
 
diff --git a/rocky/rocky/templates/upload_csv.html b/rocky/rocky/templates/upload_csv.html
index 1d57a16a2e1..512e336481e 100644
--- a/rocky/rocky/templates/upload_csv.html
+++ b/rocky/rocky/templates/upload_csv.html
@@ -15,10 +15,7 @@ <h1>{% translate "Upload CSV" %}</h1>
                 <ul>
                     {% for criterion in criteria %}<li>{{ criterion }}</li>{% endfor %}
                 </ul>
-                <form novalidate
-                      method="post"
-                      enctype="multipart/form-data"
-                      class="horizontal-view help">
+                <form novalidate method="post" enctype="multipart/form-data" class="help">
                     {% csrf_token %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
diff --git a/rocky/rocky/templates/upload_raw.html b/rocky/rocky/templates/upload_raw.html
index f74ccbab117..b697278766a 100644
--- a/rocky/rocky/templates/upload_raw.html
+++ b/rocky/rocky/templates/upload_raw.html
@@ -17,10 +17,7 @@ <h1>{% translate "Upload raw file" %}</h1>
                 <ul>
                     {% for criterion in criteria %}<li>{{ criterion }}</li>{% endfor %}
                 </ul>
-                <form novalidate
-                      method="post"
-                      enctype="multipart/form-data"
-                      class="horizontal-view help">
+                <form novalidate method="post" enctype="multipart/form-data" class="help">
                     {% csrf_token %}
                     {% include "partials/form/fieldset.html" with legend=fieldset_legend fields=form %}
 
diff --git a/rocky/rocky/urls.py b/rocky/rocky/urls.py
index 1397c325969..f6eb58db55d 100644
--- a/rocky/rocky/urls.py
+++ b/rocky/rocky/urls.py
@@ -21,7 +21,6 @@
 from rocky.views.ooi_findings import OOIFindingListView
 from rocky.views.ooi_list import OOIListExportView, OOIListView
 from rocky.views.ooi_mute import MuteFindingsBulkView, MuteFindingView
-from rocky.views.ooi_report import FindingReportPDFView, OOIReportPDFView, OOIReportView
 from rocky.views.ooi_tree import OOIGraphView, OOISummaryView, OOITreeView
 from rocky.views.organization_add import OrganizationAddView
 from rocky.views.organization_crisis_room import OrganizationCrisisRoomView
@@ -90,10 +89,7 @@
     path("<organization_code>/findings/mute/", MuteFindingView.as_view(), name="finding_mute"),
     path("<organization_code>/findings/mute/bulk/", MuteFindingsBulkView.as_view(), name="finding_mute_bulk"),
     path("<organization_code>/findings/finding_type/add/", FindingTypeAddView.as_view(), name="finding_type_add"),
-    path("<organization_code>/findings/report/pdf", FindingReportPDFView.as_view(), name="findings_pdf_report"),
     path("<organization_code>/objects/graph/", OOIGraphView.as_view(), name="ooi_graph"),
-    path("<organization_code>/objects/report/", OOIReportView.as_view(), name="ooi_report"),
-    path("<organization_code>/objects/report/pdf/", OOIReportPDFView.as_view(), name="ooi_pdf_report"),
     path("<organization_code>/objects/summary/", OOISummaryView.as_view(), name="ooi_summary"),
     path("<organization_code>/objects/tree/", OOITreeView.as_view(), name="ooi_tree"),
     path("<organization_code>/objects/findings/", OOIFindingListView.as_view(), name="ooi_findings"),
diff --git a/rocky/rocky/views/ooi_add.py b/rocky/rocky/views/ooi_add.py
index 1840c35ee06..12f451e5f99 100644
--- a/rocky/rocky/views/ooi_add.py
+++ b/rocky/rocky/views/ooi_add.py
@@ -8,12 +8,20 @@
 from tools.view_helpers import existing_ooi_type
 
 from octopoes.models import OOI
+from octopoes.models.ooi.monitoring import Incident
+from octopoes.models.ooi.question import Question
+from octopoes.models.ooi.reports import Report, ReportData
+from octopoes.models.ooi.web import RESTAPI, ImageMetadata
 from octopoes.models.types import type_by_name
 from rocky.views.ooi_view import BaseOOIFormView
 
+EXCLUDE_OOI_TYPES = [
+    ooi_type.get_object_type() for ooi_type in [Question, RESTAPI, Incident, ImageMetadata, Report, ReportData]
+]
+
 
 def ooi_type_input_choices():
-    ooi_types = OOI_TYPES_WITHOUT_FINDINGS
+    ooi_types = [ooi_type for ooi_type in OOI_TYPES_WITHOUT_FINDINGS if ooi_type not in EXCLUDE_OOI_TYPES]
     ooi_types.sort()
     return [{"value": ooi_type, "text": ooi_type} for ooi_type in ooi_types]
 
@@ -66,9 +74,12 @@ def setup(self, request, *args, **kwargs):
 
     def get_ooi_class(self) -> type[OOI]:
         try:
-            return type_by_name(self.kwargs["ooi_type"])
+            ooi_type = self.kwargs["ooi_type"]
+            if ooi_type in EXCLUDE_OOI_TYPES:
+                raise KeyError
+            return type_by_name(ooi_type)
         except KeyError:
-            raise Http404("OOI not found")
+            raise Http404("OOI-type not found")
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
diff --git a/rocky/rocky/views/ooi_detail.py b/rocky/rocky/views/ooi_detail.py
index 16b610a4508..7d219ae25ad 100644
--- a/rocky/rocky/views/ooi_detail.py
+++ b/rocky/rocky/views/ooi_detail.py
@@ -86,7 +86,7 @@ def get_context_data(self, **kwargs):
         if boefjes:
             context["enabled_boefjes_available"] = True
 
-        max_level = self.organization_member.acknowledged_clearance_level
+        max_level = self.organization_member.max_clearance_level
         if self.ooi.scan_profile and filter_form.is_valid() and not filter_form.cleaned_data["show_all"]:
             max_level = min(max_level, self.ooi.scan_profile.level)
 
diff --git a/rocky/rocky/views/ooi_list.py b/rocky/rocky/views/ooi_list.py
index f1e07ffe45a..d6f20569e02 100644
--- a/rocky/rocky/views/ooi_list.py
+++ b/rocky/rocky/views/ooi_list.py
@@ -10,7 +10,6 @@
 from django.utils.translation import gettext_lazy as _
 from httpx import HTTPError
 from tools.enums import CUSTOM_SCAN_LEVEL
-from tools.forms.ooi import SelectOOIForm
 from tools.forms.ooi_form import OOISearchForm, OOITypeMultiCheckboxForm
 from tools.models import Indemnification
 from tools.view_helpers import get_mandatory_fields
@@ -42,11 +41,6 @@ def get_context_data(self, **kwargs):
         context["ooi_type_form"] = OOITypeMultiCheckboxForm(self.request.GET)
         context["ooi_search_form"] = OOISearchForm(self.request.GET)
         context["mandatory_fields"] = get_mandatory_fields(self.request, params=["observed_at"])
-        context["select_oois_form"] = SelectOOIForm(
-            context.get("ooi_list", []),
-            organization_code=self.organization.code,
-            mandatory_fields=context["mandatory_fields"],
-        )
         context["member"] = self.organization_member
         context["scan_levels"] = [alias for _, alias in CUSTOM_SCAN_LEVEL.choices]
         context["organization_indemnification"] = self.get_organization_indemnification
@@ -114,7 +108,7 @@ def _set_scan_profiles(
                 )
                 % (
                     level.value,
-                    self.organization_member.trusted_clearance_level,
+                    self.organization_member.max_clearance_level,
                 ),
             )
             return self.get(request, status=403, *args, **kwargs)
diff --git a/rocky/rocky/views/ooi_report.py b/rocky/rocky/views/ooi_report.py
deleted file mode 100644
index 23488c17314..00000000000
--- a/rocky/rocky/views/ooi_report.py
+++ /dev/null
@@ -1,223 +0,0 @@
-from datetime import datetime, timezone
-from typing import Any
-
-from account.mixins import OrganizationView
-from django.contrib import messages
-from django.http import FileResponse, HttpRequest, HttpResponse
-from django.shortcuts import redirect
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import TemplateView
-from katalogus.client import get_katalogus
-from tools.forms.ooi import OOIReportSettingsForm
-from tools.models import Organization
-from tools.view_helpers import convert_date_to_datetime, get_ooi_url
-
-from octopoes.models import OOI
-from octopoes.models.ooi.dns.records import (
-    DNSAAAARecord,
-    DNSARecord,
-    DNSCAARecord,
-    DNSMXRecord,
-    DNSNSRecord,
-    DNSSOARecord,
-)
-from octopoes.models.ooi.dns.zone import Hostname
-from rocky.keiko import (
-    FindingReportQuery,
-    GeneratingReportFailed,
-    OOIReportQuery,
-    ReportNotFoundException,
-    ReportsService,
-    build_findings_list_from_store,
-    keiko_client,
-)
-from rocky.views.finding_list import generate_findings_metadata
-from rocky.views.mixins import FindingList, OctopoesView, SeveritiesMixin, SingleOOITreeMixin
-from rocky.views.ooi_view import BaseOOIDetailView
-
-
-class OOIReportView(BaseOOIDetailView, TemplateView):
-    template_name = "oois/ooi_report.html"
-    connector_form_class = OOIReportSettingsForm
-
-    def get(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
-        if self.observed_at > convert_date_to_datetime(datetime.now(timezone.utc)):
-            messages.error(
-                request,
-                _("You can't generate a report for an OOI on a date in the future."),
-            )
-        return super().get(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        findings_list = build_findings_list_from_store(self.tree.store)
-        context["breadcrumbs"].append(
-            {
-                "url": get_ooi_url("ooi_report", self.ooi.primary_key, self.organization.code),
-                "text": _("Findings report"),
-            }
-        )
-        context["observed_at_form"] = self.get_connector_form()
-        context["findings_list"] = findings_list
-        return context
-
-
-class OOIReportPDFView(SingleOOITreeMixin):
-    def get(self, request, *args, **kwargs):
-        valid_time = self.observed_at
-        ooi = self.get_ooi()
-        reports_service = ReportsService(keiko_client)
-
-        try:
-            report = reports_service.get_report(
-                valid_time,
-                ooi.object_type,
-                ooi.human_readable,
-                self.tree.store,
-                OOIReportQuery(
-                    self.organization.code,
-                    valid_time.date(),
-                    ooi,
-                    self.get_depth(),
-                    origin=f"{request.scheme}://{request.get_host()}",
-                ),
-            )
-        except GeneratingReportFailed:
-            messages.error(
-                self.request,
-                _("Generating report failed. See Keiko logs for more information."),
-            )
-            return redirect(get_ooi_url("ooi_report", ooi.primary_key, self.organization.code))
-        except ReportNotFoundException:
-            messages.error(
-                self.request,
-                _("Timeout reached generating report. See Keiko logs for more information."),
-            )
-            return redirect(get_ooi_url("ooi_report", ooi.primary_key, self.organization.code))
-
-        return FileResponse(
-            report,
-            as_attachment=True,
-            filename=ReportsService.ooi_report_file_name(valid_time, self.organization.code, ooi.primary_key),
-        )
-
-
-class FindingReportPDFView(SeveritiesMixin, OctopoesView):
-    """Used from the FindingListView. The request to this endpoint inherits all query parameters from this page, so that
-    the report shows the same filtered findings.
-    """
-
-    paginate_by = None
-
-    def get(self, request, *args, **kwargs):
-        severities = self.get_severities()
-        muted_findings = request.GET.get("muted_findings", "non-muted")
-
-        exclude_muted = muted_findings == "non-muted"
-        only_muted = muted_findings == "muted"
-
-        findings = FindingList(
-            self.octopoes_api_connector,
-            self.observed_at,
-            severities,
-            exclude_muted=exclude_muted,
-            only_muted=only_muted,
-        )
-
-        reports_service = ReportsService(keiko_client)
-
-        try:
-            report = reports_service.get_organization_finding_report(
-                self.observed_at,
-                self.organization.name,
-                generate_findings_metadata(findings, severities),
-                FindingReportQuery(
-                    self.organization.code,
-                    self.observed_at.date(),
-                    severities,
-                    origin=f"{request.scheme}://{request.get_host()}",
-                    exclude_muted=exclude_muted,
-                    only_muted=only_muted,
-                ),
-            )
-        except GeneratingReportFailed:
-            messages.error(
-                request,
-                _("Generating report failed. See Keiko logs for more information."),
-            )
-            return redirect(reverse("finding_list", kwargs={"organization_code": self.organization.code}))
-        except ReportNotFoundException:
-            messages.error(
-                request,
-                _("Timeout reached generating report. See Keiko logs for more information."),
-            )
-            return redirect(reverse("finding_list", kwargs={"organization_code": self.organization.code}))
-
-        return FileResponse(
-            report,
-            as_attachment=True,
-            filename=ReportsService.organization_report_file_name(self.organization.code),
-        )
-
-
-# Generates report from a starting point OOI with a filtered set of it's sub OOI's
-# and a filtered set of findings belonging to those OOIs.
-
-# boefjes_required - Set of possible boefjes
-# boefjes_optional - Set of possible boefjes
-# allowed_oois - Set of OOIs that are interesting for this specific report
-# allowed_finding_types - Set of finding types that are interesting for this report
-
-
-class Report(OrganizationView):
-    boefjes_required: set
-    boefjes_optional: set
-    allowed_ooi_types: list[type[OOI]]
-    allowed_finding_types: list[str]
-    boefjes: list
-
-    @classmethod
-    def get_finding_filter(cls):
-        return cls.allowed_finding_types
-
-    @classmethod
-    def get_ooi_type_filter(cls):
-        return [ooi.get_ooi_type() for ooi in cls.allowed_ooi_types]
-
-    @classmethod
-    def get_boefjes(cls, organization: Organization):
-        cls.boefjes = []
-
-        katalogus_boefjes = get_katalogus(organization.code).get_boefjes()
-        for boefje in katalogus_boefjes:
-            if boefje.id in cls.boefjes_required:
-                cls.add_boefje(boefje, True)
-            elif boefje.id in cls.boefjes_optional:
-                cls.add_boefje(boefje, False)
-
-        return cls.boefjes
-
-    @classmethod
-    def add_boefje(cls, boefje, required):
-        cls.boefjes.append({"id": boefje.id, "required": required, "boefje": boefje})
-
-
-class DNSReport(Report):
-    boefjes_required = {"dns-records", "dns-zone"}
-    boefjes_optional = {"dns-sec"}
-    allowed_ooi_types = [
-        DNSARecord,
-        DNSAAAARecord,
-        DNSMXRecord,
-        DNSNSRecord,
-        DNSSOARecord,
-        DNSCAARecord,
-        Hostname,
-    ]
-    allowed_finding_types = [
-        "KAT-WEBSERVER-NO-IPV6",
-        "KAT-NAMESERVER-NO-IPV6",
-        "KAT-NAMESERVER-NO-TWO-IPV6",
-        "KAT-NO-CAA",
-    ]
diff --git a/rocky/rocky/views/ooi_view.py b/rocky/rocky/views/ooi_view.py
index 55613017936..6533d64007b 100644
--- a/rocky/rocky/views/ooi_view.py
+++ b/rocky/rocky/views/ooi_view.py
@@ -1,5 +1,6 @@
 from datetime import datetime, timezone
 from time import sleep
+from typing import Literal
 
 from django import forms
 from django.http import Http404
@@ -10,7 +11,7 @@
 from django.views.generic.edit import FormView
 from pydantic import ValidationError
 from tools.forms.base import BaseRockyForm, ObservedAtForm
-from tools.forms.ooi_form import _EXCLUDED_OOI_TYPES, ClearanceFilterForm, OOIForm
+from tools.forms.ooi_form import _EXCLUDED_OOI_TYPES, ClearanceFilterForm, OOIForm, OrderByObjectTypeForm
 from tools.ooi_helpers import create_ooi
 from tools.view_helpers import Breadcrumb, BreadcrumbsMixin, get_mandatory_fields, get_ooi_url
 
@@ -53,6 +54,8 @@ def get_active_filters(self) -> dict[str, str]:
             active_filters[_("Clearance level: ")] = ", ".join(clearance_level)
         if self.clearance_types:
             active_filters[_("Clearance type: ")] = ", ".join(self.clearance_types)
+        if self.search_string:
+            active_filters[_("Searching for: ")] = self.search_string
         return active_filters
 
     def count_active_filters(self):
@@ -78,15 +81,41 @@ def get_ooi_types(self) -> set[type[OOI]]:
             return self.ooi_types
         return {type_by_name(t) for t in self.filtered_ooi_types if t not in _EXCLUDED_OOI_TYPES}
 
+    @property
+    def order_by(self) -> Literal["object_type", "scan_level"]:
+        return "scan_level" if self.request.GET.get("order_by", "") == "scan_level" else "object_type"
+
+    @property
+    def sorting_order(self) -> Literal["asc", "desc"]:
+        return "desc" if self.request.GET.get("sorting_order", "") == "desc" else "asc"
+
+    def get_queryset_params(self):
+        return {
+            "valid_time": self.observed_at,
+            "ooi_types": self.get_ooi_types(),
+            "scan_level": self.get_ooi_scan_levels(),
+            "scan_profile_type": self.get_ooi_profile_types(),
+            "search_string": self.search_string,
+            "order_by": self.order_by,
+            "asc_desc": self.sorting_order,
+        }
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["observed_at"] = self.observed_at
         context["observed_at_form"] = self.get_connector_form()
+        context["order_by"] = self.order_by
+        context["order_by_form"] = OrderByObjectTypeForm(self.request.GET)
+
+        context["sorting_order"] = self.sorting_order
+        context["sorting_order_class"] = "ascending" if self.sorting_order == "asc" else "descending"
         context["ooi_types_selection"] = self.filtered_ooi_types
         context["clearance_levels_selection"] = self.clearance_levels
         context["clearance_level_filter_form"] = ClearanceFilterForm(self.request.GET)
         context["clearance_types_selection"] = self.clearance_types
+        context["active_filters"] = self.get_active_filters()
         context["active_filters_counter"] = self.count_active_filters()
+
         return context
 
 
@@ -96,14 +125,7 @@ class BaseOOIListView(OOIFilterView, ListView):
     paginator = RockyPaginator
 
     def get_queryset(self) -> OOIList:
-        return OOIList(
-            self.octopoes_api_connector,
-            ooi_types=self.get_ooi_types(),
-            valid_time=self.observed_at,
-            scan_level=self.get_ooi_scan_levels(),
-            scan_profile_type=self.get_ooi_profile_types(),
-            search_string=self.search_string,
-        )
+        return OOIList(self.octopoes_api_connector, **self.get_queryset_params())
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
diff --git a/rocky/rocky/views/organization_list.py b/rocky/rocky/views/organization_list.py
index 596637bd82c..526875abffa 100644
--- a/rocky/rocky/views/organization_list.py
+++ b/rocky/rocky/views/organization_list.py
@@ -9,11 +9,14 @@
 from django.http import HttpRequest, HttpResponse, HttpResponseBadRequest
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import ListView
+from structlog import get_logger
 from tools.models import Organization
 from tools.view_helpers import OrganizationBreadcrumbsMixin
 
 from octopoes.connector.octopoes import OctopoesAPIConnector
 
+logger = get_logger(__name__)
+
 
 class OrganizationListView(
     OrganizationBreadcrumbsMixin,
@@ -40,6 +43,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
             start_time = datetime.now()
             for organization in organizations:
                 try:
+                    logger.info("Recalculating bits", event_code=920000, organization_code=organization.code)
                     number_of_bits += OctopoesAPIConnector(settings.OCTOPOES_API, organization.code).recalculate_bits()
                 except Exception as exc:
                     failed.append(f"{organization}, ({str(exc)})")
diff --git a/rocky/rocky/views/organization_settings.py b/rocky/rocky/views/organization_settings.py
index 838c07f500a..1d4b2676516 100644
--- a/rocky/rocky/views/organization_settings.py
+++ b/rocky/rocky/views/organization_settings.py
@@ -7,8 +7,11 @@
 from django.http import HttpRequest, HttpResponse, HttpResponseBadRequest
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import TemplateView
+from structlog import get_logger
 from tools.view_helpers import OrganizationDetailBreadcrumbsMixin
 
+logger = get_logger(__name__)
+
 
 class PageActions(Enum):
     RECALCULATE = "recalculate"
@@ -26,6 +29,7 @@ def post(self, request: HttpRequest, *args, **kwargs) -> HttpResponse:
         if not self.request.user.has_perm("tools.can_recalculate_bits"):
             raise PermissionDenied()
         if action == PageActions.RECALCULATE.value:
+            logger.info("Recalculating bits", event_code=920000)
             connector = self.octopoes_api_connector
 
             start_time = datetime.now()
diff --git a/rocky/rocky/views/scheduler.py b/rocky/rocky/views/scheduler.py
index 1fb75f195a2..8c495a15389 100644
--- a/rocky/rocky/views/scheduler.py
+++ b/rocky/rocky/views/scheduler.py
@@ -1,16 +1,37 @@
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any
 
 from django.contrib import messages
 from django.http import JsonResponse
 from django.utils.translation import gettext_lazy as _
 from katalogus.client import Boefje, Normalizer
+from reports.forms import (
+    ChildReportNameForm,
+    ParentReportNameForm,
+    ReportRecurrenceChoiceForm,
+    ReportScheduleRecurrenceForm,
+    ReportScheduleStartDateChoiceForm,
+    ReportScheduleStartDateForm,
+)
 from tools.forms.scheduler import TaskFilterForm
 
 from octopoes.models import OOI
+from octopoes.models.ooi.reports import ReportRecipe
 from rocky.scheduler import Boefje as SchedulerBoefje
-from rocky.scheduler import BoefjeTask, LazyTaskList, NormalizerTask, RawData, SchedulerError, Task, scheduler_client
+from rocky.scheduler import (
+    BoefjeTask,
+    LazyTaskList,
+    NormalizerTask,
+    RawData,
+    ReportTask,
+    ScheduleRequest,
+    SchedulerError,
+    ScheduleResponse,
+    SchedulerTaskNotFound,
+    Task,
+    scheduler_client,
+)
 from rocky.scheduler import Normalizer as SchedulerNormalizer
 from rocky.views.mixins import OctopoesView
 
@@ -23,15 +44,26 @@ def get_date_time(date: str | None) -> datetime | None:
 
 class SchedulerView(OctopoesView):
     task_type: str
+
     task_filter_form = TaskFilterForm
 
+    report_schedule_form_start_date_choice = ReportScheduleStartDateChoiceForm  # today or different date
+    report_schedule_form_start_date = ReportScheduleStartDateForm  # date widget
+
+    report_schedule_form_recurrence_choice = ReportRecurrenceChoiceForm  # once or repeat
+    report_schedule_form_recurrence = ReportScheduleRecurrenceForm  # select interval (daily, weekly, etc..)
+
+    report_parent_name_form = ParentReportNameForm  # parent name format
+    report_child_name_form = ChildReportNameForm  # child name format
+
     def setup(self, request, *args, **kwargs):
         super().setup(request, *args, **kwargs)
         self.scheduler_client = scheduler_client(self.organization.code)
+        self.scheduler_id = f"{self.task_type}-{self.organization.code}"
 
     def get_task_filters(self) -> dict[str, Any]:
         return {
-            "scheduler_id": f"{self.task_type}-{self.organization.code}",
+            "scheduler_id": self.scheduler_id,
             "task_type": self.task_type,
             "plugin_id": None,  # plugin_id present and set at plugin detail
             **self.get_task_filter_form_data(),
@@ -61,12 +93,59 @@ def get_task_list(self) -> LazyTaskList | list[Any]:
             messages.error(self.request, error.message)
         return []
 
+    def get_report_schedule_form_start_date_choice(self):
+        return self.report_schedule_form_start_date_choice(self.request.POST)
+
+    def get_report_schedule_form_start_date(self):
+        return self.report_schedule_form_start_date(self.request.POST)
+
+    def get_report_schedule_form_recurrence_choice(self):
+        return self.report_schedule_form_recurrence_choice(self.request.POST)
+
+    def get_report_schedule_form_recurrence(self):
+        return self.report_schedule_form_recurrence(self.request.POST)
+
+    def get_report_parent_name_form(self):
+        return self.report_parent_name_form()
+
+    def get_report_child_name_form(self):
+        return self.report_child_name_form()
+
     def get_task_details(self, task_id: str) -> Task | None:
+        task = self.scheduler_client.get_task_details(task_id)
+
+        if task.organization_id() != self.organization.code:
+            messages.error(self.request, SchedulerTaskNotFound.message)
+            return None
+
+        return task
+
+    def create_report_schedule(self, report_recipe: ReportRecipe) -> ScheduleResponse | None:
         try:
-            return self.scheduler_client.get_task_details(task_id)
+            report_task = ReportTask(
+                organisation_id=self.organization.code,
+                report_recipe_id=str(report_recipe.recipe_id),
+            ).model_dump()
+
+            schedule_request = ScheduleRequest(
+                scheduler_id=self.scheduler_id,
+                data=report_task,
+                schedule=report_recipe.cron_expression,
+            )
+
+            submit_schedule = self.scheduler_client.post_schedule(schedule=schedule_request)
+            messages.success(self.request, _("Your report has been scheduled."))
+            return submit_schedule
         except SchedulerError as error:
             return messages.error(self.request, error.message)
 
+    def get_report_schedules(self) -> list[dict[str, Any]]:
+        try:
+            return self.scheduler_client.get_scheduled_reports(scheduler_id=self.scheduler_id)
+        except SchedulerError as error:
+            messages.error(self.request, error.message)
+        return []
+
     def get_task_statistics(self) -> dict[Any, Any]:
         stats = {}
         try:
@@ -123,22 +202,23 @@ def schedule_task(self, task: Task) -> None:
     # task info from the scheduler. Task data should be available from the context
     # from which the task is created.
     def reschedule_task(self, task_id: str) -> None:
-        try:
-            task = self.scheduler_client.get_task_details(task_id)
+        task = self.scheduler_client.get_task_details(task_id)
 
-            new_id = uuid.uuid4()
-            task.data.id = new_id
+        if task.organization_id() != self.organization.code:
+            messages.error(self.request, SchedulerTaskNotFound.message)
+            return
 
-            new_task = Task(
-                id=new_id,
-                scheduler_id=task.scheduler_id,
-                priority=1,
-                data=task.data,
-            )
+        new_id = uuid.uuid4()
+        task.data.id = new_id
 
-            self.schedule_task(new_task)
-        except SchedulerError as error:
-            messages.error(self.request, error.message)
+        new_task = Task(
+            id=new_id,
+            scheduler_id=task.scheduler_id,
+            priority=1,
+            data=task.data,
+        )
+
+        self.schedule_task(new_task)
 
     def run_normalizer(self, katalogus_normalizer: Normalizer, raw_data: RawData) -> None:
         try:
@@ -191,3 +271,29 @@ def run_boefje_for_oois(
                 self.run_boefje(boefje, ooi)
         except SchedulerError as error:
             messages.error(self.request, error.message)
+
+    def convert_recurrence_to_cron_expressions(self, recurrence: str) -> str:
+        """
+        Because there is no time defined for the start date, we use midnight 00:00 for all expressions.
+        """
+
+        start_date = datetime.now(tz=timezone.utc).date()  # for now, not set by user
+
+        if start_date and recurrence:
+            day = start_date.day
+            month = start_date.month
+            week = start_date.strftime("%w").upper()  # ex. 4
+
+            cron_expr = {
+                "daily": "0 0 * * *",  # Recurres every day at 00:00
+                "weekly": f"0 0 * * {week}",  # Recurres every week on the {week} at 00:00
+                "yearly": f"0 0 {day} {month} *",  # Recurres every year on the {day} of the {month} at 00:00
+            }
+
+            if 28 <= day <= 31:
+                cron_expr["monthly"] = "0 0 28-31 * *"
+            else:
+                cron_expr["monthly"] = f"0 0 {day} * *"  # Recurres on the exact {day} of the month at 00:00
+
+            return cron_expr.get(recurrence, "")
+        return ""
diff --git a/rocky/rocky/views/task_detail.py b/rocky/rocky/views/task_detail.py
index 82b462f67f1..0ea624ac266 100644
--- a/rocky/rocky/views/task_detail.py
+++ b/rocky/rocky/views/task_detail.py
@@ -15,7 +15,7 @@ def get(self, request, *args, **kwargs):
         filename = "task_" + task_id + ".json"
         task_details = self.get_task_details(task_id)
         if task_details is not None:
-            response = HttpResponse(FileResponse(task_details.json()), content_type="application/json")
+            response = HttpResponse(FileResponse(task_details.model_dump_json()), content_type="application/json")
             response["Content-Disposition"] = "attachment; filename=" + filename
             return response
 
diff --git a/rocky/rocky/views/tasks.py b/rocky/rocky/views/tasks.py
index 9194907a1a3..25fbb6bf6a7 100644
--- a/rocky/rocky/views/tasks.py
+++ b/rocky/rocky/views/tasks.py
@@ -5,6 +5,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.list import ListView
 from httpx import HTTPError
+from katalogus.client import get_katalogus
 from tools.forms.scheduler import TaskFilterForm
 
 from rocky.paginator import RockyPaginator
@@ -65,6 +66,25 @@ class NormalizersTaskListView(TaskListView):
     template_name = "tasks/normalizers.html"
     task_type = "normalizer"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        # Search for the corresponding Boefje names and add those to the task_list
+        task_list = context["task_list"]
+        ids = [
+            task.data.raw_data.boefje_meta.boefje.id
+            for task in task_list
+            if task.data.raw_data.boefje_meta.boefje.id != "manual"
+        ]
+        plugins = get_katalogus(self.organization.code).get_plugins(ids=ids)
+        plugin_dict = {p.id: p.name for p in plugins}
+
+        for task in task_list:
+            boefje_id = task.data.raw_data.boefje_meta.boefje.id
+            task.data.raw_data.boefje_meta.boefje.name = plugin_dict[boefje_id] if boefje_id != "manual" else "Manual"
+
+        return context
+
 
 class AllTaskListView(SchedulerListView, PageActionsView):
     paginator_class = RockyPaginator
diff --git a/rocky/rocky/views/upload_raw.py b/rocky/rocky/views/upload_raw.py
index 5159b2ad9bc..7e286581b9d 100644
--- a/rocky/rocky/views/upload_raw.py
+++ b/rocky/rocky/views/upload_raw.py
@@ -62,7 +62,7 @@ def process_raw(self, form):
         raw_file = form.cleaned_data["raw_file"]
         mime_types = form.cleaned_data["mime_types"]
         input_ooi = form.cleaned_data["ooi"]
-        valid_time = form.cleaned_data["date"]
+        valid_time = form.cleaned_data["date"].replace(tzinfo=timezone.utc)
 
         try:
             get_bytes_client(self.organization.code).upload_raw(
diff --git a/rocky/tests/conftest.py b/rocky/tests/conftest.py
index f5bbb28dfac..7450c6876df 100644
--- a/rocky/tests/conftest.py
+++ b/rocky/tests/conftest.py
@@ -28,7 +28,7 @@
     DEFAULT_SCAN_LEVEL_FILTER,
     DEFAULT_SCAN_PROFILE_TYPE_FILTER,
 )
-from octopoes.models import OOI, DeclaredScanProfile, Reference, ScanLevel, ScanProfileType
+from octopoes.models import OOI, DeclaredScanProfile, EmptyScanProfile, Reference, ScanLevel, ScanProfileType
 from octopoes.models.ooi.dns.zone import Hostname
 from octopoes.models.ooi.findings import CVEFindingType, Finding, KATFindingType, RiskLevelSeverity
 from octopoes.models.ooi.network import IPAddressV4, IPAddressV6, IPPort, Network, Protocol
@@ -374,11 +374,6 @@ def mock_models_katalogus(mocker):
     return mocker.patch("tools.models.get_katalogus")
 
 
-@pytest.fixture
-def mock_views_katalogus(mocker):
-    return mocker.patch("rocky.views.ooi_report.get_katalogus")
-
-
 @pytest.fixture
 def mock_bytes_client(mocker):
     return mocker.patch("rocky.bytes_client.BytesClient")
@@ -1097,11 +1092,35 @@ def plugin_details():
             "id": "test-boefje",
             "type": "boefje",
             "name": "TestBoefje",
+            "created": "2023-05-09T09:37:20.909069+00:00",
             "description": "Meows to the moon",
             "scan_level": 1,
             "consumes": ["Network"],
             "produces": ["Network"],
             "enabled": True,
+            "boefje_schema": {},
+            "oci_image": None,
+            "oci_arguments": ["-test", "-arg"],
+        }
+    )
+
+
+@pytest.fixture
+def plugin_details_with_container():
+    return parse_plugin(
+        {
+            "id": "test-boefje",
+            "type": "boefje",
+            "name": "TestBoefje",
+            "created": "2023-05-09T09:37:20.909069+00:00",
+            "description": "Meows to the moon",
+            "scan_level": 1,
+            "consumes": ["Network"],
+            "produces": ["Network"],
+            "enabled": True,
+            "boefje_schema": {},
+            "oci_image": "ghcr.io/test/image:123",
+            "oci_arguments": ["-test", "-arg"],
         }
     )
 
@@ -1413,6 +1432,10 @@ def get_normalizers_data() -> list[dict]:
     return json.loads(get_stub_path("katalogus_normalizers.json").read_text())
 
 
+def get_aggregate_report_data():
+    return json.loads(get_stub_path("aggregate_report_data.json").read_text())
+
+
 def get_plugins_data() -> list[dict]:
     return get_boefjes_data() + get_normalizers_data()
 
@@ -1422,6 +1445,11 @@ def mock_mixins_katalogus(mocker):
     return mocker.patch("katalogus.views.mixins.get_katalogus")
 
 
+@pytest.fixture()
+def mock_katalogus_client(mocker):
+    return mocker.patch("katalogus.client.KATalogusClientV1")
+
+
 @pytest.fixture
 def mock_scheduler_client_task_list(mock_scheduler):
     mock_scheduler_session = mock_scheduler._client
@@ -1775,7 +1803,6 @@ def boefje_dns_records():
         authors=None,
         created=None,
         description="Fetch the DNS record(s) of a hostname",
-        environment_keys=None,
         related=[],
         enabled=True,
         type="boefje",
@@ -1784,6 +1811,9 @@ def boefje_dns_records():
         options=None,
         runnable_hash=None,
         produces={"boefje/dns-records"},
+        boefje_schema={},
+        oci_image="ghcr.io/test/image:123",
+        oci_arguments=["-test", "-arg"],
     )
 
 
@@ -1805,6 +1835,9 @@ def boefje_nmap_tcp():
         options=None,
         runnable_hash=None,
         produces={"boefje/nmap"},
+        boefje_schema={},
+        oci_image="ghcr.io/test/image:123",
+        oci_arguments=["-test", "-arg"],
     )
 
 
@@ -1815,3 +1848,265 @@ def drf_admin_client(create_drf_client, admin_user):
     # exception, but will return error in the API we can test
     client.raise_request_exception = False
     return client
+
+
+@pytest.fixture
+def drf_redteam_client(create_drf_client, redteamuser):
+    client = create_drf_client(redteamuser)
+    # We need to set this so that the test client doesn't throw an
+    # exception, but will return error in the API we can test
+    client.raise_request_exception = False
+    return client
+
+
+@pytest.fixture
+def get_aggregate_report_ooi():
+    return Report(
+        object_type="Report",
+        scan_profile=EmptyScanProfile(
+            scan_profile_type="empty",
+            reference=Reference("Report|6a073ba0-46d3-451c-a7f8-46923c2b841b"),
+            level=ScanLevel.L0,
+            user_id=None,
+        ),
+        primary_key="Report|6a073ba0-46d3-451c-a7f8-46923c2b841b",
+        name="Aggregate Report",
+        report_type="aggregate-organisation-report",
+        template="aggregate_organisation_report/report.html",
+        date_generated=datetime(2024, 9, 3, 14, 14, 46, 999999),
+        input_oois=["Hostname|internet|mispo.es"],
+        report_id=UUID("6a073ba0-46d3-451c-a7f8-46923c2b841b"),
+        organization_code="_test",
+        organization_name="Test Organization",
+        organization_tags=[],
+        data_raw_id="250cf43e-bfe2-4249-b493-a12921cb79f6",
+        observed_at=datetime(2024, 9, 3, 14, 14, 45, 999999),
+        parent_report=None,
+        has_parent=False,
+    )
+
+
+@pytest.fixture
+def get_aggregate_report_from_bytes():
+    data = {
+        "systems": {
+            "services": {
+                "IPAddressV4|internet|134.209.85.72": {"hostnames": ["Hostname|internet|mispo.es"], "services": []}
+            }
+        },
+        "services": {},
+        "recommendations": [],
+        "recommendation_counts": {},
+        "open_ports": {"134.209.85.72": {"ports": {}, "hostnames": ["mispo.es"], "services": {}}},
+        "ipv6": {"mispo.es": {"enabled": False, "systems": []}},
+        "vulnerabilities": {
+            "IPAddressV4|internet|134.209.85.72": {
+                "hostnames": "(mispo.es)",
+                "vulnerabilities": {},
+                "summary": {"total_findings": 0, "total_criticals": 0, "terms": [], "recommendations": []},
+                "title": "134.209.85.72",
+            }
+        },
+        "basic_security": {
+            "rpki": {},
+            "system_specific": {"Mail": [], "Web": [], "DNS": []},
+            "safe_connections": {},
+            "summary": {},
+        },
+        "summary": {"Critical vulnerabilities": 0, "IPs scanned": 1, "Hostnames scanned": 1, "Terms in report": ""},
+        "total_findings": 0,
+        "total_systems": 1,
+        "total_hostnames": 1,
+        "total_systems_basic_security": 0,
+        "health": [
+            {"service": "rocky", "healthy": True, "version": "0.0.1.dev1", "additional": None, "results": []},
+            {"service": "octopoes", "healthy": True, "version": "0.0.1.dev1", "additional": None, "results": []},
+            {
+                "service": "xtdb",
+                "healthy": True,
+                "version": "1.24.1",
+                "additional": {
+                    "version": "1.24.1",
+                    "revision": "1164f9a3c7e36edbc026867945765fd4366c1731",
+                    "indexVersion": 22,
+                    "consumerState": None,
+                    "kvStore": "xtdb.rocksdb.RocksKv",
+                    "estimateNumKeys": 36846,
+                    "size": 33301692,
+                },
+                "results": [],
+            },
+            {
+                "service": "katalogus",
+                "healthy": True,
+                "version": "0.0.1-development",
+                "additional": None,
+                "results": [],
+            },
+            {"service": "scheduler", "healthy": True, "version": "0.0.1.dev1", "additional": None, "results": []},
+            {"service": "bytes", "healthy": True, "version": "0.0.1.dev1", "additional": None, "results": []},
+            {"service": "keiko", "healthy": True, "version": "0.0.1.dev1", "additional": None, "results": []},
+        ],
+        "config_oois": [],
+        "plugins": [
+            {
+                "required": True,
+                "enabled": False,
+                "name": "SSLCertificates",
+                "scan_level": 1,
+                "type": "boefje",
+                "description": "Scan SSL certificates of websites",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "Security.txt downloader",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Downloads the security.txt file from the target host.",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "WebpageAnalysis",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Downloads a resource and uses several different normalizers to analyze",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "SSLScan",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Scan SSL/TLS versions of websites",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "RPKI",
+                "scan_level": 1,
+                "type": "boefje",
+                "description": "Check if an IPv4 or IPv6 address has a valid VRPS record.",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "Nmap TCP",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Defaults to top 250 TCP ports. Includes service detection.",
+            },
+            {
+                "required": True,
+                "enabled": True,
+                "name": "DnsRecords",
+                "scan_level": 1,
+                "type": "boefje",
+                "description": "Fetch the DNS record(s) of a hostname",
+            },
+            {
+                "required": True,
+                "enabled": False,
+                "name": "Testssl.sh Ciphers",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Run testssl.sh Docker container and check ciphers",
+            },
+            {
+                "required": True,
+                "enabled": True,
+                "name": "Dnssec",
+                "scan_level": 1,
+                "type": "boefje",
+                "description": "Validates DNSSec of a hostname",
+            },
+            {
+                "required": False,
+                "enabled": False,
+                "name": "masscan",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Quickly scan large amounts of IPs.",
+            },
+            {
+                "required": False,
+                "enabled": False,
+                "name": "Nmap IP range",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Scan an IP range and store found IPs. Defaults to top-250 TCP and top-10 UDP on ranges "
+                "with 1024 addresses or less. Larger ranges are skipped by default.",
+            },
+            {
+                "required": False,
+                "enabled": False,
+                "name": "Shodan",
+                "scan_level": 1,
+                "type": "boefje",
+                "description": "Use Shodan to find open ports with vulnerabilities that are found on that port",
+            },
+            {
+                "required": False,
+                "enabled": False,
+                "name": "Nmap UDP",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Defaults to top 250 UDP ports. Includes service detection.",
+            },
+            {
+                "required": False,
+                "enabled": False,
+                "name": "Nmap Ports",
+                "scan_level": 2,
+                "type": "boefje",
+                "description": "Scan a specific set of ports including service detection",
+            },
+        ],
+        "oois": [{"name": "mispo.es", "type": "Hostname", "scan_profile_level": 1, "scan_profile_type": "declared"}],
+        "report_types": [
+            {
+                "name": "IPv6 Report",
+                "description": "Check whether hostnames point to IPv6 addresses.",
+                "label_style": "4-light",
+            },
+            {
+                "name": "Mail Report",
+                "description": "System specific Mail Report that focusses on IP addresses and hostnames.",
+                "label_style": "2-light",
+            },
+            {
+                "name": "Name Server Report",
+                "description": "Name Server Report checks name servers on basic security standards.",
+                "label_style": "1-light",
+            },
+            {"name": "Open Ports Report", "description": "Find open ports of IP addresses", "label_style": "5-light"},
+            {
+                "name": "RPKI Report",
+                "description": "Shows whether the IP is covered by a valid RPKI ROA. For a hostname it shows the IP "
+                "addresses and whether they are covered by a valid RPKI ROA.",
+                "label_style": "4-light",
+            },
+            {
+                "name": "Safe Connections Report",
+                "description": "Shows whether the IPService contains safe ciphers.",
+                "label_style": "2-light",
+            },
+            {
+                "name": "System Report",
+                "description": "Combine IP addresses, hostnames and services into systems.",
+                "label_style": "6-light",
+            },
+            {
+                "name": "Vulnerability Report",
+                "description": "Vulnerabilities found are grouped for each system.",
+                "label_style": "5-light",
+            },
+            {
+                "name": "Web System Report",
+                "description": "Web System Reports check web systems on basic security standards.",
+                "label_style": "3-light",
+            },
+        ],
+    }
+    return json.dumps(data).encode("utf-8")
diff --git a/rocky/tests/integration/test_reports.py b/rocky/tests/integration/test_reports.py
index 44b49a5c7a9..382bf9ba97c 100644
--- a/rocky/tests/integration/test_reports.py
+++ b/rocky/tests/integration/test_reports.py
@@ -310,9 +310,9 @@ def test_multi_report(
         {
             "asset": "IPAddressV6|test|3e4d:64a2:cb49:bd48:a1ba:def3:d15d:9230",
             "vulnerabilities": {
-                "CVE-2018-20677": None,
-                "CVE-2019-8331": None,
-                "RetireJS-jquerymigrate-f3a3": None,
+                "CVE-2018-20677": 0.0,
+                "CVE-2019-8331": 0.0,
+                "RetireJS-jquerymigrate-f3a3": 0.0,
             },
             "organisation": "test-test_multi_report",
             "services": ["Web"],
@@ -320,9 +320,9 @@ def test_multi_report(
         {
             "asset": "IPAddressV4|test|192.0.2.3",
             "vulnerabilities": {
-                "CVE-2018-20677": None,
-                "CVE-2019-8331": None,
-                "RetireJS-jquerymigrate-f3a3": None,
+                "CVE-2018-20677": 0.0,
+                "CVE-2019-8331": 0.0,
+                "RetireJS-jquerymigrate-f3a3": 0.0,
             },
             "organisation": "test-test_multi_report",
             "services": ["Dicom", "Mail", "Other", "Web"],
@@ -330,9 +330,9 @@ def test_multi_report(
         {
             "asset": "IPAddressV6|test|3e4d:64a2:cb49:bd48:a1ba:def3:d15d:9230",
             "vulnerabilities": {
-                "CVE-2018-20677": None,
-                "CVE-2019-8331": None,
-                "RetireJS-jquerymigrate-f3a3": None,
+                "CVE-2018-20677": 0.0,
+                "CVE-2019-8331": 0.0,
+                "RetireJS-jquerymigrate-f3a3": 0.0,
             },
             "organisation": "test-test_multi_report-2",
             "services": ["Web"],
@@ -340,9 +340,9 @@ def test_multi_report(
         {
             "asset": "IPAddressV4|test|192.0.2.3",
             "vulnerabilities": {
-                "CVE-2018-20677": None,
-                "CVE-2019-8331": None,
-                "RetireJS-jquerymigrate-f3a3": None,
+                "CVE-2018-20677": 0.0,
+                "CVE-2019-8331": 0.0,
+                "RetireJS-jquerymigrate-f3a3": 0.0,
             },
             "organisation": "test-test_multi_report-2",
             "services": ["Dicom", "Mail", "Other", "Web"],
@@ -431,9 +431,9 @@ def test_multi_report(
         },
     }
     assert multi_data["system_vulnerabilities"] == {
-        "CVE-2018-20677": {"cvss": None, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
-        "CVE-2019-8331": {"cvss": None, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
-        "RetireJS-jquerymigrate-f3a3": {"cvss": None, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
+        "CVE-2018-20677": {"cvss": 0.0, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
+        "CVE-2019-8331": {"cvss": 0.0, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
+        "RetireJS-jquerymigrate-f3a3": {"cvss": 0.0, "Web": 4, "Dicom": 2, "Mail": 2, "Other": 2},
     }
     assert multi_data["ipv6"] == {
         "Dicom": {"total": 2, "enabled": 2},
diff --git a/rocky/tests/katalogus/test_katalogus_boefje_setup.py b/rocky/tests/katalogus/test_katalogus_boefje_setup.py
new file mode 100644
index 00000000000..204afe63fe4
--- /dev/null
+++ b/rocky/tests/katalogus/test_katalogus_boefje_setup.py
@@ -0,0 +1,64 @@
+from katalogus.views.boefje_setup import AddBoefjeVariantView, AddBoefjeView, EditBoefjeView
+from pytest_django.asserts import assertContains
+
+from tests.conftest import setup_request
+
+
+def test_boefje_setup(rf, superuser_member):
+    request = setup_request(rf.get("boefje_setup"), superuser_member.user)
+    response = AddBoefjeView.as_view()(request, organization_code=superuser_member.organization.code)
+
+    assert response.status_code == 200
+    assertContains(response, "Boefje setup")
+    assertContains(response, "Container image")
+    assertContains(response, "Name")
+    assertContains(response, "Description")
+    assertContains(response, "Arguments")
+    assertContains(response, "JSON Schema")
+    assertContains(response, "Input object type")
+    assertContains(response, "Output mime types")
+    assertContains(response, "Clearance level")
+    assertContains(response, "Create new Boefje")
+
+
+def test_boefje_variant_setup(rf, superuser_member, boefje_dns_records, mocker):
+    katalogus_mocker = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker.get_plugin.return_value = boefje_dns_records
+    request = setup_request(rf.get("boefje_variant_setup"), superuser_member.user)
+    response = AddBoefjeVariantView.as_view()(
+        request, organization_code=superuser_member.organization.code, plugin_id=boefje_dns_records.id
+    )
+
+    assert response.status_code == 200
+    assertContains(response, "Boefje variant setup")
+    assertContains(response, "Container image")
+    assertContains(response, "Name")
+    assertContains(response, "Description")
+    assertContains(response, "Arguments")
+    assertContains(response, "JSON Schema")
+    assertContains(response, "Input object type")
+    assertContains(response, "Output mime types")
+    assertContains(response, "Clearance level")
+    assertContains(response, "Create variant")
+
+
+def test_edit_boefje_view(rf, superuser_member, boefje_dns_records, mocker):
+    katalogus_mocker = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker.get_plugin.return_value = boefje_dns_records
+    request = setup_request(rf.get("edit_boefje"), superuser_member.user)
+    response = EditBoefjeView.as_view()(
+        request, organization_code=superuser_member.organization.code, plugin_id=boefje_dns_records.id
+    )
+
+    assert response.status_code == 200
+    assertContains(response, "Edit")
+    assertContains(response, boefje_dns_records.name)
+    assertContains(response, "Container image")
+    assertContains(response, "Name")
+    assertContains(response, "Description")
+    assertContains(response, "Arguments")
+    assertContains(response, "JSON Schema")
+    assertContains(response, "Input object type")
+    assertContains(response, "Output mime types")
+    assertContains(response, "Clearance level")
+    assertContains(response, "Save changes")
diff --git a/rocky/tests/katalogus/test_katalogus_plugin_detail.py b/rocky/tests/katalogus/test_katalogus_plugin_detail.py
index 1585f32f436..934e5af6174 100644
--- a/rocky/tests/katalogus/test_katalogus_plugin_detail.py
+++ b/rocky/tests/katalogus/test_katalogus_plugin_detail.py
@@ -1,5 +1,5 @@
 from katalogus.views.plugin_detail import BoefjeDetailView
-from pytest_django.asserts import assertContains
+from pytest_django.asserts import assertContains, assertNotContains
 
 from tests.conftest import setup_request
 
@@ -9,10 +9,15 @@ def test_plugin_detail_view(
     superuser_member,
     mock_mixins_katalogus,
     plugin_details,
+    boefje_dns_records,
+    boefje_nmap_tcp,
     mock_organization_view_octopoes,
     mock_scheduler_client_task_list,
+    mocker,
 ):
     mock_mixins_katalogus().get_plugin.return_value = plugin_details
+    katalogus_mocker = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker.get_plugins.return_value = [boefje_dns_records, boefje_nmap_tcp]
 
     request = setup_request(rf.get("boefje_detail"), superuser_member.user)
     response = BoefjeDetailView.as_view()(
@@ -27,18 +32,64 @@ def test_plugin_detail_view(
     assertContains(response, "Object list")
     assertContains(response, "Consumes")
     assertContains(response, plugin_details.description)
+    assertNotContains(response, "Container image")
+    assertNotContains(response, "Variants")
+
+
+def test_plugin_detail_view_with_container_image(
+    rf,
+    superuser_member,
+    mock_mixins_katalogus,
+    mocker,
+    plugin_details_with_container,
+    boefje_dns_records,
+    boefje_nmap_tcp,
+    mock_organization_view_octopoes,
+    mock_scheduler_client_task_list,
+):
+    mock_mixins_katalogus().get_plugin.return_value = plugin_details_with_container
+    katalogus_mocker = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker.get_plugins.return_value = [boefje_dns_records, boefje_nmap_tcp]
+
+    request = setup_request(rf.get("boefje_detail"), superuser_member.user)
+    response = BoefjeDetailView.as_view()(
+        request,
+        organization_code=superuser_member.organization.code,
+        plugin_id="test-plugin",
+    )
+
+    assertContains(response, "TestBoefje")
+    assertContains(response, "Container image")
+    assertContains(response, "Variants")
+    assertContains(response, boefje_dns_records.name)
+    assertContains(response, boefje_dns_records.oci_arguments[0])
+    assertContains(response, boefje_dns_records.oci_arguments[1])
+    assertContains(response, boefje_nmap_tcp.name)
+    assertContains(response, boefje_nmap_tcp.oci_arguments[0])
+    assertContains(response, boefje_nmap_tcp.oci_arguments[1])
+    assertContains(response, "Nmap TCP")
+    assertContains(response, "Produces")
+    assertContains(response, "Tasks")
+    assertContains(response, "Object list")
+    assertContains(response, "Consumes")
+    assertContains(response, plugin_details_with_container.description)
 
 
 def test_plugin_detail_view_no_consumes(
     rf,
     superuser_member,
     mock_mixins_katalogus,
+    mocker,
     plugin_details,
+    boefje_dns_records,
+    boefje_nmap_tcp,
     mock_organization_view_octopoes,
     mock_scheduler_client_task_list,
 ):
     plugin_details.consumes = []
     mock_mixins_katalogus().get_plugin.return_value = plugin_details
+    katalogus_mocker = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker.get_plugins.return_value = [boefje_dns_records, boefje_nmap_tcp]
 
     request = setup_request(rf.get("boefje_detail"), superuser_member.user)
     response = BoefjeDetailView.as_view()(
diff --git a/rocky/tests/objects/test_objects_graph.py b/rocky/tests/objects/test_objects_graph.py
index c214fd460d5..3df3738820f 100644
--- a/rocky/tests/objects/test_objects_graph.py
+++ b/rocky/tests/objects/test_objects_graph.py
@@ -27,7 +27,7 @@
 
 
 def test_ooi_graph(rf, client_member, mock_organization_view_octopoes):
-    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.parse_obj(TREE_DATA)
+    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.model_validate(TREE_DATA)
 
     request = setup_request(rf.get("ooi_graph", {"ooi_id": "Network|testnetwork"}), client_member.user)
     request.resolver_match = resolve(
diff --git a/rocky/tests/objects/test_objects_report.py b/rocky/tests/objects/test_objects_report.py
deleted file mode 100644
index c5001bed601..00000000000
--- a/rocky/tests/objects/test_objects_report.py
+++ /dev/null
@@ -1,313 +0,0 @@
-from io import BytesIO
-
-import pytest
-from django.core.management import call_command
-from django.urls import resolve, reverse
-from httpx import codes
-from pytest_django.asserts import assertContains
-
-from octopoes.models.ooi.findings import Finding, RiskLevelSeverity
-from octopoes.models.pagination import Paginated
-from octopoes.models.tree import ReferenceTree
-from rocky.views.ooi_report import FindingReportPDFView, OOIReportPDFView, OOIReportView
-from tests.conftest import setup_request
-
-
-@pytest.fixture
-def tree_data():
-    return {
-        "root": {
-            "reference": "Finding|Network|testnetwork|KAT-000",
-            "children": {"ooi": [{"reference": "Network|testnetwork", "children": {}}]},
-        },
-        "store": {
-            "Network|testnetwork": {
-                "object_type": "Network",
-                "primary_key": "Network|testnetwork",
-                "name": "testnetwork",
-            },
-            "Finding|Network|testnetwork|KAT-000": {
-                "object_type": "Finding",
-                "primary_key": "Finding|Network|testnetwork|KAT-000",
-                "ooi": "Network|testnetwork",
-                "finding_type": "KATFindingType|KAT-000",
-            },
-            "KATFindingType|KAT-000": {
-                "object_type": "KATFindingType",
-                "id": "KAT-000",
-                "description": "Fake description...",
-                "recommendation": "Fake recommendation...",
-                "risk_score": 3.9,
-                "risk_severity": "low",
-            },
-        },
-    }
-
-
-def test_ooi_report(rf, client_member, mock_organization_view_octopoes, tree_data):
-    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.model_validate(tree_data)
-
-    request = setup_request(rf.get("ooi_report", {"ooi_id": "Finding|Network|testnetwork|KAT-000"}), client_member.user)
-    request.resolver_match = resolve(
-        reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-    )
-    response = OOIReportView.as_view()(request, organization_code=client_member.organization.code)
-
-    assert response.status_code == 200
-    assertContains(response, "testnetwork")
-    assertContains(response, "Fake description...")
-    assertContains(response, "Fake recommendation...")
-
-
-def test_ooi_report_missing_finding_type(rf, client_member, mock_organization_view_octopoes, tree_data):
-    tree_data["store"]["Finding|Network|testnetwork|KAT-001"] = {
-        "object_type": "Finding",
-        "primary_key": "Finding|Network|testnetwork|KAT-001",
-        "ooi": "Network|testnetwork",
-        "finding_type": "KATFindingType|KAT-001",
-    }
-    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.model_validate(tree_data)
-
-    request = setup_request(rf.get("ooi_report", {"ooi_id": "Finding|Network|testnetwork|KAT-000"}), client_member.user)
-    request.resolver_match = resolve(
-        reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-    )
-    response = OOIReportView.as_view()(request, organization_code=client_member.organization.code)
-
-    assert response.status_code == 200
-    assertContains(response, "testnetwork")
-    assertContains(response, "Fake description...")
-    assertContains(response, "Fake recommendation...")
-
-
-def test_ooi_pdf_report(rf, client_member, mock_organization_view_octopoes, mocker, tree_data):
-    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.model_validate(tree_data)
-
-    request = setup_request(
-        rf.get("ooi_pdf_report", {"ooi_id": "Finding|Network|testnetwork|KAT-000"}), client_member.user
-    )
-    request.resolver_match = resolve(
-        reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-    )
-
-    dt_in_filename = "2023_14_03T13_48_19_418402_+0000"
-    mock_datetime = mocker.patch("rocky.keiko.datetime")
-    mock_mixin_datetime = mocker.patch("rocky.views.mixins.datetime")
-    mock_datetime.now().strftime.return_value = dt_in_filename
-    mock_mixin_datetime.now().date.return_value = "2010-10-10"
-    mock_mixin_datetime.now().strftime.return_value = dt_in_filename
-
-    # Setup Keiko mock
-    mock_keiko_client = mocker.patch("rocky.views.ooi_report.keiko_client")
-    mock_keiko_client.generate_report.return_value = "fake_report_id"
-    mock_keiko_client.get_report.return_value = BytesIO(b"fake_binary_pdf_content")
-
-    response = OOIReportPDFView.as_view()(request, organization_code=client_member.organization.code)
-
-    assert response.status_code == 200
-    assert response.getvalue() == b"fake_binary_pdf_content"
-    assert (
-        f"bevindingenrapport_nl_test_Finding_Network_testnetwork_KAT-000_{dt_in_filename}_{dt_in_filename}.pdf"
-        in response.headers["Content-Disposition"]
-    )
-
-    report_data_param = mock_keiko_client.generate_report.call_args[0][1]
-    # Verify that the data is sent correctly to Keiko
-    assert report_data_param["meta"] == {
-        "total": 1,
-        "total_by_severity": {
-            "critical": 0,
-            "high": 0,
-            "medium": 0,
-            "low": 1,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-        "total_by_finding_type": {"KAT-000": 1},
-        "total_finding_types": 1,
-        "total_by_severity_per_finding_type": {
-            "critical": 0,
-            "high": 0,
-            "medium": 0,
-            "low": 1,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-    }
-    assert report_data_param["findings_grouped"]["KAT-000"]["finding_type"]["id"] == "KAT-000"
-    assert report_data_param["findings_grouped"]["KAT-000"]["list"][0]["description"] == "Fake description..."
-
-
-def test_organization_pdf_report(rf, client_member, mock_organization_view_octopoes, network, finding_types, mocker):
-    mock_organization_view_octopoes().list_findings.return_value = Paginated[Finding](
-        count=150,
-        items=[
-            Finding(
-                finding_type=finding_types[0].reference,
-                ooi=network.reference,
-                proof="proof",
-                description="test description 123",
-                reproduce="reproduce",
-            ),
-        ]
-        * 150,
-    )
-
-    mock_organization_view_octopoes().load_objects_bulk.return_value = {
-        network.reference: network,
-        finding_types[0].reference: finding_types[0],
-    }
-
-    request = setup_request(
-        rf.get("ooi_pdf_report", {"ooi_id": "Finding|Network|testnetwork|KAT-000"}), client_member.user
-    )
-    request.resolver_match = resolve(
-        reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-    )
-
-    dt_in_filename = "2023_14_03T13_48_19_418402_+0000"
-    mock_datetime = mocker.patch("rocky.keiko.datetime")
-    mock_datetime.now().strftime.return_value = dt_in_filename
-
-    # Setup Keiko mock
-    mock_keiko_client = mocker.patch("rocky.views.ooi_report.keiko_client")
-    mock_keiko_client.generate_report.return_value = "fake_report_id"
-    mock_keiko_client.get_report.return_value = BytesIO(b"fake_binary_pdf_content")
-
-    response = FindingReportPDFView.as_view()(request, organization_code=client_member.organization.code)
-
-    assert response.status_code == 200
-    assert response.getvalue() == b"fake_binary_pdf_content"
-    assert f"bevindingenrapport_nl_test_{dt_in_filename}.pdf" in response.headers["Content-Disposition"]
-
-    report_data_param = mock_keiko_client.generate_report.call_args[0][1]
-
-    assert report_data_param["meta"] == {
-        "total": 1,
-        "total_by_finding_type": {"KAT-0001": 1},
-        "total_by_severity": {
-            "critical": 1,
-            "high": 0,
-            "low": 0,
-            "medium": 0,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-        "total_by_severity_per_finding_type": {
-            "critical": 1,
-            "high": 0,
-            "low": 0,
-            "medium": 0,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-        "total_finding_types": 1,
-    }
-    assert report_data_param["findings_grouped"]["KAT-0001"]["finding_type"]["id"] == "KAT-0001"
-    assert report_data_param["findings_grouped"]["KAT-0001"]["list"][0]["description"] == "test description 123"
-
-
-def test_pdf_report_command(tmp_path, client_member, network, finding_types, mocker):
-    mock_organization_view_octopoes = mocker.patch("tools.management.commands.generate_report.OctopoesAPIConnector")
-    mock_organization_view_octopoes().list_findings.return_value = Paginated[Finding](
-        count=3,
-        items=[
-            Finding(
-                finding_type=finding_types[0].reference,
-                ooi=network.reference,
-                proof="proof",
-                description="test description 123",
-                reproduce="reproduce",
-            ),
-            Finding(
-                finding_type=finding_types[1].reference,
-                ooi=network.reference,
-                proof="proof",
-                description="test description 123",
-                reproduce="reproduce",
-            ),
-            Finding(
-                finding_type=finding_types[2].reference,
-                ooi=network.reference,
-                proof="proof",
-                description="test description 123",
-                reproduce="reproduce",
-            ),
-        ],
-    )
-
-    mock_organization_view_octopoes().load_objects_bulk.return_value = {
-        network.reference: network,
-        finding_types[0].reference: finding_types[0],
-        finding_types[1].reference: finding_types[1],
-        finding_types[2].reference: finding_types[2],
-    }
-
-    dt_in_filename = "2023_14_03T13_48_19_418402_+0000"
-    mock_datetime = mocker.patch("rocky.keiko.datetime")
-    mock_datetime.now().strftime.return_value = dt_in_filename
-
-    # Setup Keiko mock
-    mock_keiko_client = mocker.patch("tools.management.commands.generate_report.keiko_client")
-    mock_keiko_client.generate_report.return_value = "fake_report_id"
-    mock_keiko_client.get_report.return_value = BytesIO(b"fake_binary_pdf_content")
-
-    tmp_file = tmp_path / "test.pdf"
-    call_command(
-        "generate_report", code=client_member.organization.code, output=tmp_file, min_severity=RiskLevelSeverity.HIGH
-    )
-
-    assert tmp_file.exists()
-    assert tmp_file.read_text() == "fake_binary_pdf_content"
-
-    report_data_param = mock_keiko_client.generate_report.call_args[0][1]
-
-    assert report_data_param["meta"] == {
-        "total": 2,
-        "total_by_finding_type": {"KAT-0001": 1, "KAT-0002": 1},
-        "total_by_severity": {
-            "critical": 2,
-            "high": 0,
-            "low": 0,
-            "medium": 0,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-        "total_by_severity_per_finding_type": {
-            "critical": 2,
-            "high": 0,
-            "low": 0,
-            "medium": 0,
-            "recommendation": 0,
-            "pending": 0,
-            "unknown": 0,
-        },
-        "total_finding_types": 2,
-    }
-
-
-def test_ooi_pdf_report_timeout(rf, client_member, mock_organization_view_octopoes, tree_data, httpx_mock):
-    mock_organization_view_octopoes().get_tree.return_value = ReferenceTree.model_validate(tree_data)
-
-    request = setup_request(
-        rf.get("ooi_pdf_report", {"ooi_id": "Finding|Network|testnetwork|KAT-000"}), client_member.user
-    )
-    request.resolver_match = resolve(
-        reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-    )
-
-    httpx_mock.add_response(status_code=codes.METHOD_NOT_ALLOWED)
-
-    response = OOIReportPDFView.as_view()(request, organization_code=client_member.organization.code)
-
-    assert response.status_code == 302
-    assert (
-        response.url
-        == reverse("ooi_report", kwargs={"organization_code": client_member.organization.code})
-        + "?ooi_id=Finding%7CNetwork%7Ctestnetwork%7CKAT-000"
-    )
diff --git a/rocky/tests/reports/test_aggregate_report_flow.py b/rocky/tests/reports/test_aggregate_report_flow.py
index fca4d053401..1582440302f 100644
--- a/rocky/tests/reports/test_aggregate_report_flow.py
+++ b/rocky/tests/reports/test_aggregate_report_flow.py
@@ -1,3 +1,5 @@
+import json
+
 from pytest_django.asserts import assertContains
 from reports.views.aggregate_report import (
     OOISelectionAggregateReportView,
@@ -5,10 +7,11 @@
     SaveAggregateReportView,
     SetupScanAggregateReportView,
 )
+from reports.views.base import ViewReportView
 
 from octopoes.models.pagination import Paginated
 from octopoes.models.types import OOIType
-from tests.conftest import setup_request
+from tests.conftest import get_aggregate_report_data, setup_request
 
 
 def test_select_all_oois_post_to_select_report_types(
@@ -31,7 +34,7 @@ def test_select_all_oois_post_to_select_report_types(
             "aggregate_report_select_report_types",
             {
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
-                "ooi": "all",
+                "ooi": listed_hostnames,
             },
         ),
         client_member.user,
@@ -157,6 +160,7 @@ def test_report_types_selection_nothing_selected(
     client_member,
     valid_time,
     mock_organization_view_octopoes,
+    mock_katalogus_client,
     listed_hostnames,
 ):
     """
@@ -257,7 +261,7 @@ def test_save_aggregate_report_view(
             "aggregate_report_save",
             {
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
-                "ooi": "all",
+                "ooi": listed_hostnames,
                 "report_type": ["systems-report", "dns-report"],
                 "old_report_name": ["Aggregate Report"],
                 "report_name": ["Testing a new name for Aggregate Report"],
@@ -270,3 +274,33 @@ def test_save_aggregate_report_view(
 
     assert response.status_code == 302  # after post follows redirect, this to first create report ID
     assert "report_id=Report" in response.url
+
+
+def test_json_download_aggregate_report(
+    rf,
+    client_member,
+    get_aggregate_report_ooi,
+    get_aggregate_report_from_bytes,
+    mock_organization_view_octopoes,
+    mock_bytes_client,
+):
+    mock_organization_view_octopoes().get.return_value = get_aggregate_report_ooi
+    mock_bytes_client().get_raw.return_value = get_aggregate_report_from_bytes
+    mock_organization_view_octopoes().query.return_value = []
+
+    request = setup_request(
+        rf.get(
+            "view_report_json",
+            {"json": "true", "report_id": f"{get_aggregate_report_ooi.primary_key}"},
+        ),
+        client_member.user,
+    )
+
+    json_response = ViewReportView.as_view()(request, organization_code=client_member.organization.code)
+
+    assert json_response.status_code == 200
+
+    json_response_data = json.dumps(json.loads(json_response.content))
+    json_compare_data = json.dumps(get_aggregate_report_data())
+
+    assert json_response_data == json_compare_data
diff --git a/rocky/tests/reports/test_generate_report_flow.py b/rocky/tests/reports/test_generate_report_flow.py
index 2cae8e51990..a77678354c2 100644
--- a/rocky/tests/reports/test_generate_report_flow.py
+++ b/rocky/tests/reports/test_generate_report_flow.py
@@ -31,7 +31,7 @@ def test_select_all_oois_post_to_select_report_types(
             "generate_report_select_report_types",
             {
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
-                "ooi": "all",
+                "ooi": listed_hostnames,
             },
         ),
         client_member.user,
@@ -158,6 +158,7 @@ def test_report_types_selection_nothing_selected(
     valid_time,
     mock_organization_view_octopoes,
     listed_hostnames,
+    mock_katalogus_client,
 ):
     """
     Will send the selected report types to the configuration page (set plugins).
@@ -251,7 +252,7 @@ def test_save_generate_report_view(
             "generate_report_view",
             {
                 "observed_at": valid_time.strftime("%Y-%m-%d"),
-                "ooi": "all",
+                "ooi": listed_hostnames,
                 "report_type": "dns-report",
                 "old_report_name": old_report_names,
                 "report_name": [f"DNS report for {len(listed_hostnames)} objects"],
diff --git a/rocky/tests/reports/test_plugins.py b/rocky/tests/reports/test_plugins.py
index 9343f181931..940997a1b70 100644
--- a/rocky/tests/reports/test_plugins.py
+++ b/rocky/tests/reports/test_plugins.py
@@ -1,3 +1,5 @@
+from unittest.mock import MagicMock
+
 from django.urls import resolve, reverse
 from katalogus.client import KATalogusHTTPStatusError
 from reports.views.generate_report import SetupScanGenerateReportView
@@ -20,8 +22,7 @@ def test_generate_report_setup_scan_wrong_plugin_id(
     mock_organization_view_octopoes().list_objects.return_value = Paginated[OOIType](
         count=len(listed_hostnames), items=listed_hostnames
     )
-
-    katalogus_client.get_plugins.side_effect = KATalogusHTTPStatusError
+    katalogus_client.get_plugins.side_effect = KATalogusHTTPStatusError(MagicMock())
     mock_bytes_client().upload_raw.return_value = "raw_id"
 
     kwargs = {"organization_code": client_member.organization.code}
@@ -41,5 +42,5 @@ def test_generate_report_setup_scan_wrong_plugin_id(
 
     response = SetupScanGenerateReportView.as_view()(request, organization_code=client_member.organization.code)
 
-    assert response.status_code == 200
-    assert list(request._messages)[0].message == "A HTTP error occurred. Check logs for more info."
+    assert response.status_code == 307
+    assert list(request._messages)[0].message == "An HTTP %d error occurred. Check logs for more info."
diff --git a/rocky/tests/reports/test_vulnerability_report.py b/rocky/tests/reports/test_vulnerability_report.py
index 0807f2c79b4..25b7af2e1b5 100644
--- a/rocky/tests/reports/test_vulnerability_report.py
+++ b/rocky/tests/reports/test_vulnerability_report.py
@@ -106,7 +106,7 @@ def test_vulnerability_report_finding_no_score(
     data = report.collect_data([str(hostname.reference)], valid_time)[str(hostname.reference)]
 
     assert data[str(ipaddressv4.reference)]["vulnerabilities"]["CVE-2023-38408"]["cvss"]["score"] == 9.8
-    assert data[str(ipaddressv4.reference)]["vulnerabilities"]["CVE-0000-0001"]["cvss"]["score"] is None
+    assert data[str(ipaddressv4.reference)]["vulnerabilities"]["CVE-0000-0001"]["cvss"]["score"] == 0
     assert data[str(ipaddressv4.reference)]["summary"]["total_criticals"] == 1
     assert data[str(ipaddressv4.reference)]["summary"]["total_findings"] == 2
 
diff --git a/rocky/tests/stubs/aggregate_report_data.json b/rocky/tests/stubs/aggregate_report_data.json
new file mode 100644
index 00000000000..1e74e31471e
--- /dev/null
+++ b/rocky/tests/stubs/aggregate_report_data.json
@@ -0,0 +1,297 @@
+{
+  "organization_code": "test",
+  "organization_name": "Test Organization",
+  "organization_tags": [],
+  "data": {
+    "systems": {
+      "services": {
+        "IPAddressV4|internet|134.209.85.72": {
+          "hostnames": [
+            "Hostname|internet|mispo.es"
+          ],
+          "services": []
+        }
+      }
+    },
+    "services": {},
+    "recommendations": [],
+    "recommendation_counts": {},
+    "open_ports": {
+      "134.209.85.72": {
+        "ports": {},
+        "hostnames": [
+          "mispo.es"
+        ],
+        "services": {}
+      }
+    },
+    "ipv6": {
+      "mispo.es": {
+        "enabled": false,
+        "systems": []
+      }
+    },
+    "vulnerabilities": {
+      "IPAddressV4|internet|134.209.85.72": {
+        "hostnames": "(mispo.es)",
+        "vulnerabilities": {},
+        "summary": {
+          "total_findings": 0,
+          "total_criticals": 0,
+          "terms": [],
+          "recommendations": []
+        },
+        "title": "134.209.85.72"
+      }
+    },
+    "basic_security": {
+      "rpki": {},
+      "system_specific": {
+        "Mail": [],
+        "Web": [],
+        "DNS": []
+      },
+      "safe_connections": {},
+      "summary": {}
+    },
+    "summary": {
+      "Critical vulnerabilities": 0,
+      "IPs scanned": 1,
+      "Hostnames scanned": 1,
+      "Terms in report": ""
+    },
+    "total_findings": 0,
+    "total_systems": 1,
+    "total_hostnames": 1,
+    "total_systems_basic_security": 0,
+    "health": [
+      {
+        "service": "rocky",
+        "healthy": true,
+        "version": "0.0.1.dev1",
+        "additional": null,
+        "results": []
+      },
+      {
+        "service": "octopoes",
+        "healthy": true,
+        "version": "0.0.1.dev1",
+        "additional": null,
+        "results": []
+      },
+      {
+        "service": "xtdb",
+        "healthy": true,
+        "version": "1.24.1",
+        "additional": {
+          "version": "1.24.1",
+          "revision": "1164f9a3c7e36edbc026867945765fd4366c1731",
+          "indexVersion": 22,
+          "consumerState": null,
+          "kvStore": "xtdb.rocksdb.RocksKv",
+          "estimateNumKeys": 36846,
+          "size": 33301692
+        },
+        "results": []
+      },
+      {
+        "service": "katalogus",
+        "healthy": true,
+        "version": "0.0.1-development",
+        "additional": null,
+        "results": []
+      },
+      {
+        "service": "scheduler",
+        "healthy": true,
+        "version": "0.0.1.dev1",
+        "additional": null,
+        "results": []
+      },
+      {
+        "service": "bytes",
+        "healthy": true,
+        "version": "0.0.1.dev1",
+        "additional": null,
+        "results": []
+      },
+      {
+        "service": "keiko",
+        "healthy": true,
+        "version": "0.0.1.dev1",
+        "additional": null,
+        "results": []
+      }
+    ],
+    "config_oois": [],
+    "plugins": [
+      {
+        "required": true,
+        "enabled": false,
+        "name": "SSLCertificates",
+        "scan_level": 1,
+        "type": "boefje",
+        "description": "Scan SSL certificates of websites"
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "Security.txt downloader",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Downloads the security.txt file from the target host."
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "WebpageAnalysis",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Downloads a resource and uses several different normalizers to analyze"
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "SSLScan",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Scan SSL/TLS versions of websites"
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "RPKI",
+        "scan_level": 1,
+        "type": "boefje",
+        "description": "Check if an IPv4 or IPv6 address has a valid VRPS record."
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "Nmap TCP",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Defaults to top 250 TCP ports. Includes service detection."
+      },
+      {
+        "required": true,
+        "enabled": true,
+        "name": "DnsRecords",
+        "scan_level": 1,
+        "type": "boefje",
+        "description": "Fetch the DNS record(s) of a hostname"
+      },
+      {
+        "required": true,
+        "enabled": false,
+        "name": "Testssl.sh Ciphers",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Run testssl.sh Docker container and check ciphers"
+      },
+      {
+        "required": true,
+        "enabled": true,
+        "name": "Dnssec",
+        "scan_level": 1,
+        "type": "boefje",
+        "description": "Validates DNSSec of a hostname"
+      },
+      {
+        "required": false,
+        "enabled": false,
+        "name": "masscan",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Quickly scan large amounts of IPs."
+      },
+      {
+        "required": false,
+        "enabled": false,
+        "name": "Nmap IP range",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Scan an IP range and store found IPs. Defaults to top-250 TCP and top-10 UDP on ranges with 1024 addresses or less. Larger ranges are skipped by default."
+      },
+      {
+        "required": false,
+        "enabled": false,
+        "name": "Shodan",
+        "scan_level": 1,
+        "type": "boefje",
+        "description": "Use Shodan to find open ports with vulnerabilities that are found on that port"
+      },
+      {
+        "required": false,
+        "enabled": false,
+        "name": "Nmap UDP",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Defaults to top 250 UDP ports. Includes service detection."
+      },
+      {
+        "required": false,
+        "enabled": false,
+        "name": "Nmap Ports",
+        "scan_level": 2,
+        "type": "boefje",
+        "description": "Scan a specific set of ports including service detection"
+      }
+    ],
+    "oois": [
+      {
+        "name": "mispo.es",
+        "type": "Hostname",
+        "scan_profile_level": 1,
+        "scan_profile_type": "declared"
+      }
+    ],
+    "report_types": [
+      {
+        "name": "IPv6 Report",
+        "description": "Check whether hostnames point to IPv6 addresses.",
+        "label_style": "4-light"
+      },
+      {
+        "name": "Mail Report",
+        "description": "System specific Mail Report that focusses on IP addresses and hostnames.",
+        "label_style": "2-light"
+      },
+      {
+        "name": "Name Server Report",
+        "description": "Name Server Report checks name servers on basic security standards.",
+        "label_style": "1-light"
+      },
+      {
+        "name": "Open Ports Report",
+        "description": "Find open ports of IP addresses",
+        "label_style": "5-light"
+      },
+      {
+        "name": "RPKI Report",
+        "description": "Shows whether the IP is covered by a valid RPKI ROA. For a hostname it shows the IP addresses and whether they are covered by a valid RPKI ROA.",
+        "label_style": "4-light"
+      },
+      {
+        "name": "Safe Connections Report",
+        "description": "Shows whether the IPService contains safe ciphers.",
+        "label_style": "2-light"
+      },
+      {
+        "name": "System Report",
+        "description": "Combine IP addresses, hostnames and services into systems.",
+        "label_style": "6-light"
+      },
+      {
+        "name": "Vulnerability Report",
+        "description": "Vulnerabilities found are grouped for each system.",
+        "label_style": "5-light"
+      },
+      {
+        "name": "Web System Report",
+        "description": "Web System Reports check web systems on basic security standards.",
+        "label_style": "3-light"
+      }
+    ]
+  }
+}
diff --git a/rocky/tests/stubs/katalogus_boefjes.json b/rocky/tests/stubs/katalogus_boefjes.json
index 40c79a6cb1b..d7d6ba63991 100644
--- a/rocky/tests/stubs/katalogus_boefjes.json
+++ b/rocky/tests/stubs/katalogus_boefjes.json
@@ -5,9 +5,6 @@
     "version": null,
     "created": null,
     "description": "Use BinaryEdge to find open ports with vulnerabilities that are found on that port",
-    "environment_keys": [
-      "BINARYEDGE_API"
-    ],
     "enabled": true,
     "type": "boefje",
     "scan_level": 2,
@@ -33,7 +30,6 @@
     "version": null,
     "created": null,
     "description": "Scan SSL certificates of websites",
-    "environment_keys": [],
     "enabled": false,
     "type": "boefje",
     "scan_level": 1,
@@ -51,7 +47,6 @@
     "version": null,
     "created": null,
     "description": "Scan SSL/TLS versions of websites",
-    "environment_keys": [],
     "enabled": false,
     "type": "boefje",
     "scan_level": 2,
@@ -70,9 +65,6 @@
     "version": null,
     "created": null,
     "description": "Scan wordpress sites",
-    "environment_keys": [
-      "WP_SCAN_API"
-    ],
     "enabled": false,
     "type": "boefje",
     "scan_level": 2,
@@ -91,7 +83,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
diff --git a/rocky/tests/stubs/katalogus_normalizers.json b/rocky/tests/stubs/katalogus_normalizers.json
index 182b5bbb549..dfbca8cb726 100644
--- a/rocky/tests/stubs/katalogus_normalizers.json
+++ b/rocky/tests/stubs/katalogus_normalizers.json
@@ -5,7 +5,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
@@ -22,7 +21,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
@@ -42,7 +40,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
@@ -59,7 +56,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
@@ -83,7 +79,6 @@
     "version": null,
     "created": null,
     "description": null,
-    "environment_keys": [],
     "enabled": true,
     "type": "normalizer",
     "consumes": [
diff --git a/rocky/tests/test_api_organization.py b/rocky/tests/test_api_organization.py
index b3aa1155793..80df1e4df9c 100644
--- a/rocky/tests/test_api_organization.py
+++ b/rocky/tests/test_api_organization.py
@@ -2,6 +2,7 @@
 from unittest.mock import patch
 
 import pytest
+from django.contrib.auth.models import Permission
 from django.urls import reverse
 from httpx import HTTPError
 from pytest_assert_utils import assert_model_attrs
@@ -11,6 +12,8 @@
     Returns200,
     Returns201,
     Returns204,
+    Returns400,
+    Returns403,
     Returns409,
     Returns500,
     UsesDeleteMethod,
@@ -278,6 +281,34 @@ def test_it_returns_error(self, json):
             }
             assert json == expected
 
+    class TestListNoPermission(
+        UsesGetMethod,
+        UsesListEndpoint,
+        Returns403,
+    ):
+        client = lambda_fixture("drf_redteam_client")
+
+    class TestCreateNoPermission(
+        UsesPostMethod,
+        UsesListEndpoint,
+        Returns403,
+    ):
+        client = lambda_fixture("drf_redteam_client")
+
+    class TestRetrieveNoPermission(
+        UsesGetMethod,
+        UsesDetailEndpoint,
+        Returns403,
+    ):
+        client = lambda_fixture("drf_redteam_client")
+
+    class TestDestroyNoPermission(
+        UsesDeleteMethod,
+        UsesDetailEndpoint,
+        Returns403,
+    ):
+        client = lambda_fixture("drf_redteam_client")
+
 
 class TestGetIndemnification(APIViewTest, UsesGetMethod, Returns200):
     # The superuser_member fixture creates the indemnification
@@ -300,15 +331,29 @@ def test_it_returns_no_indemnification(self, json):
         assert json == expected
 
 
+class TestGetIndemnificationNoPermission(APIViewTest, UsesGetMethod, Returns403):
+    url = lambda_fixture(lambda organization: reverse("organization-indemnification", args=[organization.pk]))
+    client = lambda_fixture("drf_redteam_client")
+
+
 class TestSetIndemnification(APIViewTest, UsesPostMethod, Returns201):
     url = lambda_fixture(lambda organization: reverse("organization-indemnification", args=[organization.pk]))
-    client = lambda_fixture("drf_admin_client")
 
-    def test_it_sets_indemnification(self, json, admin_user):
-        expected = {"indemnification": True, "user": admin_user.id}
+    @pytest.fixture
+    def client(self, drf_redteam_client, redteamuser):
+        redteamuser.user_permissions.set([Permission.objects.get(codename="add_indemnification")])
+        return drf_redteam_client
+
+    def test_it_sets_indemnification(self, json, redteamuser):
+        expected = {"indemnification": True, "user": redteamuser.id}
         assert json == expected
 
 
+class TestSetIndemnificationNoPermission(APIViewTest, UsesPostMethod, Returns403):
+    url = lambda_fixture(lambda organization: reverse("organization-indemnification", args=[organization.pk]))
+    client = lambda_fixture("drf_redteam_client")
+
+
 class TestIndemnificationAlreadyExists(APIViewTest, UsesPostMethod, Returns409):
     # The superuser_member fixture creates the indemnification
     url = lambda_fixture(
@@ -319,3 +364,57 @@ class TestIndemnificationAlreadyExists(APIViewTest, UsesPostMethod, Returns409):
     def test_it_returns_indemnification(self, json, superuser_member):
         expected = {"indemnification": True, "user": superuser_member.user.id}
         assert json == expected
+
+
+class TestRecalculateBits(APIViewTest, UsesPostMethod, Returns200):
+    url = lambda_fixture(lambda organization: reverse("organization-recalculate-bits", args=[organization.pk]))
+
+    @pytest.fixture
+    def client(self, drf_redteam_client, redteamuser):
+        redteamuser.user_permissions.set([Permission.objects.get(codename="can_recalculate_bits")])
+        return drf_redteam_client
+
+    @pytest.fixture(autouse=True)
+    def mock_octopoes(self, mocker):
+        return mocker.patch("tools.viewsets.OctopoesAPIConnector.recalculate_bits", return_value=42)
+
+    def test_it_recalculates_bits(self, json):
+        expected = {"number_of_bits": 42}
+        assert json == expected
+
+
+class TestRecalculateBitsNoPermission(APIViewTest, UsesPostMethod, Returns403):
+    url = lambda_fixture(lambda organization: reverse("organization-recalculate-bits", args=[organization.pk]))
+    client = lambda_fixture("drf_redteam_client")
+
+
+class TestKatalogusCloneSettings(APIViewTest, UsesPostMethod, Returns200):
+    url = lambda_fixture(lambda organization: reverse("organization-clone-katalogus-settings", args=[organization.pk]))
+    data = lambda_fixture(lambda organization_b: {"to_organization": organization_b.id})
+
+    @pytest.fixture
+    def client(self, drf_redteam_client, redteamuser):
+        redteamuser.user_permissions.set([Permission.objects.get(codename="can_set_katalogus_settings")])
+        return drf_redteam_client
+
+    @pytest.fixture(autouse=True)
+    def mock_katalogus(self, mocker):
+        return mocker.patch("katalogus.client.KATalogusClientV1")
+
+    def test_it_clones_settings(self, mock_katalogus, organization_b):
+        mock_katalogus().clone_all_configuration_to_organization.assert_called_once_with(organization_b.code)
+
+
+class TestCloneKatalogusSettingsNoPermission(APIViewTest, UsesPostMethod, Returns403):
+    url = lambda_fixture(lambda organization: reverse("organization-clone-katalogus-settings", args=[organization.pk]))
+    client = lambda_fixture("drf_redteam_client")
+
+
+class TestCloneKatalogusSettingsInvalidData(APIViewTest, UsesPostMethod, Returns400):
+    url = lambda_fixture(lambda organization: reverse("organization-clone-katalogus-settings", args=[organization.pk]))
+    data = lambda_fixture(lambda organization_b: {"wrong_field": organization_b.id})
+
+    @pytest.fixture
+    def client(self, drf_redteam_client, redteamuser):
+        redteamuser.user_permissions.set([Permission.objects.get(codename="can_set_katalogus_settings")])
+        return drf_redteam_client
diff --git a/rocky/tests/test_groups_and_permissions.py b/rocky/tests/test_groups_and_permissions.py
index 2281aaa6a1b..bc9a0c35092 100644
--- a/rocky/tests/test_groups_and_permissions.py
+++ b/rocky/tests/test_groups_and_permissions.py
@@ -52,6 +52,8 @@ def test_plugin_settings_list_perms(
     mock_mixins_katalogus,
     plugin_details,
     plugin_schema,
+    boefje_dns_records,
+    boefje_nmap_tcp,
     mock_scheduler,
     mock_organization_view_octopoes,
     network,
@@ -63,7 +65,8 @@ def test_plugin_settings_list_perms(
     mock_organization_view_octopoes().list_objects.return_value = Paginated[OOIType](count=1, items=[network])
     mock_mixins_katalogus().get_plugin.return_value = plugin_details
     mock_mixins_katalogus().get_plugin_schema.return_value = plugin_schema
-
+    katalogus_mocker1 = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker1.get_plugins.return_value = [boefje_dns_records, boefje_nmap_tcp]
     member = request.getfixturevalue(member)
 
     response = BoefjeDetailView.as_view()(
@@ -86,6 +89,8 @@ def test_plugin_settings_list_perms_2(
     mock_mixins_katalogus,
     plugin_details,
     plugin_schema,
+    boefje_dns_records,
+    boefje_nmap_tcp,
     mock_scheduler,
     mock_organization_view_octopoes,
     network,
@@ -97,7 +102,8 @@ def test_plugin_settings_list_perms_2(
     mock_organization_view_octopoes().list_objects.return_value = Paginated[OOIType](count=1, items=[network])
     mock_mixins_katalogus().get_plugin.return_value = plugin_details
     mock_mixins_katalogus().get_plugin_schema.return_value = plugin_schema
-
+    katalogus_mocker1 = mocker.patch("katalogus.client.KATalogusClientV1")()
+    katalogus_mocker1.get_plugins.return_value = [boefje_dns_records, boefje_nmap_tcp]
     member = request.getfixturevalue(member)
 
     response = BoefjeDetailView.as_view()(
diff --git a/rocky/tests/test_indemnification.py b/rocky/tests/test_indemnification.py
index 785679ca7aa..e6d628b323e 100644
--- a/rocky/tests/test_indemnification.py
+++ b/rocky/tests/test_indemnification.py
@@ -14,7 +14,6 @@ def test_update_clearance_level(rf, client_member, httpx_mock):
             "authors": None,
             "created": None,
             "description": "Use BinaryEdge to find open ports with vulnerabilities that are found on that port",
-            "environment_keys": ["BINARYEDGE_API"],
             "related": None,
             "enabled": True,
             "type": "boefje",
diff --git a/rocky/tests/test_members.py b/rocky/tests/test_members.py
index d1835de94dc..f5fae93428b 100644
--- a/rocky/tests/test_members.py
+++ b/rocky/tests/test_members.py
@@ -189,16 +189,19 @@ def test_check_add_redteamer_form(rf, admin_member):
 
     assert response.status_code == 200
     assertContains(response, "Redteam member")
+    print(response.content)
 
     # Check first and last radio input of trusted clearance level form input
     assertContains(
         response,
-        '<input type="radio" name="trusted_clearance_level" value="-1" id="id_trusted_clearance_level_0" checked="">',
+        '<input type="radio" name="trusted_clearance_level" value="-1" radio_paws="True" '
+        'id="id_trusted_clearance_level_0" required="True" checked="True" checked="True">',
         html=True,
     )
     assertContains(
         response,
-        '<input type="radio" name="trusted_clearance_level" value="4" id="id_trusted_clearance_level_5">',
+        '<input type="radio" name="trusted_clearance_level" value="4" radio_paws="True" '
+        'id="id_trusted_clearance_level_5" required="True">',
         html=True,
     )
 
diff --git a/rocky/tests/test_models.py b/rocky/tests/test_models.py
index 7cb96eb1c93..066789bc720 100644
--- a/rocky/tests/test_models.py
+++ b/rocky/tests/test_models.py
@@ -49,3 +49,95 @@ def test_organizationmember_permissions_superuser(superuser_member, django_asser
         assert superuser_member.has_perm("tools.view_organization")
         assert superuser_member.has_perm("tools.can_scan_organization")
         assert superuser_member.has_perm("tools.can_enable_disable_boefje")
+
+
+def test_user_two_organization(client_user_two_organizations, organization, organization_b):
+    assert client_user_two_organizations.organizations == [organization, organization_b]
+    assert client_user_two_organizations.organizations_including_blocked == [organization, organization_b]
+
+
+def test_user_one_organization(client_member, organization_b):
+    assert client_member.user.organizations == [client_member.organization]
+
+
+def test_user_organization_blocked(blocked_member, organization_b):
+    assert blocked_member.user.organizations == []
+
+
+def test_superuser_organizations(superuser, organization, organization_b):
+    assert superuser.organizations == [organization, organization_b]
+
+
+def test_can_access_all_organizations(client_member, organization_b):
+    content_type = ContentType.objects.get_for_model(Organization)
+    can_access_all_organizations = Permission.objects.get(
+        codename="can_access_all_organizations", content_type=content_type
+    )
+
+    client_member.user.user_permissions.add(can_access_all_organizations)
+
+    assert client_member.user.organizations == [client_member.organization, organization_b]
+
+
+def test_max_clearance_level(client_member):
+    client_member.user.clearance_level = -1
+    client_member.trusted_clearance_level = -1
+    client_member.acknowledged_clearance_level = -1
+
+    assert client_member.max_clearance_level == -1
+
+    client_member.user.clearance_level = 4
+    client_member.trusted_clearance_level = -1
+    client_member.acknowledged_clearance_level = -1
+
+    assert client_member.max_clearance_level == 4
+
+    client_member.user.clearance_level = -1
+    client_member.trusted_clearance_level = 4
+    client_member.acknowledged_clearance_level = 4
+
+    assert client_member.max_clearance_level == 4
+
+    client_member.user.clearance_level = 4
+    client_member.trusted_clearance_level = 2
+    client_member.acknowledged_clearance_level = 2
+
+    assert client_member.max_clearance_level == 2
+
+    client_member.user.clearance_level = 2
+    client_member.trusted_clearance_level = 4
+    client_member.acknowledged_clearance_level = 4
+
+    assert client_member.max_clearance_level == 4
+
+
+def test_max_clearance_level_not_acknowledged(client_member):
+    client_member.user.clearance_level = 2
+    client_member.trusted_clearance_level = 1
+    client_member.acknowledged_clearance_level = -1
+
+    assert client_member.max_clearance_level == -1
+
+    client_member.user.clearance_level = 2
+    client_member.trusted_clearance_level = -1
+    client_member.acknowledged_clearance_level = 1
+
+    assert client_member.max_clearance_level == -1
+
+    client_member.user.clearance_level = -1
+    client_member.trusted_clearance_level = -1
+    client_member.acknowledged_clearance_level = 1
+
+    assert client_member.max_clearance_level == -1
+
+    client_member.user.clearance_level = -1
+    client_member.trusted_clearance_level = 2
+    client_member.acknowledged_clearance_level = -1
+
+    assert client_member.max_clearance_level == -1
+
+    client_member.user.clearance_level = -1
+    client_member.trusted_clearance_level = 2
+    client_member.acknowledged_clearance_level = 1
+
+    assert client_member.max_clearance_level == 1
diff --git a/rocky/tools/enums.py b/rocky/tools/enums.py
index 55928a5202c..de940d65e33 100644
--- a/rocky/tools/enums.py
+++ b/rocky/tools/enums.py
@@ -1,3 +1,6 @@
+from enum import Enum
+from typing import cast
+
 from django.db import models
 
 
@@ -9,6 +12,9 @@ class SCAN_LEVEL(models.IntegerChoices):
     L4 = 4, "L4"
 
 
+MAX_SCAN_LEVEL = max(scan_level.value for scan_level in cast(type[Enum], SCAN_LEVEL))
+
+
 class CUSTOM_SCAN_LEVEL(models.Choices):
     INHERIT = "inherit"
     L0 = 0
diff --git a/rocky/tools/forms/boefje.py b/rocky/tools/forms/boefje.py
new file mode 100644
index 00000000000..a64e4b1c58e
--- /dev/null
+++ b/rocky/tools/forms/boefje.py
@@ -0,0 +1,75 @@
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+from octopoes.models.types import ALL_TYPES
+from tools.enums import SCAN_LEVEL
+from tools.forms.base import BaseRockyForm
+from tools.forms.settings import (
+    BOEFJE_CONSUMES_HELP_TEXT,
+    BOEFJE_CONTAINER_IMAGE_HELP_TEXT,
+    BOEFJE_DESCRIPTION_HELP_TEXT,
+    BOEFJE_PRODUCES_HELP_TEXT,
+    BOEFJE_SCAN_LEVEL_HELP_TEXT,
+    BOEFJE_SCHEMA_HELP_TEXT,
+)
+
+OOI_TYPE_CHOICES = sorted((ooi_type.get_object_type(), ooi_type.get_object_type()) for ooi_type in ALL_TYPES)
+
+
+class BoefjeSetupForm(BaseRockyForm):
+    oci_image = forms.CharField(
+        required=True,
+        label=_("Container image"),
+        help_text=BOEFJE_CONTAINER_IMAGE_HELP_TEXT,
+    )
+    name = forms.CharField(
+        required=True,
+        label=_("Name"),
+    )
+    description = forms.CharField(
+        required=False,
+        label=_("Description"),
+        widget=forms.Textarea(attrs={"rows": 3}),
+        help_text=BOEFJE_DESCRIPTION_HELP_TEXT,
+    )
+    oci_arguments = forms.CharField(
+        required=False,
+        label=_("Arguments"),
+        widget=forms.TextInput(
+            attrs={"description": _("For example: -sTU --top-ports 1000"), "aria-describedby": "input-description"}
+        ),
+    )
+    boefje_schema = forms.JSONField(
+        required=False,
+        label=_("JSON Schema"),
+        help_text=BOEFJE_SCHEMA_HELP_TEXT,
+    )
+    consumes = forms.CharField(
+        required=False,
+        label=_("Input object type"),
+        widget=forms.SelectMultiple(choices=OOI_TYPE_CHOICES),
+        help_text=BOEFJE_CONSUMES_HELP_TEXT,
+    )
+    produces = forms.CharField(
+        required=False,
+        label=_("Output mime types"),
+        help_text=BOEFJE_PRODUCES_HELP_TEXT,
+    )
+    scan_level = forms.CharField(
+        required=False,
+        label=_("Clearance level"),
+        widget=forms.Select(choices=SCAN_LEVEL.choices),
+        help_text=BOEFJE_SCAN_LEVEL_HELP_TEXT,
+    )
+    interval = forms.CharField(
+        required=False,
+        label=_("Scan frequency"),
+        widget=forms.TextInput(
+            attrs={
+                "description": _(
+                    "Specify the scanning frequency for this Boefje in minutes. The default is 24 hours. "
+                    "For example: 5 minutes will let the boefje scan every 5 minutes."
+                )
+            }
+        ),
+    )
diff --git a/rocky/tools/forms/ooi_form.py b/rocky/tools/forms/ooi_form.py
index a6ff3fad5ae..9f54de84798 100644
--- a/rocky/tools/forms/ooi_form.py
+++ b/rocky/tools/forms/ooi_form.py
@@ -13,9 +13,9 @@
 from octopoes.models import OOI
 from octopoes.models.ooi.question import Question
 from octopoes.models.types import get_collapsed_types, get_relations
+from tools.enums import SCAN_LEVEL
 from tools.forms.base import BaseRockyForm, CheckboxGroup
 from tools.forms.settings import CLEARANCE_TYPE_CHOICES
-from tools.models import SCAN_LEVEL
 
 
 class OOIForm(BaseRockyForm):
@@ -218,3 +218,7 @@ class OOITypeMultiCheckboxForm(BaseRockyForm):
 
 class OOISearchForm(BaseRockyForm):
     search = forms.CharField(label=_("Search"), required=False, max_length=256, help_text="Object ID contains")
+
+
+class OrderByObjectTypeForm(BaseRockyForm):
+    order_by = forms.CharField(widget=forms.HiddenInput(attrs={"value": "object_type"}), required=False)
diff --git a/rocky/tools/forms/settings.py b/rocky/tools/forms/settings.py
index 3e107731ff7..7ce8ca7b091 100644
--- a/rocky/tools/forms/settings.py
+++ b/rocky/tools/forms/settings.py
@@ -1,5 +1,6 @@
 from typing import Any
 
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
 from tools.enums import SCAN_LEVEL
@@ -58,6 +59,56 @@
     "Select a datetime to change the view to represent that moment in time."
 )
 
+BOEFJE_CONTAINER_IMAGE_HELP_TEXT = mark_safe(
+    _(
+        "<p>The name of the Docker image. For example: <i>'ghcr.io/minvws/openkat/nmap'</i>. "
+        "In OpenKAT, all Boefjes with the same container image will be seen as 'variants' and will be "
+        "shown together on the Boefje detail page. </p> "
+    )
+)
+
+BOEFJE_DESCRIPTION_HELP_TEXT = mark_safe(
+    _(
+        "<p>A description of the Boefje explaining in short what it can do. "
+        "This will both be displayed inside the KAT-alogus and on the Boefje details page.</p> "
+    )
+)
+
+BOEFJE_CONSUMES_HELP_TEXT = _(
+    "Select the object type(s) that your Boefje consumes. "
+    "To select multiple objects, press and hold the 'ctrl'/'command' key "
+    "and then click the items you want to select. "
+)
+
+BOEFJE_SCHEMA_HELP_TEXT = mark_safe(
+    _(
+        "<p>If any other settings are needed for your Boefje, add these as a JSON Schema, "
+        "otherwise, leave the field empty or 'null'.</p> "
+        "<p> This JSON is used as the basis for a form for the user. "
+        "When the user enables this Boefje they can get the option to give extra information. "
+        "For example, it can contain an API key that the script requires.</p> "
+        "<p>More information about what the schema.json file looks like can be found "
+        "<a href='https://docs.openkat.nl/developer_documentation/development_tutorial/creating_a_boefje.html'> "
+        "here</a>.</p> "
+    )
+)
+
+BOEFJE_PRODUCES_HELP_TEXT = mark_safe(
+    _(
+        "<p>Add a set of mime types that are produced by this Boefje, separated by commas. "
+        "For example: <i>'text/html'</i>, <i>'image/jpeg'</i> or <i>'boefje/{boefje-id}'</i></p> "
+        "<p>These output mime types will be shown on the Boefje detail page as information for other users. </p> "
+    )
+)
+BOEFJE_SCAN_LEVEL_HELP_TEXT = mark_safe(
+    _(
+        "<p>Select a clearance level for your Boefje. For more information about the different "
+        "clearance levels please check the "
+        "<a href='https://docs.openkat.nl/manual/usermanual.html#scan-levels-clearance-indemnities'> "
+        "documentation</a>.</p> "
+    )
+)
+
 DEPTH_DEFAULT = 9
 DEPTH_MAX = 15
 DEPTH_HELP_TEXT = _("Depth of the tree.")
diff --git a/rocky/tools/management/commands/setup_dev_account.py b/rocky/tools/management/commands/setup_dev_account.py
index ae401e8543b..ff0ea20f036 100644
--- a/rocky/tools/management/commands/setup_dev_account.py
+++ b/rocky/tools/management/commands/setup_dev_account.py
@@ -39,6 +39,7 @@ def handle(self, *args, **options):
         redteamer_permissions = [
             "can_scan_organization",
             "can_enable_disable_boefje",
+            "can_add_boefje",
             "can_set_clearance_level",
             "can_delete_oois",
             "can_mute_findings",
diff --git a/rocky/tools/migrations/0042_alter_organization_options.py b/rocky/tools/migrations/0042_alter_organization_options.py
new file mode 100644
index 00000000000..6972b7a0ab7
--- /dev/null
+++ b/rocky/tools/migrations/0042_alter_organization_options.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.0.8 on 2024-08-26 08:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tools", "0001_squashed_0041_merge_20230731_1131"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="organization",
+            options={
+                "permissions": (
+                    ("can_switch_organization", "Can switch organization"),
+                    ("can_scan_organization", "Can scan organization"),
+                    ("can_enable_disable_boefje", "Can enable or disable boefje"),
+                    ("can_add_boefje", "Can add new or duplicated boefje"),
+                    ("can_set_clearance_level", "Can set clearance level"),
+                    ("can_delete_oois", "Can delete oois"),
+                    ("can_mute_findings", "Can mute findings"),
+                    ("can_view_katalogus_settings", "Can view KAT-alogus settings"),
+                    ("can_set_katalogus_settings", "Can set KAT-alogus settings"),
+                    ("can_recalculate_bits", "Can recalculate bits"),
+                )
+            },
+        ),
+    ]
diff --git a/rocky/tools/migrations/0043_alter_organization_options.py b/rocky/tools/migrations/0043_alter_organization_options.py
new file mode 100644
index 00000000000..2d662f68c64
--- /dev/null
+++ b/rocky/tools/migrations/0043_alter_organization_options.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.0.8 on 2024-08-27 09:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tools", "0042_alter_organization_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="organization",
+            options={
+                "permissions": (
+                    ("can_switch_organization", "Can switch organization"),
+                    ("can_scan_organization", "Can scan organization"),
+                    ("can_enable_disable_boefje", "Can enable or disable boefje"),
+                    ("can_add_boefje", "Can add new or duplicate boefjes"),
+                    ("can_set_clearance_level", "Can set clearance level"),
+                    ("can_delete_oois", "Can delete oois"),
+                    ("can_mute_findings", "Can mute findings"),
+                    ("can_view_katalogus_settings", "Can view KAT-alogus settings"),
+                    ("can_set_katalogus_settings", "Can set KAT-alogus settings"),
+                    ("can_recalculate_bits", "Can recalculate bits"),
+                )
+            },
+        ),
+    ]
diff --git a/rocky/tools/migrations/0044_alter_organization_options.py b/rocky/tools/migrations/0044_alter_organization_options.py
new file mode 100644
index 00000000000..c98c0520e26
--- /dev/null
+++ b/rocky/tools/migrations/0044_alter_organization_options.py
@@ -0,0 +1,30 @@
+# Generated by Django 5.0.8 on 2024-09-16 09:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("tools", "0043_alter_organization_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="organization",
+            options={
+                "permissions": (
+                    ("can_switch_organization", "Can switch organization"),
+                    ("can_scan_organization", "Can scan organization"),
+                    ("can_enable_disable_boefje", "Can enable or disable boefje"),
+                    ("can_add_boefje", "Can add new or duplicate boefjes"),
+                    ("can_set_clearance_level", "Can set clearance level"),
+                    ("can_delete_oois", "Can delete oois"),
+                    ("can_mute_findings", "Can mute findings"),
+                    ("can_view_katalogus_settings", "Can view KAT-alogus settings"),
+                    ("can_set_katalogus_settings", "Can set KAT-alogus settings"),
+                    ("can_recalculate_bits", "Can recalculate bits"),
+                    ("can_access_all_organizations", "Can access all organizations"),
+                )
+            },
+        ),
+    ]
diff --git a/rocky/tools/models.py b/rocky/tools/models.py
index 5e8cf119958..32643a81855 100644
--- a/rocky/tools/models.py
+++ b/rocky/tools/models.py
@@ -1,8 +1,6 @@
 import datetime
 from collections.abc import Iterable
-from enum import Enum
 from functools import cached_property
-from typing import cast
 
 import structlog
 import tagulous.models
@@ -23,7 +21,7 @@
 from octopoes.models.ooi.web import Network
 from rocky.exceptions import OctopoesDownException, OctopoesException, OctopoesUnhealthyException
 from tools.add_ooi_information import SEPARATOR, get_info
-from tools.enums import SCAN_LEVEL
+from tools.enums import MAX_SCAN_LEVEL
 from tools.fields import LowerCaseSlugField
 
 GROUP_ADMIN = "admin"
@@ -101,12 +99,14 @@ class Meta:
             ("can_switch_organization", "Can switch organization"),
             ("can_scan_organization", "Can scan organization"),
             ("can_enable_disable_boefje", "Can enable or disable boefje"),
+            ("can_add_boefje", "Can add new or duplicate boefjes"),
             ("can_set_clearance_level", "Can set clearance level"),
             ("can_delete_oois", "Can delete oois"),
             ("can_mute_findings", "Can mute findings"),
             ("can_view_katalogus_settings", "Can view KAT-alogus settings"),
             ("can_set_katalogus_settings", "Can set KAT-alogus settings"),
             ("can_recalculate_bits", "Can recalculate bits"),
+            ("can_access_all_organizations", "Can access all organizations"),
         )
 
     def get_absolute_url(self):
@@ -216,8 +216,6 @@ class STATUSES(models.TextChoices):
         ACTIVE = "active", _("active")
         NEW = "new", _("new")
 
-    scan_levels = [scan_level.value for scan_level in cast(type[Enum], SCAN_LEVEL)]
-
     user = models.ForeignKey("account.KATUser", on_delete=models.PROTECT, related_name="members")
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE, related_name="members")
     groups = models.ManyToManyField(Group, blank=True)
@@ -225,10 +223,10 @@ class STATUSES(models.TextChoices):
     blocked = models.BooleanField(default=False)
     onboarded = models.BooleanField(default=False)
     trusted_clearance_level = models.IntegerField(
-        default=-1, validators=[MinValueValidator(-1), MaxValueValidator(max(scan_levels))]
+        default=-1, validators=[MinValueValidator(-1), MaxValueValidator(MAX_SCAN_LEVEL)]
     )
     acknowledged_clearance_level = models.IntegerField(
-        default=-1, validators=[MinValueValidator(-1), MaxValueValidator(max(scan_levels))]
+        default=-1, validators=[MinValueValidator(-1), MaxValueValidator(MAX_SCAN_LEVEL)]
     )
 
     EVENT_CODES = {"created": 900211, "updated": 900212, "deleted": 900213}
@@ -259,6 +257,29 @@ def has_perm(self, perm: str) -> bool:
     def has_perms(self, perm_list: Iterable[str]) -> bool:
         return all(self.has_perm(perm) for perm in perm_list)
 
+    @property
+    def max_clearance_level(self) -> int:
+        """The maximum clearance level the user has for this organization.
+
+        When the user has an organization specific clearance level that is lower
+        than the global clearance level this will overrule the global clearance
+        level.
+
+        For the organization specific clearance level we take the minimum
+        of the trusted clearance level and acknowledged clearance level. If the
+        user did not acknowledge a changed clearance level, we need to use the
+        level that was previously. If an admin lowered the users clearance
+        level, we also need to use that level instead of the previously
+        acknowledged level.
+        """
+        if self.trusted_clearance_level == -1 and self.acknowledged_clearance_level == -1:
+            return self.user.clearance_level
+        else:
+            return min(self.trusted_clearance_level, self.acknowledged_clearance_level)
+
+    def has_clearance_level(self, level: int) -> bool:
+        return level <= self.max_clearance_level
+
     class Meta:
         unique_together = ["user", "organization"]
 
diff --git a/rocky/tools/permissions.py b/rocky/tools/permissions.py
new file mode 100644
index 00000000000..5cd2169d32f
--- /dev/null
+++ b/rocky/tools/permissions.py
@@ -0,0 +1,13 @@
+from rest_framework.permissions import BasePermission
+
+
+# This is a bit clunky, but DRF doesn't allow you to specify a permission
+# directly, only a Permission class
+class CanRecalculateBits(BasePermission):
+    def has_permission(self, request, view) -> bool:
+        return request.user.has_perm("tools.can_recalculate_bits")
+
+
+class CanSetKatalogusSettings(BasePermission):
+    def has_permission(self, request, view) -> bool:
+        return request.user.has_perm("tools.can_set_katalogus_settings")
diff --git a/rocky/tools/serializers.py b/rocky/tools/serializers.py
index 5213dc91246..7b24d11c0ee 100644
--- a/rocky/tools/serializers.py
+++ b/rocky/tools/serializers.py
@@ -1,3 +1,4 @@
+from rest_framework.serializers import PrimaryKeyRelatedField, Serializer
 from tagulous.contrib.drf import TagSerializer
 
 from tools.models import Organization
@@ -14,3 +15,7 @@ class Meta:
         model = Organization
         fields = ["id", "name", "code", "tags"]
         read_only_fields = ["code"]
+
+
+class ToOrganizationSerializer(Serializer):
+    to_organization = PrimaryKeyRelatedField(queryset=Organization.objects.all())
diff --git a/rocky/tools/viewsets.py b/rocky/tools/viewsets.py
index 52e5d492252..429d70df184 100644
--- a/rocky/tools/viewsets.py
+++ b/rocky/tools/viewsets.py
@@ -1,9 +1,17 @@
+from django.conf import settings
+from katalogus.client import get_katalogus
 from rest_framework import status, viewsets
 from rest_framework.decorators import action
+from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
+from structlog import get_logger
 
+from octopoes.connector.octopoes import OctopoesAPIConnector
 from tools.models import Indemnification, Organization
-from tools.serializers import OrganizationSerializer, OrganizationSerializerReadOnlyCode
+from tools.permissions import CanRecalculateBits, CanSetKatalogusSettings
+from tools.serializers import OrganizationSerializer, OrganizationSerializerReadOnlyCode, ToOrganizationSerializer
+
+logger = get_logger(__name__)
 
 
 class OrganizationViewSet(viewsets.ModelViewSet):
@@ -19,8 +27,14 @@ def get_serializer_class(self):
             serializer_class = OrganizationSerializerReadOnlyCode
         return serializer_class
 
-    @action(detail=True)
+    @action(detail=True, permission_classes=[])
     def indemnification(self, request, pk=None):
+        # DRF does not support different arguments when mapping POST/GET of the
+        # same endpoind to a different method, so we can't use the
+        # permission_classes argument here.
+        if not request.user.has_perm("tools.view_organization"):
+            raise PermissionDenied()
+
         organization = self.get_object()
         indemnification = Indemnification.objects.filter(organization=organization).first()
 
@@ -31,6 +45,9 @@ def indemnification(self, request, pk=None):
 
     @indemnification.mapping.post
     def set_indemnification(self, request, pk=None):
+        if not request.user.has_perm("tools.add_indemnification"):
+            raise PermissionDenied()
+
         organization = self.get_object()
 
         indemnification = Indemnification.objects.filter(organization=organization).first()
@@ -40,3 +57,31 @@ def set_indemnification(self, request, pk=None):
         indemnification = Indemnification.objects.create(organization=organization, user=self.request.user)
 
         return Response({"indemnification": True, "user": indemnification.user.pk}, status=status.HTTP_201_CREATED)
+
+    @action(detail=True, methods=["post"], permission_classes=[CanRecalculateBits])
+    def recalculate_bits(self, request, pk=None):
+        organization = self.get_object()
+        logger.info("Recalculating bits", event_code=920000, organization_code=organization.code)
+        connector = OctopoesAPIConnector(settings.OCTOPOES_API, organization.code)
+        number_of_bits = connector.recalculate_bits()
+
+        return Response({"number_of_bits": number_of_bits})
+
+    @action(detail=True, methods=["post"], permission_classes=[CanSetKatalogusSettings])
+    def clone_katalogus_settings(self, request, pk=None):
+        from_organization = self.get_object()
+
+        serializer = ToOrganizationSerializer(data=request.data)
+        if serializer.is_valid():
+            to_organization = serializer.validated_data["to_organization"]
+            logger.info(
+                "Cloning organization settings",
+                event_code=910000,
+                organization_code=from_organization.code,
+                to_organization_code=to_organization.code,
+            )
+            get_katalogus(from_organization.code).clone_all_configuration_to_organization(to_organization.code)
+
+            return Response()
+        else:
+            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)