diff --git a/.gitignore b/.gitignore
index 2900cd3e..d0130487 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 .idea/
 frontend
+
+# Ignore Pyright-generated stubs
+*.pyi
+typings/
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9ef95a44..6c80d1bc 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,10 +1,11 @@
 {
-    "python.interpreterPath": "/home/tanshu/.cache/pypoetry/virtualenvs/brewman-C3_Ccu4O-py3.13/bin/python",
+    "python.defaultInterpreterPath": "/home/tanshu/.cache/pypoetry/virtualenvs/brewman-C3_Ccu4O-py3.13/bin/python",
     "files.exclude": {
         "**/__pycache__": true,
         "**/.mypy_cache": true,
         ".idea": true,
         "**/node_modules": true,
+        "typings": true,
     },
     "search.exclude": {
         "**/__pycache__": true,
@@ -13,6 +14,7 @@
         "**/node_modules": true,
         "**/package-lock.json": true,
         "/overlord/.angular/**": true,
+        "typings": true,
     },
     "editor.codeActionsOnSave": {
         "source.fixAll.eslint": "explicit"
diff --git a/brewman/brewman/core/config.py b/brewman/brewman/core/config.py
index 7870d698..733dd362 100644
--- a/brewman/brewman/core/config.py
+++ b/brewman/brewman/core/config.py
@@ -25,13 +25,13 @@ class Settings(BaseSettings):
     SQLALCHEMY_DATABASE_URI: str | None = None
 
     @field_validator("PRIVATE_KEY", mode="before")
-    def convert_private_key_newlines(cls, v):
+    def convert_private_key_newlines(cls, v: str | None) -> str | None:
         if isinstance(v, str):
             return v.replace("\\n", "\n")
         return v
 
     @field_validator("PUBLIC_KEY", mode="before")
-    def convert_public_key_newlines(cls, v):
+    def convert_public_key_newlines(cls, v: str | None) -> str | None:
         if isinstance(v, str):
             return v.replace("\\n", "\n")
         return v
diff --git a/brewman/brewman/models/user.py b/brewman/brewman/models/user.py
index 993e6628..844bc975 100644
--- a/brewman/brewman/models/user.py
+++ b/brewman/brewman/models/user.py
@@ -55,7 +55,7 @@ class User:
 
     @classmethod
     def auth(cls, name: str, password: str, db: Session) -> User | None:
-        if password is None:
+        if not password:
             return None
         user: User | None = db.execute(select(cls).where(cls.name.ilike(name))).scalars().one_or_none()
         if not user:
diff --git a/brewman/brewman/models/voucher.py b/brewman/brewman/models/voucher.py
index ff3551f0..ee1ad557 100644
--- a/brewman/brewman/models/voucher.py
+++ b/brewman/brewman/models/voucher.py
@@ -67,7 +67,7 @@ class Voucher:
         voucher_type: VoucherType,
         user_id: uuid.UUID,
         narration: str = "",
-        is_starred: bool = False,
+        is_starred: bool | None = False,
         posted: bool = False,
         is_reconciled: bool = False,
         reconcile_date: date | None = None,
diff --git a/brewman/brewman/routers/account.py b/brewman/brewman/routers/account.py
index 721b5b39..cde9d6ad 100644
--- a/brewman/brewman/routers/account.py
+++ b/brewman/brewman/routers/account.py
@@ -8,8 +8,6 @@ from sqlalchemy import func, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, joinedload
 
-import brewman.schemas.account as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.account import Account
@@ -19,6 +17,7 @@ from ..models.cost_centre import CostCentre
 from ..models.journal import Journal
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import account as schemas
 from ..schemas.balance import AccountBalance
 from ..schemas.user import UserToken
 
diff --git a/brewman/brewman/routers/account_types.py b/brewman/brewman/routers/account_types.py
index 18c07a59..060afb58 100644
--- a/brewman/brewman/routers/account_types.py
+++ b/brewman/brewman/routers/account_types.py
@@ -1,11 +1,10 @@
 from fastapi import APIRouter, Depends
 from sqlalchemy import select
 
-import brewman.schemas.account_type as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.account_type import AccountType
+from ..schemas import account_type as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/attendance.py b/brewman/brewman/routers/attendance.py
index 1a9ddafe..1f3152a8 100644
--- a/brewman/brewman/routers/attendance.py
+++ b/brewman/brewman/routers/attendance.py
@@ -6,14 +6,13 @@ from sqlalchemy import or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.attendance as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, set_date
 from ..db.session import SessionFuture
 from ..models.attendance import Attendance
 from ..models.employee import Employee
 from ..routers.fingerprint import get_prints
+from ..schemas import attendance as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/attendance_types.py b/brewman/brewman/routers/attendance_types.py
index 8c28372d..96ecb3f0 100644
--- a/brewman/brewman/routers/attendance_types.py
+++ b/brewman/brewman/routers/attendance_types.py
@@ -1,9 +1,8 @@
 from fastapi import APIRouter, Depends
 
-import brewman.schemas.attendance_type as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..models.attendance_type import AttendanceType
+from ..schemas import attendance_type as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/batch.py b/brewman/brewman/routers/batch.py
index 69a0d26d..54a59339 100644
--- a/brewman/brewman/routers/batch.py
+++ b/brewman/brewman/routers/batch.py
@@ -4,16 +4,14 @@ from fastapi import APIRouter, Depends
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import contains_eager
 
-import brewman.schemas.batch as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.batch import Batch
 from ..models.product import Product
+from ..models.product_version import ProductVersion
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
+from ..schemas import batch as schemas
 from ..schemas.user import UserToken
 
 
@@ -22,7 +20,7 @@ router = APIRouter()
 
 @router.get("", response_model=list[schemas.Batch])
 def batch_term(
-    q: str,
+    q: str | None,
     d: str,
     current_user: UserToken = Depends(get_user),
 ) -> list[schemas.Batch]:
diff --git a/brewman/brewman/routers/batch_integrity.py b/brewman/brewman/routers/batch_integrity.py
index 2fb165e5..8121215e 100644
--- a/brewman/brewman/routers/batch_integrity.py
+++ b/brewman/brewman/routers/batch_integrity.py
@@ -6,10 +6,6 @@ from fastapi import APIRouter, Security
 from sqlalchemy import and_, distinct, func, or_, select, update
 from sqlalchemy.orm import Session, contains_eager
 
-import brewman.schemas.batch_integrity as schemas
-
-from brewman.models.product_version import ProductVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.batch import Batch
@@ -17,8 +13,10 @@ from ..models.cost_centre import CostCentre
 from ..models.inventory import Inventory
 from ..models.journal import Journal
 from ..models.product import Product
+from ..models.product_version import ProductVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
 from ..models.voucher import Voucher
+from ..schemas import batch_integrity as schemas
 from ..schemas.user import UserToken
 from .issue import refresh_voucher
 
diff --git a/brewman/brewman/routers/calculate_prices.py b/brewman/brewman/routers/calculate_prices.py
index 8fc685a6..5a763c14 100644
--- a/brewman/brewman/routers/calculate_prices.py
+++ b/brewman/brewman/routers/calculate_prices.py
@@ -8,19 +8,18 @@ from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from brewman.models.batch import Batch
-from brewman.models.cost_centre import CostCentre
-from brewman.models.inventory import Inventory
-from brewman.models.journal import Journal
-from brewman.models.period import Period
-from brewman.models.price import Price
-from brewman.models.sku_version import SkuVersion
-from brewman.models.voucher import Voucher
-from brewman.models.voucher_type import VoucherType
-
+from ..models.batch import Batch
+from ..models.cost_centre import CostCentre
+from ..models.inventory import Inventory
+from ..models.journal import Journal
+from ..models.period import Period
+from ..models.price import Price
 from ..models.recipe import Recipe
 from ..models.recipe_item import RecipeItem
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
+from ..models.voucher import Voucher
+from ..models.voucher_type import VoucherType
 
 
 def calculate_prices(period_id: uuid.UUID, db: Session) -> None:
diff --git a/brewman/brewman/routers/client.py b/brewman/brewman/routers/client.py
index f150a5ba..7ef7cbf8 100644
--- a/brewman/brewman/routers/client.py
+++ b/brewman/brewman/routers/client.py
@@ -4,12 +4,11 @@ from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import delete, select
 from sqlalchemy.exc import SQLAlchemyError
 
-import brewman.schemas.client as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.client import Client
 from ..models.login_history import LoginHistory
+from ..schemas import client as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/cost_centre.py b/brewman/brewman/routers/cost_centre.py
index ad88f18e..1657eded 100644
--- a/brewman/brewman/routers/cost_centre.py
+++ b/brewman/brewman/routers/cost_centre.py
@@ -4,13 +4,12 @@ from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import delete, select, update
 from sqlalchemy.exc import SQLAlchemyError
 
-import brewman.schemas.cost_centre as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.account_base import AccountBase
 from ..models.cost_centre import CostCentre
 from ..models.journal import Journal
+from ..schemas import cost_centre as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/db_image.py b/brewman/brewman/routers/db_image.py
index f9099b97..95580a64 100644
--- a/brewman/brewman/routers/db_image.py
+++ b/brewman/brewman/routers/db_image.py
@@ -7,10 +7,9 @@ from fastapi.responses import StreamingResponse
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-import brewman.schemas.image_upload as output
-
 from ..db.session import SessionFuture
 from ..models.db_image import DbImage
+from ..schemas import image_upload as output
 
 
 router = APIRouter()
diff --git a/brewman/brewman/routers/employee.py b/brewman/brewman/routers/employee.py
index 8e760fba..f3f5e689 100644
--- a/brewman/brewman/routers/employee.py
+++ b/brewman/brewman/routers/employee.py
@@ -9,8 +9,6 @@ from sqlalchemy import desc, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, joinedload
 
-import brewman.schemas.employee as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.account import Account
@@ -19,6 +17,7 @@ from ..models.employee import Employee
 from ..models.journal import Journal
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import employee as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/employee_attendance.py b/brewman/brewman/routers/employee_attendance.py
index 8b51ef52..c397175c 100644
--- a/brewman/brewman/routers/employee_attendance.py
+++ b/brewman/brewman/routers/employee_attendance.py
@@ -6,14 +6,13 @@ from fastapi import APIRouter, Request, Security
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
-import brewman.schemas.employee_attendance as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_finish_date, get_start_date
 from ..db.session import SessionFuture
 from ..models.attendance import Attendance
 from ..models.employee import Employee
 from ..routers.fingerprint import get_prints
+from ..schemas import employee_attendance as schemas
 from ..schemas.user import UserToken
 from .attendance import date_range
 
diff --git a/brewman/brewman/routers/employee_benefit.py b/brewman/brewman/routers/employee_benefit.py
index 15cc9cb9..8fb54052 100644
--- a/brewman/brewman/routers/employee_benefit.py
+++ b/brewman/brewman/routers/employee_benefit.py
@@ -9,9 +9,6 @@ from sqlalchemy import distinct, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, get_last_day, set_date
 from ..db.session import SessionFuture
@@ -22,6 +19,8 @@ from ..models.journal import Journal
 from ..models.validations import check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.employee_benefit import EmployeeBenefit as EmployeeBenefitSchema
 from ..schemas.user import UserToken
diff --git a/brewman/brewman/routers/fingerprint.py b/brewman/brewman/routers/fingerprint.py
index eb485af7..cd78559e 100644
--- a/brewman/brewman/routers/fingerprint.py
+++ b/brewman/brewman/routers/fingerprint.py
@@ -11,12 +11,11 @@ from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.fingerprint as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.employee import Employee
 from ..models.fingerprint import Fingerprint
+from ..schemas import fingerprint as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/incentive.py b/brewman/brewman/routers/incentive.py
index 9c986dc7..d8c70377 100644
--- a/brewman/brewman/routers/incentive.py
+++ b/brewman/brewman/routers/incentive.py
@@ -8,9 +8,6 @@ from sqlalchemy import and_, distinct, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, get_first_day, set_date
 from ..db.session import SessionFuture
@@ -24,6 +21,8 @@ from ..models.journal import Journal
 from ..models.validations import check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.incentive import Incentive as IncentiveSchema
 from ..schemas.user import UserToken
diff --git a/brewman/brewman/routers/issue.py b/brewman/brewman/routers/issue.py
index 101238f9..a076ff67 100644
--- a/brewman/brewman/routers/issue.py
+++ b/brewman/brewman/routers/issue.py
@@ -8,12 +8,6 @@ from sqlalchemy import and_, distinct, func, or_, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, contains_eager
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, set_date
 from ..db.session import SessionFuture
@@ -23,10 +17,14 @@ from ..models.cost_centre import CostCentre
 from ..models.inventory import Inventory
 from ..models.journal import Journal
 from ..models.product import Product
+from ..models.product_version import ProductVersion
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
 from ..models.validations import check_duplicate_batches, check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.cost_centre import CostCentreLink
 from ..schemas.inventory import Inventory as InventorySchema
diff --git a/brewman/brewman/routers/journal.py b/brewman/brewman/routers/journal.py
index b7c82d76..c97fd26b 100644
--- a/brewman/brewman/routers/journal.py
+++ b/brewman/brewman/routers/journal.py
@@ -7,11 +7,6 @@ from sqlalchemy import distinct, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
-from brewman.routers.tag import save_tags, update_tags
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, set_date
 from ..db.session import SessionFuture
@@ -20,11 +15,14 @@ from ..models.journal import Journal
 from ..models.validations import check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.account import AccountLink
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.user import UserToken
 from . import get_lock_info
 from .db_image import save_files, update_files
+from .tag import save_tags, update_tags
 from .voucher import blank_voucher, check_voucher_edit_allowed, voucher_info
 
 
diff --git a/brewman/brewman/routers/period.py b/brewman/brewman/routers/period.py
index c242d1ef..1d288150 100644
--- a/brewman/brewman/routers/period.py
+++ b/brewman/brewman/routers/period.py
@@ -4,12 +4,11 @@ from fastapi import APIRouter, Depends, HTTPException, Request, Security, status
 from sqlalchemy import delete, desc, select
 from sqlalchemy.exc import SQLAlchemyError
 
-import brewman.schemas.period as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_finish_date, get_start_date
 from ..db.session import SessionFuture
 from ..models.period import Period
+from ..schemas import period as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/product.py b/brewman/brewman/routers/product.py
index 6ea7f585..da702341 100644
--- a/brewman/brewman/routers/product.py
+++ b/brewman/brewman/routers/product.py
@@ -9,10 +9,6 @@ from sqlalchemy import and_, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, contains_eager
 
-import brewman.schemas.product as schemas
-
-from brewman.models.sku_version import SkuVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.account import Account
@@ -21,7 +17,9 @@ from ..models.product_group import ProductGroup
 from ..models.product_version import ProductVersion
 from ..models.rate_contract import RateContract
 from ..models.rate_contract_item import RateContractItem
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
+from ..schemas import product as schemas
 from ..schemas.product_sku import ProductSku
 from ..schemas.user import UserToken
 from . import effective_date
diff --git a/brewman/brewman/routers/product_group.py b/brewman/brewman/routers/product_group.py
index 8c8f7c8c..1d07ad7f 100644
--- a/brewman/brewman/routers/product_group.py
+++ b/brewman/brewman/routers/product_group.py
@@ -4,11 +4,10 @@ from fastapi import APIRouter, Depends, HTTPException, Security, status
 from sqlalchemy import select
 from sqlalchemy.exc import SQLAlchemyError
 
-import brewman.schemas.product_group as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.product_group import ProductGroup
+from ..schemas import product_group as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/purchase.py b/brewman/brewman/routers/purchase.py
index d29192c4..6dfaacab 100644
--- a/brewman/brewman/routers/purchase.py
+++ b/brewman/brewman/routers/purchase.py
@@ -8,13 +8,6 @@ from sqlalchemy import and_, distinct, func, or_, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-from brewman.routers.tag import save_tags, update_tags
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, set_date
 from ..db.session import SessionFuture
@@ -23,18 +16,23 @@ from ..models.batch import Batch
 from ..models.inventory import Inventory
 from ..models.journal import Journal
 from ..models.product import Product
+from ..models.product_version import ProductVersion
 from ..models.rate_contract import RateContract
 from ..models.rate_contract_item import RateContractItem
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
 from ..models.validations import check_duplicate_skus, check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.inventory import Inventory as InventorySchema
 from ..schemas.user import UserToken
 from . import get_lock_info
 from .batch_integrity import fix_single_batch_prices
 from .db_image import save_files, update_files
+from .tag import save_tags, update_tags
 from .voucher import (
     blank_voucher,
     check_voucher_edit_allowed,
diff --git a/brewman/brewman/routers/purchase_return.py b/brewman/brewman/routers/purchase_return.py
index 31a55c1e..c79a0b0e 100644
--- a/brewman/brewman/routers/purchase_return.py
+++ b/brewman/brewman/routers/purchase_return.py
@@ -8,13 +8,6 @@ from sqlalchemy import and_, distinct, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, contains_eager
 
-import brewman.schemas.input as schema_in
-import brewman.schemas.voucher as output
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-from brewman.routers.tag import save_tags, update_tags
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_date, set_date
 from ..db.session import SessionFuture
@@ -23,15 +16,20 @@ from ..models.batch import Batch
 from ..models.inventory import Inventory
 from ..models.journal import Journal
 from ..models.product import Product
+from ..models.product_version import ProductVersion
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
 from ..models.validations import check_duplicate_batches, check_journals_are_valid
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
+from ..schemas import input as schema_in
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.inventory import Inventory as InventorySchema
 from ..schemas.user import UserToken
 from . import get_lock_info
 from .db_image import save_files, update_files
+from .tag import save_tags, update_tags
 from .voucher import (
     blank_voucher,
     check_voucher_edit_allowed,
diff --git a/brewman/brewman/routers/rate_contract.py b/brewman/brewman/routers/rate_contract.py
index c018b5d8..a12247e0 100644
--- a/brewman/brewman/routers/rate_contract.py
+++ b/brewman/brewman/routers/rate_contract.py
@@ -8,10 +8,6 @@ from sqlalchemy import and_, delete, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-from brewman.models.stock_keeping_unit import StockKeepingUnit
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import (
     get_date,
@@ -21,8 +17,11 @@ from ..core.session import (
     set_period,
 )
 from ..db.session import SessionFuture
+from ..models.product_version import ProductVersion
 from ..models.rate_contract import RateContract
 from ..models.rate_contract_item import RateContractItem
+from ..models.sku_version import SkuVersion
+from ..models.stock_keeping_unit import StockKeepingUnit
 from ..schemas.product import ProductLink
 from ..schemas.rate_contract import AccountLink, RateContractBlank, RateContractIn
 from ..schemas.rate_contract import RateContract as RateContractSchema
diff --git a/brewman/brewman/routers/recipe.py b/brewman/brewman/routers/recipe.py
index 100f1cd9..48745eb1 100644
--- a/brewman/brewman/routers/recipe.py
+++ b/brewman/brewman/routers/recipe.py
@@ -16,21 +16,19 @@ from sqlalchemy import and_, delete, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, aliased, contains_eager, joinedload
 
-import brewman.schemas.recipe as schemas
-import brewman.schemas.recipe_item as rischemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.price import Price
 from ..models.product import Product
+from ..models.product_version import ProductVersion
 from ..models.recipe import Recipe
 from ..models.recipe_item import RecipeItem
+from ..models.sku_version import SkuVersion
 from ..models.stock_keeping_unit import StockKeepingUnit
 from ..routers.calculate_nutrition import calculate_nutrition, report_nutrition
 from ..routers.calculate_prices import calculate_prices
+from ..schemas import recipe as schemas
+from ..schemas import recipe_item as rischemas
 from ..schemas.nutritional_information import NutritionalInformation
 from ..schemas.user import UserToken
 
diff --git a/brewman/brewman/routers/recipe_template.py b/brewman/brewman/routers/recipe_template.py
index ce309ead..092b8bfa 100644
--- a/brewman/brewman/routers/recipe_template.py
+++ b/brewman/brewman/routers/recipe_template.py
@@ -5,11 +5,10 @@ from fastapi import APIRouter, HTTPException, Security, status
 from sqlalchemy import delete, select, update
 from sqlalchemy.exc import SQLAlchemyError
 
-import brewman.schemas.recipe_template as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.recipe_template import RecipeTemplate
+from ..schemas import recipe_template as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/balance_sheet.py b/brewman/brewman/routers/reports/balance_sheet.py
index e5a5950b..411deefb 100644
--- a/brewman/brewman/routers/reports/balance_sheet.py
+++ b/brewman/brewman/routers/reports/balance_sheet.py
@@ -6,8 +6,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import desc, func, select
 
-import brewman.schemas.balance_sheet as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -18,6 +16,7 @@ from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
 from ...routers.reports.closing_stock import get_closing_stock
 from ...routers.reports.profit_loss import get_accumulated_profit
+from ...schemas import balance_sheet as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/cash_flow.py b/brewman/brewman/routers/reports/cash_flow.py
index 54532a29..a4add3de 100644
--- a/brewman/brewman/routers/reports/cash_flow.py
+++ b/brewman/brewman/routers/reports/cash_flow.py
@@ -6,8 +6,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import desc, func, select
 
-import brewman.schemas.cash_flow as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -16,6 +14,7 @@ from ...models.account_type import AccountType
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import cash_flow as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/closing_stock.py b/brewman/brewman/routers/reports/closing_stock.py
index 411b17c8..5b670cb0 100644
--- a/brewman/brewman/routers/reports/closing_stock.py
+++ b/brewman/brewman/routers/reports/closing_stock.py
@@ -9,11 +9,6 @@ from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session, contains_eager
 from sqlalchemy.sql.expression import delete, distinct, func, or_, select, update
 
-import brewman.schemas.closing_stock as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_date, set_period
 from ...db.session import SessionFuture
@@ -25,10 +20,13 @@ from ...models.inventory import Inventory
 from ...models.journal import Journal
 from ...models.product import Product
 from ...models.product_group import ProductGroup
+from ...models.product_version import ProductVersion
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.validations import check_journals_are_valid
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import closing_stock as schemas
 from ...schemas.user import UserToken
 from .. import get_lock_info
 
diff --git a/brewman/brewman/routers/reports/daybook.py b/brewman/brewman/routers/reports/daybook.py
index cbda94e1..c53a6d1f 100644
--- a/brewman/brewman/routers/reports/daybook.py
+++ b/brewman/brewman/routers/reports/daybook.py
@@ -5,14 +5,13 @@ from fastapi import APIRouter, Request, Security
 from sqlalchemy import not_, select
 from sqlalchemy.orm import Session
 
-import brewman.schemas.daybook as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import daybook as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/entries.py b/brewman/brewman/routers/reports/entries.py
index 4265ebca..cc1089f9 100644
--- a/brewman/brewman/routers/reports/entries.py
+++ b/brewman/brewman/routers/reports/entries.py
@@ -7,13 +7,12 @@ from sqlalchemy import desc, not_, or_, select
 from sqlalchemy.orm import Session, contains_eager
 from sqlalchemy.sql.functions import count
 
-import brewman.schemas.entries as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...db.session import SessionFuture
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import entries as schemas
 from ...schemas.user import UserToken
 from ...schemas.user_link import UserLink
 from . import report_finish_date, report_start_date
diff --git a/brewman/brewman/routers/reports/ledger.py b/brewman/brewman/routers/reports/ledger.py
index e155dcc8..4f7bbf38 100644
--- a/brewman/brewman/routers/reports/ledger.py
+++ b/brewman/brewman/routers/reports/ledger.py
@@ -8,8 +8,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import func, select
 
-import brewman.schemas.ledger as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -17,6 +15,7 @@ from ...models.account_base import AccountBase
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import ledger as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/mozimo_daily_register.py b/brewman/brewman/routers/reports/mozimo_daily_register.py
index c86de0da..1ef64377 100644
--- a/brewman/brewman/routers/reports/mozimo_daily_register.py
+++ b/brewman/brewman/routers/reports/mozimo_daily_register.py
@@ -9,17 +9,15 @@ from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import select
 
-import brewman.schemas.mozimo_daily_register as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_date, set_date
 from ...db.session import SessionFuture
 from ...models.mozimo_stock_register import MozimoStockRegister
 from ...models.product import Product
+from ...models.product_version import ProductVersion
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
+from ...schemas import mozimo_daily_register as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/mozimo_product_register.py b/brewman/brewman/routers/reports/mozimo_product_register.py
index b100b9e0..2dbe203b 100644
--- a/brewman/brewman/routers/reports/mozimo_product_register.py
+++ b/brewman/brewman/routers/reports/mozimo_product_register.py
@@ -8,13 +8,12 @@ from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import select
 
-import brewman.schemas.mozimo_product_register as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
 from ...models.mozimo_stock_register import MozimoStockRegister
 from ...models.stock_keeping_unit import StockKeepingUnit
+from ...schemas import mozimo_product_register as schemas
 from ...schemas.user import UserToken
 from ..attendance import date_range
 from .mozimo_daily_register import opening_balance
diff --git a/brewman/brewman/routers/reports/mozimo_sale_upload.py b/brewman/brewman/routers/reports/mozimo_sale_upload.py
index d5d6fd6c..e6386cb0 100644
--- a/brewman/brewman/routers/reports/mozimo_sale_upload.py
+++ b/brewman/brewman/routers/reports/mozimo_sale_upload.py
@@ -11,12 +11,11 @@ from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.fingerprint as schemas
-
 from ...core.security import get_user
 from ...db.session import SessionFuture
 from ...models.employee import Employee
 from ...models.fingerprint import Fingerprint
+from ...schemas import fingerprint as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/net_transactions.py b/brewman/brewman/routers/reports/net_transactions.py
index e4c1d24c..f2b790e3 100644
--- a/brewman/brewman/routers/reports/net_transactions.py
+++ b/brewman/brewman/routers/reports/net_transactions.py
@@ -5,8 +5,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import desc, func, select
 
-import brewman.schemas.net_transactions as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -14,6 +12,7 @@ from ...models.account_base import AccountBase
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import net_transactions as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/non_contract_purchase.py b/brewman/brewman/routers/reports/non_contract_purchase.py
index f06e02aa..40dd8daf 100644
--- a/brewman/brewman/routers/reports/non_contract_purchase.py
+++ b/brewman/brewman/routers/reports/non_contract_purchase.py
@@ -2,21 +2,20 @@ from fastapi import APIRouter, Security
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session, contains_eager, joinedload
 
-import brewman.schemas.non_contract_purchase as schemas
-
-from brewman.core.security import get_current_active_user as get_user
-from brewman.db.session import SessionFuture
-from brewman.models.batch import Batch
-from brewman.models.inventory import Inventory
-from brewman.models.journal import Journal
-from brewman.models.product import Product
-from brewman.models.product_version import ProductVersion
-from brewman.models.rate_contract import RateContract
-from brewman.models.sku_version import SkuVersion
-from brewman.models.stock_keeping_unit import StockKeepingUnit
-from brewman.models.voucher import Voucher
-from brewman.models.voucher_type import VoucherType
-from brewman.schemas.user import UserToken
+from ...core.security import get_current_active_user as get_user
+from ...db.session import SessionFuture
+from ...models.batch import Batch
+from ...models.inventory import Inventory
+from ...models.journal import Journal
+from ...models.product import Product
+from ...models.product_version import ProductVersion
+from ...models.rate_contract import RateContract
+from ...models.sku_version import SkuVersion
+from ...models.stock_keeping_unit import StockKeepingUnit
+from ...models.voucher import Voucher
+from ...models.voucher_type import VoucherType
+from ...schemas import non_contract_purchase as schemas
+from ...schemas.user import UserToken
 
 
 router = APIRouter()
diff --git a/brewman/brewman/routers/reports/product_ledger.py b/brewman/brewman/routers/reports/product_ledger.py
index 165e92d3..799364ff 100644
--- a/brewman/brewman/routers/reports/product_ledger.py
+++ b/brewman/brewman/routers/reports/product_ledger.py
@@ -8,10 +8,6 @@ from sqlalchemy import and_, or_
 from sqlalchemy.orm import Session, contains_eager
 from sqlalchemy.sql.expression import func, select
 
-import brewman.schemas.product_ledger as schemas
-
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -20,9 +16,11 @@ from ...models.cost_centre import CostCentre
 from ...models.inventory import Inventory
 from ...models.journal import Journal
 from ...models.product import Product
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import product_ledger as schemas
 from ...schemas.user import UserToken
 
 
@@ -197,8 +195,8 @@ def opening_balance(
         .group_by(SkuVersion.units)
     ).all()
 
-    quantity: Decimal = sum(r.quantity for r in row)
-    amount: Decimal = sum(r.amount for r in row)
+    quantity: Decimal = sum((r.quantity for r in row), start=Decimal(0))
+    amount: Decimal = sum((r.amount for r in row), start=Decimal(0))
 
     return (
         quantity,
diff --git a/brewman/brewman/routers/reports/profit_loss.py b/brewman/brewman/routers/reports/profit_loss.py
index cee97ff3..4b501e4a 100644
--- a/brewman/brewman/routers/reports/profit_loss.py
+++ b/brewman/brewman/routers/reports/profit_loss.py
@@ -6,8 +6,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import desc, func, select
 
-import brewman.schemas.profit_loss as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -17,6 +15,7 @@ from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
 from ...routers.reports.closing_stock import get_closing_stock, get_opening_stock
+from ...schemas import profit_loss as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/purchase_entries.py b/brewman/brewman/routers/reports/purchase_entries.py
index 86da643c..8d9fa7b2 100644
--- a/brewman/brewman/routers/reports/purchase_entries.py
+++ b/brewman/brewman/routers/reports/purchase_entries.py
@@ -4,20 +4,18 @@ from fastapi import APIRouter, Request, Security
 from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session, contains_eager
 
-import brewman.schemas.purchase_entries as schemas
-
-from brewman.models.product import Product
-from brewman.models.product_version import ProductVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
 from ...models.batch import Batch
 from ...models.inventory import Inventory
 from ...models.journal import Journal
+from ...models.product import Product
+from ...models.product_version import ProductVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import purchase_entries as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/purchases.py b/brewman/brewman/routers/reports/purchases.py
index e3936341..2ce83703 100644
--- a/brewman/brewman/routers/reports/purchases.py
+++ b/brewman/brewman/routers/reports/purchases.py
@@ -6,11 +6,6 @@ from sqlalchemy import and_, not_, or_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import desc, func, select
 
-import brewman.schemas.purchases as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -19,9 +14,12 @@ from ...models.cost_centre import CostCentre
 from ...models.inventory import Inventory
 from ...models.journal import Journal
 from ...models.product import Product
+from ...models.product_version import ProductVersion
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import purchases as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/raw_material_cost.py b/brewman/brewman/routers/reports/raw_material_cost.py
index 55e7b743..e752c90e 100644
--- a/brewman/brewman/routers/reports/raw_material_cost.py
+++ b/brewman/brewman/routers/reports/raw_material_cost.py
@@ -8,11 +8,6 @@ from sqlalchemy import and_, or_
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.expression import case, func, select
 
-import brewman.schemas.raw_material_cost as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -23,9 +18,12 @@ from ...models.inventory import Inventory
 from ...models.journal import Journal
 from ...models.product import Product
 from ...models.product_group import ProductGroup
+from ...models.product_version import ProductVersion
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import raw_material_cost as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/reconcile.py b/brewman/brewman/routers/reports/reconcile.py
index ac3443e3..4740dd34 100644
--- a/brewman/brewman/routers/reports/reconcile.py
+++ b/brewman/brewman/routers/reports/reconcile.py
@@ -8,8 +8,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session, joinedload
 from sqlalchemy.sql.expression import and_, func, or_, select
 
-import brewman.schemas.reconcile as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -17,6 +15,7 @@ from ...models.account_base import AccountBase
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import reconcile as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/stock_movement.py b/brewman/brewman/routers/reports/stock_movement.py
index 47fb54aa..21070c69 100644
--- a/brewman/brewman/routers/reports/stock_movement.py
+++ b/brewman/brewman/routers/reports/stock_movement.py
@@ -6,11 +6,6 @@ from sqlalchemy import and_, not_, or_
 from sqlalchemy.orm import Session, contains_eager
 from sqlalchemy.sql.expression import func, select
 
-import brewman.schemas.stock_movement as schemas
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -20,9 +15,12 @@ from ...models.inventory import Inventory
 from ...models.journal import Journal
 from ...models.product import Product
 from ...models.product_group import ProductGroup
+from ...models.product_version import ProductVersion
+from ...models.sku_version import SkuVersion
 from ...models.stock_keeping_unit import StockKeepingUnit
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import stock_movement as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/reports/trial_balance.py b/brewman/brewman/routers/reports/trial_balance.py
index 1b792cf6..74b269d9 100644
--- a/brewman/brewman/routers/reports/trial_balance.py
+++ b/brewman/brewman/routers/reports/trial_balance.py
@@ -5,8 +5,6 @@ from sqlalchemy import not_
 from sqlalchemy.orm import Session, contains_eager, joinedload
 from sqlalchemy.sql.expression import func, select
 
-import brewman.schemas.trial_balance as schemas
-
 from ...core.security import get_current_active_user as get_user
 from ...core.session import get_finish_date, get_start_date, set_period
 from ...db.session import SessionFuture
@@ -15,6 +13,7 @@ from ...models.account_type import AccountType
 from ...models.journal import Journal
 from ...models.voucher import Voucher
 from ...models.voucher_type import VoucherType
+from ...schemas import trial_balance as schemas
 from ...schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/role.py b/brewman/brewman/routers/role.py
index 8a00070a..9e23fe50 100644
--- a/brewman/brewman/routers/role.py
+++ b/brewman/brewman/routers/role.py
@@ -8,14 +8,13 @@ from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 from sqlalchemy.sql.functions import count
 
-import brewman.schemas.role as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.permission import Permission
 from ..models.role import Role
 from ..models.role_permission import RolePermission
 from ..models.user_role import UserRole
+from ..schemas import role as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/tag.py b/brewman/brewman/routers/tag.py
index 2f07afa0..58af9cec 100644
--- a/brewman/brewman/routers/tag.py
+++ b/brewman/brewman/routers/tag.py
@@ -6,15 +6,13 @@ from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.tag as schemas
-
-from brewman.models.recipe_tag import RecipeTag
-from brewman.models.voucher import Voucher
-from brewman.models.voucher_tag import VoucherTag
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
+from ..models.recipe_tag import RecipeTag
 from ..models.tag import Tag
+from ..models.voucher import Voucher
+from ..models.voucher_tag import VoucherTag
+from ..schemas import tag as schemas
 from ..schemas.tag_vouchers import TagVouchers
 from ..schemas.user import UserToken
 
diff --git a/brewman/brewman/routers/user.py b/brewman/brewman/routers/user.py
index 3654cac9..ec227f26 100644
--- a/brewman/brewman/routers/user.py
+++ b/brewman/brewman/routers/user.py
@@ -7,8 +7,6 @@ from sqlalchemy import delete, select, update
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.user as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..db.session import SessionFuture
 from ..models.attendance import Attendance
@@ -17,6 +15,7 @@ from ..models.role import Role
 from ..models.user import User
 from ..models.user_role import UserRole
 from ..models.voucher import Voucher
+from ..schemas import user as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/routers/voucher.py b/brewman/brewman/routers/voucher.py
index e0ed1ed5..8b9948e0 100644
--- a/brewman/brewman/routers/voucher.py
+++ b/brewman/brewman/routers/voucher.py
@@ -9,11 +9,6 @@ from sqlalchemy import and_, distinct, func, or_, select
 from sqlalchemy.exc import SQLAlchemyError
 from sqlalchemy.orm import Session
 
-import brewman.schemas.voucher as output
-
-from brewman.models.product_version import ProductVersion
-from brewman.models.sku_version import SkuVersion
-
 from ..core.security import get_current_active_user as get_user
 from ..core.session import get_first_day
 from ..db.session import SessionFuture
@@ -26,9 +21,12 @@ from ..models.db_image import DbImage
 from ..models.employee import Employee
 from ..models.inventory import Inventory
 from ..models.journal import Journal
+from ..models.product_version import ProductVersion
+from ..models.sku_version import SkuVersion
 from ..models.voucher import Voucher
 from ..models.voucher_type import VoucherType
 from ..routers import get_lock_info
+from ..schemas import voucher as output
 from ..schemas.blank_voucher_info import BlankVoucherInfo
 from ..schemas.user import UserToken
 
diff --git a/brewman/brewman/routers/voucher_types.py b/brewman/brewman/routers/voucher_types.py
index 7ac70e2d..c862354b 100644
--- a/brewman/brewman/routers/voucher_types.py
+++ b/brewman/brewman/routers/voucher_types.py
@@ -1,9 +1,8 @@
 from fastapi import APIRouter, Depends
 
-import brewman.schemas.account_type as schemas
-
 from ..core.security import get_current_active_user as get_user
 from ..models.voucher_type import VoucherType
+from ..schemas import account_type as schemas
 from ..schemas.user import UserToken
 
 
diff --git a/brewman/brewman/schemas/account_type.py b/brewman/brewman/schemas/account_type.py
index 65fbe528..feb8e21f 100644
--- a/brewman/brewman/schemas/account_type.py
+++ b/brewman/brewman/schemas/account_type.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class AccountType(BaseModel):
diff --git a/brewman/brewman/schemas/attendance.py b/brewman/brewman/schemas/attendance.py
index 9e5cb11d..86deb026 100644
--- a/brewman/brewman/schemas/attendance.py
+++ b/brewman/brewman/schemas/attendance.py
@@ -10,8 +10,8 @@ from pydantic import (
     field_validator,
 )
 
-from brewman.schemas import to_camel
-from brewman.schemas.attendance_type import AttendanceType
+from . import to_camel
+from .attendance_type import AttendanceType
 
 
 class AttendanceItem(BaseModel):
diff --git a/brewman/brewman/schemas/attendance_type.py b/brewman/brewman/schemas/attendance_type.py
index c37d3eef..f19bf7aa 100644
--- a/brewman/brewman/schemas/attendance_type.py
+++ b/brewman/brewman/schemas/attendance_type.py
@@ -1,6 +1,6 @@
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/batch.py b/brewman/brewman/schemas/batch.py
index 4dd87436..d39aa922 100644
--- a/brewman/brewman/schemas/batch.py
+++ b/brewman/brewman/schemas/batch.py
@@ -2,8 +2,8 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
-from brewman.schemas.product import ProductLink
+from . import to_camel
+from .product import ProductLink
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/employee_attendance.py b/brewman/brewman/schemas/employee_attendance.py
index 657262ff..ab6bcdac 100644
--- a/brewman/brewman/schemas/employee_attendance.py
+++ b/brewman/brewman/schemas/employee_attendance.py
@@ -8,9 +8,9 @@ from pydantic import (
     field_validator,
 )
 
-from brewman.schemas import to_camel
-from brewman.schemas.account import AccountLink
-from brewman.schemas.attendance_type import AttendanceType
+from . import to_camel
+from .account import AccountLink
+from .attendance_type import AttendanceType
 
 
 class EmployeeAttendanceItem(BaseModel):
diff --git a/brewman/brewman/schemas/employee_benefit.py b/brewman/brewman/schemas/employee_benefit.py
index 3551b6c1..b7352eb4 100644
--- a/brewman/brewman/schemas/employee_benefit.py
+++ b/brewman/brewman/schemas/employee_benefit.py
@@ -2,8 +2,8 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
-from brewman.schemas.employee import EmployeeLink
+from . import to_camel
+from .employee import EmployeeLink
 
 
 class EmployeeBenefit(BaseModel):
diff --git a/brewman/brewman/schemas/fingerprint.py b/brewman/brewman/schemas/fingerprint.py
index 0602472c..1af2d1f8 100644
--- a/brewman/brewman/schemas/fingerprint.py
+++ b/brewman/brewman/schemas/fingerprint.py
@@ -10,7 +10,7 @@ from pydantic import (
     field_validator,
 )
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class Fingerprint(BaseModel):
diff --git a/brewman/brewman/schemas/image_upload.py b/brewman/brewman/schemas/image_upload.py
index d082fde5..765d68df 100644
--- a/brewman/brewman/schemas/image_upload.py
+++ b/brewman/brewman/schemas/image_upload.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class ImageUpload(BaseModel):
diff --git a/brewman/brewman/schemas/incentive.py b/brewman/brewman/schemas/incentive.py
index 660aaa86..069d42bb 100644
--- a/brewman/brewman/schemas/incentive.py
+++ b/brewman/brewman/schemas/incentive.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/inventory.py b/brewman/brewman/schemas/inventory.py
index 4bafd393..b64d5921 100644
--- a/brewman/brewman/schemas/inventory.py
+++ b/brewman/brewman/schemas/inventory.py
@@ -2,8 +2,8 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
-from brewman.schemas.batch import Batch
+from . import to_camel
+from .batch import Batch
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/issue_grid_item.py b/brewman/brewman/schemas/issue_grid_item.py
index e6fcd46b..41b6d046 100644
--- a/brewman/brewman/schemas/issue_grid_item.py
+++ b/brewman/brewman/schemas/issue_grid_item.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/journal.py b/brewman/brewman/schemas/journal.py
index b0cd20ed..4147c25c 100644
--- a/brewman/brewman/schemas/journal.py
+++ b/brewman/brewman/schemas/journal.py
@@ -2,9 +2,9 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
-from brewman.schemas.account import AccountLink
-from brewman.schemas.cost_centre import CostCentreLink
+from . import to_camel
+from .account import AccountLink
+from .cost_centre import CostCentreLink
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/permission.py b/brewman/brewman/schemas/permission.py
index b24a493e..e89997cf 100644
--- a/brewman/brewman/schemas/permission.py
+++ b/brewman/brewman/schemas/permission.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class PermissionItem(BaseModel):
diff --git a/brewman/brewman/schemas/product_sku.py b/brewman/brewman/schemas/product_sku.py
index 16da3916..6f54c256 100644
--- a/brewman/brewman/schemas/product_sku.py
+++ b/brewman/brewman/schemas/product_sku.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/rate_contract_item.py b/brewman/brewman/schemas/rate_contract_item.py
index 7d6e50ae..2f9e3a99 100644
--- a/brewman/brewman/schemas/rate_contract_item.py
+++ b/brewman/brewman/schemas/rate_contract_item.py
@@ -2,8 +2,8 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
-from brewman.schemas.product import ProductLink
+from . import to_camel
+from .product import ProductLink
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/recipe_item.py b/brewman/brewman/schemas/recipe_item.py
index 600ee42a..3ecece50 100644
--- a/brewman/brewman/schemas/recipe_item.py
+++ b/brewman/brewman/schemas/recipe_item.py
@@ -2,8 +2,8 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
-from brewman.schemas.product import ProductLink
+from . import to_camel
+from .product import ProductLink
 
 from . import Daf
 
diff --git a/brewman/brewman/schemas/role.py b/brewman/brewman/schemas/role.py
index d9205893..aae247a0 100644
--- a/brewman/brewman/schemas/role.py
+++ b/brewman/brewman/schemas/role.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 from .permission import PermissionItem
 
diff --git a/brewman/brewman/schemas/tag.py b/brewman/brewman/schemas/tag.py
index 9b9acbb2..5b1c34ad 100644
--- a/brewman/brewman/schemas/tag.py
+++ b/brewman/brewman/schemas/tag.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class Tag(BaseModel):
diff --git a/brewman/brewman/schemas/tag_vouchers.py b/brewman/brewman/schemas/tag_vouchers.py
index 75a3e373..c7a55c60 100644
--- a/brewman/brewman/schemas/tag_vouchers.py
+++ b/brewman/brewman/schemas/tag_vouchers.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class TagVouchersItem(BaseModel):
diff --git a/brewman/brewman/schemas/user_link.py b/brewman/brewman/schemas/user_link.py
index 91d44526..8d4dc7ec 100644
--- a/brewman/brewman/schemas/user_link.py
+++ b/brewman/brewman/schemas/user_link.py
@@ -2,7 +2,7 @@ import uuid
 
 from pydantic import BaseModel, ConfigDict
 
-from brewman.schemas import to_camel
+from . import to_camel
 
 
 class UserLink(BaseModel):
diff --git a/brewman/brewman/tests/model.py b/brewman/brewman/tests/model.py
index e5400985..5ed0aa2f 100644
--- a/brewman/brewman/tests/model.py
+++ b/brewman/brewman/tests/model.py
@@ -14,7 +14,7 @@ sys.path.insert(0, str(PROJECT_ROOT))
 
 try:
     # Adjust the import to match where your models are
-    from brewman.db import base  # e.g., from app import models  # noqa: F401
+    from ..db import base  # e.g., from app import models  # noqa: F401
 
     print("✅ All models imported successfully.")
 except Exception as e: