From 292e296f01693ab91c55ac6e8d89671bffdcc7e4 Mon Sep 17 00:00:00 2001
From: Bernhard Radermacher <bernhard.radermacher@netlink-consulting.com>
Date: Mon, 1 Sep 2025 11:36:22 +0000
Subject: [PATCH] wip

---
 .idea/runConfigurations/sandboxapi.xml |   4 +-
 app/alchemy/base.plantuml              |  26 +++++
 app/alchemy/contact.plantuml           |  27 +++++
 app/alchemy/contact.puml               |  25 +++++
 app/alchemy/contact.py                 |   2 +-
 app/alchemy/location.plantuml          |  72 +++++++++++++
 app/alchemy/location.puml              |  66 ++++++++++++
 app/alchemy/location.svg               |   1 +
 app/alchemy/status.plantuml            |  20 ++++
 app/alchemy/status.puml                |   9 ++
 app/alchemy/user.plantuml              |  31 ++++++
 app/alchemy/user.puml                  |  25 +++++
 app/alchemy/user.py                    |  12 +--
 app/dependencies/engine.py             |   2 +-
 app/routers/contact.py                 |  94 +++++++----------
 app/routers/country.py                 | 125 -----------------------
 app/routers/location.py                |  71 +------------
 app/routers/location_code.py           | 134 -------------------------
 app/routers/models/__init__.py         |   5 +
 app/routers/models/contact.py          |  23 +++++
 app/routers/models/location.py         |  66 ++++++++++++
 app/routers/models/status.py           |   6 ++
 app/routers/status.py                  |   2 +-
 app/routers/status_model.py            |   6 --
 app/routers/user.py                    |   2 +-
 app/utils/__init__.py                  |  15 +--
 26 files changed, 461 insertions(+), 410 deletions(-)
 create mode 100644 app/alchemy/base.plantuml
 create mode 100644 app/alchemy/contact.plantuml
 create mode 100644 app/alchemy/contact.puml
 create mode 100644 app/alchemy/location.plantuml
 create mode 100644 app/alchemy/location.puml
 create mode 100644 app/alchemy/location.svg
 create mode 100644 app/alchemy/status.plantuml
 create mode 100644 app/alchemy/status.puml
 create mode 100644 app/alchemy/user.plantuml
 create mode 100644 app/alchemy/user.puml
 delete mode 100644 app/routers/country.py
 delete mode 100644 app/routers/location_code.py
 create mode 100644 app/routers/models/__init__.py
 create mode 100644 app/routers/models/contact.py
 create mode 100644 app/routers/models/location.py
 create mode 100644 app/routers/models/status.py
 delete mode 100644 app/routers/status_model.py

diff --git a/.idea/runConfigurations/sandboxapi.xml b/.idea/runConfigurations/sandboxapi.xml
index b98eafb..55a7670 100644
--- a/.idea/runConfigurations/sandboxapi.xml
+++ b/.idea/runConfigurations/sandboxapi.xml
@@ -2,12 +2,12 @@
   <configuration default="false" name="sandboxapi" type="Python.FastAPI">
     <option name="additionalOptions" value="--reload --host 0.0.0.0 --port 1234" />
     <option name="file" value="$PROJECT_DIR$/app/main.py" />
-    <module name="sandboxapi" />
+    <module name="vpsx-fast" />
     <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/bin/python" />
-    <option name="SDK_NAME" value="uv (sandboxapi)" />
+    <option name="SDK_NAME" value="uv (vpsx-fast)" />
     <option name="WORKING_DIRECTORY" value="" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/app/alchemy/base.plantuml b/app/alchemy/base.plantuml
new file mode 100644
index 0000000..8f39b6d
--- /dev/null
+++ b/app/alchemy/base.plantuml
@@ -0,0 +1,26 @@
+@startuml
+
+
+top to bottom direction
+skinparam linetype ortho
+
+abstract Base {
+    id\t\t\t\tInteger\t\t<<Primary>>  {field}
+  # __tablename__\tto_snake_case(__name__)    {field}
+}
+'abstract DeclarativeBase {
+'  + registry
+'  + metadata
+'  # __name__
+'  # __mapper__
+'  # __table__
+'  # __tablename__
+'  # __mapper_args__
+'  # __table_args__
+'  - _sa_registry
+'  - _sa_inspect_type()
+'  - _sa_inspect_instance()
+'}
+'
+'DeclarativeBase <|-- Base
+@enduml
diff --git a/app/alchemy/contact.plantuml b/app/alchemy/contact.plantuml
new file mode 100644
index 0000000..dd9b727
--- /dev/null
+++ b/app/alchemy/contact.plantuml
@@ -0,0 +1,27 @@
+@startuml
+
+'!include base.plantuml
+!include status.plantuml
+!include user.plantuml
+
+skinparam linetype polyline
+
+
+class Contact {
+  {field}  + code\tString(80)\t<<Unique>>
+  {field}  + address\tString(255) | None
+  {field}  + notes\tText | None
+}
+
+abstract ContactForeignKey {
+    contact_id\tContact.id {field}
+  + contact\t\tContact      {field}
+}
+
+
+'Base              <|--Contact
+StatusForeignKey  <|-[#blue]- Contact
+Versioned         <|-[#blue]- Contact
+Contact *-- ContactForeignKey
+
+@enduml
diff --git a/app/alchemy/contact.puml b/app/alchemy/contact.puml
new file mode 100644
index 0000000..9d6cc66
--- /dev/null
+++ b/app/alchemy/contact.puml
@@ -0,0 +1,25 @@
+@startuml
+
+'!include base.plantuml
+!include status.puml
+!include user.puml
+
+skinparam linetype polyline
+
+entity contact {
+  * id\t\t\tint
+  --
+  * code\t\tvarchar(80)\t<<UK>>
+    address\t\tvarchar(255)
+    notes\t\ttext
+    status_id\t\tvarchar(3)\t<<FK>>
+  * _created__\tdatetime
+    _updated__\tdatetime
+    _user__id\t\tint\t\t\t<<FK>>
+}
+
+status --{ contact : status_id
+user   ..{ contact : _user__id
+
+
+@enduml
diff --git a/app/alchemy/contact.py b/app/alchemy/contact.py
index f49354d..7ab7e29 100644
--- a/app/alchemy/contact.py
+++ b/app/alchemy/contact.py
@@ -13,7 +13,7 @@ class Contact(StatusForeignKey, Versioned, Base):
     """Contact"""
 
     code: Mapped[str] = mapped_column(String(80), unique=True)
-    address: Mapped[str | None] = mapped_column(String(253))
+    address: Mapped[str | None] = mapped_column(String(255))
     notes: Mapped[str | None] = mapped_column(Text)
 
 
diff --git a/app/alchemy/location.plantuml b/app/alchemy/location.plantuml
new file mode 100644
index 0000000..815b826
--- /dev/null
+++ b/app/alchemy/location.plantuml
@@ -0,0 +1,72 @@
+@startuml
+
+'!include base.plantuml
+!include status.plantuml
+!include contact.plantuml
+
+skinparam linetype polyline
+
+
+class Country {
+  {field}  + code\t\tString(2)\t\t<<Unique>>
+  {field}  + name\t\tString(80)
+  {field}  + notes\t\tText | None
+           +  __repr__()\t\tstr
+}
+
+abstract CountryForeignKey {
+     country_id\tCountry.id     {field}
+   + country\t\tCountry         {field}
+}
+
+
+class LocationCode {
+  {field}  + code\t\tString(8)\t\t<<Unique>>
+  {field}  + description\tString(80)
+  {field}  + notes\t\tText | None
+           +  __repr__()\t\tstr
+}
+
+abstract LocationCodeForeignKey {
+    location_code_id\tLocationCode.id
+  + location_code\t\tLocationCode
+}
+
+
+class Location {
+  {field}  + code\t\tString(30)
+  {field}  + description\tString(80)
+  {field}  + notes\t\tText | None
+  {field}    <<Unique>>\n\tlocation_code_id\n\tcode
+           +  __repr__()\t\tstr
+}
+
+abstract LocationForeignKey {
+    location_id\tLocation.id
+  + location\t\tLocation
+}
+
+
+
+
+
+
+Versioned         <|-[#blue]-  Country
+StatusForeignKey  <|-[#blue]-  Country
+Country           *--          CountryForeignKey
+
+
+Versioned         <|-[#blue]-  LocationCode
+StatusForeignKey  <|-[#blue]-  LocationCode
+LocationCode      *--          LocationCodeForeignKey
+CountryForeignKey <|-[#blue]-  LocationCode
+ContactForeignKey o..          LocationCode
+
+
+Versioned         <|-[#blue]-  Location
+StatusForeignKey  <|-[#blue]-  Location
+Location          *--          LocationForeignKey
+LocationCodeForeignKey <|-[#blue]-  Location
+ContactForeignKey o..          Location
+
+@enduml
diff --git a/app/alchemy/location.puml b/app/alchemy/location.puml
new file mode 100644
index 0000000..97069a3
--- /dev/null
+++ b/app/alchemy/location.puml
@@ -0,0 +1,66 @@
+@startuml
+
+'!include base.plantuml
+!include status.puml
+!include contact.puml
+
+skinparam linetype polyline
+
+
+entity country {
+  * id\t\t\tint
+  --
+  * code\t\tvarchar(2)\t<<UK>>
+    name\t\tvarchar(80)
+    notes\t\ttext
+    status_id\t\tvarchar(3)\t<<FK>>
+  * _created__\tdatetime
+    _updated__\tdatetime
+    _user__id\t\tint\t\t\t<<FK>>
+}
+
+
+
+entity location_code {
+  * id\t\t\tint
+  --
+  * code\t\tvarchar(8)\t<<UK>>
+    description\tvarchar(80)
+    notes\t\ttext
+  * country_id\tint\t\t\t<<FK>>
+    contact_id\tint\t\t\t<<FK>>
+    status_id\t\tvarchar(3)\t<<FK>>
+  * _created__\tdatetime
+    _updated__\tdatetime
+    _user__id\t\tint\t\t\t<<FK>>
+}
+
+
+entity location {
+  * id\t\t\t\tint
+  .. <<UK>> ..
+  * location_code_id\tint\t\t\t<<FK>>
+  * code\t\t\tvarchar(30)
+  --
+    description\t\tvarchar(80)
+    notes\t\t\ttext
+    contact_id\tint\t\t\t<<FK>>
+    status_id\t\t\tvarchar(3)\t<<FK>>
+  * _created__\t\tdatetime
+    _updated__\t\tdatetime
+    _user__id\t\t\tint\t\t\t<<FK>>
+}
+
+contact       ..{ location      : contact_id
+contact       ..{ location_code : contact_id
+country       --{ location_code : country_id
+location_code --{ location      : location_code_id
+status        --{ country       : status_id
+status        --{ location      : status_id
+status        --{ location_code : status_id
+user          ..{ country       : _user__id
+user          ..{ location      : _user__id
+user          ..{ location_code : _user__id
+
+
+@enduml
diff --git a/app/alchemy/location.svg b/app/alchemy/location.svg
new file mode 100644
index 0000000..2da2e66
--- /dev/null
+++ b/app/alchemy/location.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" data-diagram-type="CLASS" height="1260px" preserveAspectRatio="none" style="width:892px;height:1260px;background:#FFFFFF;" version="1.1" viewBox="0 0 892 1260" width="892px" zoomAndPan="magnify"><defs/><g><!--class status--><g class="entity" data-entity="status" data-source-line="2" data-uid="ent0002" id="entity_status"><rect fill="#F1F1F1" height="81.8858" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="218.1191" x="222" y="7"/><ellipse cx="306.3866" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M302.5898,30 L302.5898,17.0625 L310.2616,17.0625 L310.2616,18.9844 L304.6366,18.9844 L304.6366,22.2969 L309.6679,22.2969 L309.6679,24.1875 L304.6366,24.1875 L304.6366,28.0781 L310.2616,28.0781 L310.2616,30 L302.5898,30 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40.8459" x="326.8866" y="28.0908">status</text><line style="stroke:#181818;stroke-width:0.5;" x1="223" x2="439.1191" y1="39" y2="39"/><ellipse cx="233" cy="52.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="242" y="56.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="304.999" y="56.5623">varchar(3)</text><line style="stroke:#181818;stroke-width:1;" x1="223" x2="439.1191" y1="63.9429" y2="63.9429"/><ellipse cx="233" cy="77.9143" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36.4113" x="242" y="81.5051">name</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.8935" x="304.999" y="81.5051">varchar(30)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="399.4976" y="81.5051">&#171;UK&#187;</text></g><!--class user--><g class="entity" data-entity="user" data-source-line="7" data-uid="ent0003" id="entity_user"><rect fill="#F1F1F1" height="217.4289" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249.6186" x="422" y="166"/><ellipse cx="528.1519" cy="182" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M524.355,189 L524.355,176.0625 L532.0269,176.0625 L532.0269,177.9844 L526.4019,177.9844 L526.4019,181.2969 L531.4331,181.2969 L531.4331,183.1875 L526.4019,183.1875 L526.4019,187.0781 L532.0269,187.0781 L532.0269,189 L524.355,189 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="28.8148" x="548.6519" y="187.0908">user</text><line style="stroke:#181818;stroke-width:0.5;" x1="423" x2="670.6186" y1="198" y2="198"/><ellipse cx="433" cy="211.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="442" y="215.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="536.4985" y="215.5623">int</text><line style="stroke:#181818;stroke-width:1;" x1="423" x2="670.6186" y1="222.9429" y2="222.9429"/><ellipse cx="433" cy="236.9143" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33.0108" x="442" y="240.5051">code</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85.7286" x="536.4985" y="240.5051">varchar(255)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="630.9971" y="240.5051">&#171;UK&#187;</text><ellipse cx="433" cy="253.8572" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36.4113" x="442" y="257.448">name</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85.7286" x="536.4985" y="257.448">varchar(255)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="64.6892" x="442" y="274.3909">password</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85.7286" x="536.4985" y="274.3909">varchar(255)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="71.1721" x="442" y="291.3338">ldap_name</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85.7286" x="536.4985" y="291.3338">varchar(255)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37.1073" x="442" y="308.2767">notes</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25.8916" x="536.4985" y="308.2767">text</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.1808" x="442" y="325.2196">status_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="536.4985" y="325.2196">varchar(3)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="630.9971" y="325.2196">&#171;FK&#187;</text><ellipse cx="433" cy="338.5716" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.9789" x="442" y="342.1625">_created__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="536.4985" y="342.1625">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74.155" x="442" y="359.1054">_updated__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="536.4985" y="359.1054">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.7973" x="442" y="376.0482">_user__id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="536.4985" y="376.0482">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="630.9971" y="376.0482">&#171;FK&#187;</text></g><!--class contact--><g class="entity" data-entity="contact" data-source-line="8" data-uid="ent0006" id="entity_contact"><rect fill="#F1F1F1" height="183.5431" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249.6186" x="309" y="460"/><ellipse cx="404.4333" cy="476" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M400.6365,483 L400.6365,470.0625 L408.3083,470.0625 L408.3083,471.9844 L402.6833,471.9844 L402.6833,475.2969 L407.7146,475.2969 L407.7146,477.1875 L402.6833,477.1875 L402.6833,481.0781 L408.3083,481.0781 L408.3083,483 L400.6365,483 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50.252" x="424.9333" y="481.0908">contact</text><line style="stroke:#181818;stroke-width:0.5;" x1="310" x2="557.6186" y1="492" y2="492"/><ellipse cx="320" cy="505.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="329" y="509.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="423.4985" y="509.5623">int</text><line style="stroke:#181818;stroke-width:1;" x1="310" x2="557.6186" y1="516.9429" y2="516.9429"/><ellipse cx="320" cy="530.9143" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33.0108" x="329" y="534.5051">code</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.6151" x="423.4985" y="534.5051">varchar(80)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="517.9971" y="534.5051">&#171;UK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53.2746" x="329" y="551.448">address</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="85.7286" x="423.4985" y="551.448">varchar(255)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37.1073" x="329" y="568.3909">notes</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25.8916" x="423.4985" y="568.3909">text</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.1808" x="329" y="585.3338">status_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="423.4985" y="585.3338">varchar(3)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="517.9971" y="585.3338">&#171;FK&#187;</text><ellipse cx="320" cy="598.6859" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.9789" x="329" y="602.2767">_created__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="423.4985" y="602.2767">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74.155" x="329" y="619.2196">_updated__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="423.4985" y="619.2196">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.7973" x="329" y="636.1625">_user__id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="423.4985" y="636.1625">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="517.9971" y="636.1625">&#171;FK&#187;</text></g><!--class country--><g class="entity" data-entity="country" data-source-line="9" data-uid="ent0009" id="entity_country"><rect fill="#F1F1F1" height="183.5431" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249.6186" x="24" y="460"/><ellipse cx="119.2643" cy="476" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M115.4674,483 L115.4674,470.0625 L123.1393,470.0625 L123.1393,471.9844 L117.5143,471.9844 L117.5143,475.2969 L122.5456,475.2969 L122.5456,477.1875 L117.5143,477.1875 L117.5143,481.0781 L123.1393,481.0781 L123.1393,483 L115.4674,483 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50.59" x="139.7643" y="481.0908">country</text><line style="stroke:#181818;stroke-width:0.5;" x1="25" x2="272.6186" y1="492" y2="492"/><ellipse cx="35" cy="505.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="44" y="509.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="138.4985" y="509.5623">int</text><line style="stroke:#181818;stroke-width:1;" x1="25" x2="272.6186" y1="516.9429" y2="516.9429"/><ellipse cx="35" cy="530.9143" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33.0108" x="44" y="534.5051">code</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68.7062" x="138.4985" y="534.5051">varchar(2)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="232.9971" y="534.5051">&#171;UK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="36.4113" x="44" y="551.448">name</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.6151" x="138.4985" y="551.448">varchar(80)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37.1073" x="44" y="568.3909">notes</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25.8916" x="138.4985" y="568.3909">text</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.1808" x="44" y="585.3338">status_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="138.4985" y="585.3338">varchar(3)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="232.9971" y="585.3338">&#171;FK&#187;</text><ellipse cx="35" cy="598.6859" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.9789" x="44" y="602.2767">_created__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="138.4985" y="602.2767">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74.155" x="44" y="619.2196">_updated__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="138.4985" y="619.2196">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.7973" x="44" y="636.1625">_user__id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="138.4985" y="636.1625">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="232.9971" y="636.1625">&#171;FK&#187;</text></g><!--class location_code--><g class="entity" data-entity="location_code" data-source-line="23" data-uid="ent0010" id="entity_location_code"><rect fill="#F1F1F1" height="217.4289" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="249.6186" x="303" y="721"/><ellipse cx="377.722" cy="737" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M373.9252,744 L373.9252,731.0625 L381.597,731.0625 L381.597,732.9844 L375.972,732.9844 L375.972,736.2969 L381.0033,736.2969 L381.0033,738.1875 L375.972,738.1875 L375.972,742.0781 L381.597,742.0781 L381.597,744 L373.9252,744 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91.6745" x="398.222" y="742.0908">location_code</text><line style="stroke:#181818;stroke-width:0.5;" x1="304" x2="551.6186" y1="753" y2="753"/><ellipse cx="314" cy="766.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="323" y="770.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="417.4985" y="770.5623">int</text><line style="stroke:#181818;stroke-width:1;" x1="304" x2="551.6186" y1="777.9429" y2="777.9429"/><ellipse cx="314" cy="791.9143" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33.0108" x="323" y="795.5051">code</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68.8653" x="417.4985" y="795.5051">varchar(8)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="511.9971" y="795.5051">&#171;UK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73.9959" x="323" y="812.448">description</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.6151" x="417.4985" y="812.448">varchar(80)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37.1073" x="323" y="829.3909">notes</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25.8916" x="417.4985" y="829.3909">text</text><ellipse cx="314" cy="842.743" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68.9249" x="323" y="846.3338">country_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="417.4985" y="846.3338">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="511.9971" y="846.3338">&#171;FK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68.5869" x="323" y="863.2767">contact_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="417.4985" y="863.2767">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="511.9971" y="863.2767">&#171;FK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.1808" x="323" y="880.2196">status_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="417.4985" y="880.2196">varchar(3)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="511.9971" y="880.2196">&#171;FK&#187;</text><ellipse cx="314" cy="893.5716" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.9789" x="323" y="897.1625">_created__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="417.4985" y="897.1625">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74.155" x="323" y="914.1054">_updated__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="417.4985" y="914.1054">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.7973" x="323" y="931.0482">_user__id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="417.4985" y="931.0482">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="511.9971" y="931.0482">&#171;FK&#187;</text></g><!--class location--><g class="entity" data-entity="location" data-source-line="38" data-uid="ent0011" id="entity_location"><rect fill="#F1F1F1" height="238.3717" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="278.9506" x="542.5" y="1015"/><ellipse cx="651.5553" cy="1031" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1;"/><path d="M647.7584,1038 L647.7584,1025.0625 L655.4303,1025.0625 L655.4303,1026.9844 L649.8053,1026.9844 L649.8053,1030.2969 L654.8365,1030.2969 L654.8365,1032.1875 L649.8053,1032.1875 L649.8053,1036.0781 L655.4303,1036.0781 L655.4303,1038 L647.7584,1038 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="52.34" x="672.0553" y="1036.0908">location</text><line style="stroke:#181818;stroke-width:0.5;" x1="543.5" x2="820.4506" y1="1047" y2="1047"/><ellipse cx="553.5" cy="1060.9714" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12.0112" x="562.5" y="1064.5623">id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="688.498" y="1064.5623">int</text><ellipse cx="553.5" cy="1098.8572" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="110.0095" x="562.5" y="1102.448">location_code_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="688.498" y="1102.448">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="782.9966" y="1102.448">&#171;FK&#187;</text><ellipse cx="553.5" cy="1115.8001" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33.0108" x="562.5" y="1119.3909">code</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.8935" x="688.498" y="1119.3909">varchar(30)</text><line style="stroke:#181818;stroke-width:1;stroke-dasharray:1,2;" x1="543.5" x2="664.6645" y1="1080.4143" y2="1080.4143"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="34.6216" x="664.6645" y="1085.0051">&#171;UK&#187;</text><line style="stroke:#181818;stroke-width:1;stroke-dasharray:1,2;" x1="699.2861" x2="820.4506" y1="1080.4143" y2="1080.4143"/><line style="stroke:#181818;stroke-width:1;" x1="543.5" x2="820.4506" y1="1126.7715" y2="1126.7715"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="73.9959" x="562.5" y="1144.3338">description</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="77.6151" x="688.498" y="1144.3338">varchar(80)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="37.1073" x="562.5" y="1161.2767">notes</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="25.8916" x="688.498" y="1161.2767">text</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68.5869" x="562.5" y="1178.2196">contact_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="656.9985" y="1178.2196">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="751.4971" y="1178.2196">&#171;FK&#187;</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.1808" x="562.5" y="1195.1625">status_id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.1437" x="688.498" y="1195.1625">varchar(3)</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="782.9966" y="1195.1625">&#171;FK&#187;</text><ellipse cx="553.5" cy="1208.5145" fill="#000000" rx="3" ry="3" style="stroke:#000000;stroke-width:1;"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="69.9789" x="562.5" y="1212.1054">_created__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="688.498" y="1212.1054">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74.155" x="562.5" y="1229.0482">_updated__</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="58.5643" x="688.498" y="1229.0482">datetime</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="59.7973" x="562.5" y="1245.9911">_user__id</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="16.6048" x="688.498" y="1245.9911">int</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="32.454" x="782.9966" y="1245.9911">&#171;FK&#187;</text></g><!--link status to user--><g class="link" data-entity-1="status" data-entity-2="user" data-source-line="21" data-uid="lnk4" id="link_status_user"><path codeLine="21" d="M370.116,89.0174 C390.7833,110.6895 411.7057,132.6289 437.8111,160.0033" fill="none" id="status-to-user" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="437.8111" x2="449.1217" y1="160.0033" y2="165.7928"/><line style="stroke:#181818;stroke-width:1;" x1="437.8111" x2="437.5427" y1="160.0033" y2="165.7928"/><line style="stroke:#181818;stroke-width:1;" x1="437.8111" x2="443.3322" y1="160.0033" y2="165.7928"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54.9548" x="414" y="132.5938">status_id</text></g><!--link user to user--><g class="link" data-entity-1="user" data-entity-2="user" data-source-line="22" data-uid="lnk5" id="link_user_user"><path codeLine="22" d="M672.1086,249.1137 C692.7711,252.7069 707,261.1689 707,274.5 C707,287.8311 700.6528,294.9225 679.9903,298.5157" fill="none" id="user-to-user" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="679.9903" x2="672.1086" y1="298.5157" y2="307.768"/><line style="stroke:#181818;stroke-width:1;" x1="679.9903" x2="672.1086" y1="298.5157" y2="292.0046"/><line style="stroke:#181818;stroke-width:1;" x1="679.9903" x2="672.1086" y1="298.5157" y2="299.8863"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="55.5273" x="713" y="279.5938">_user__id</text></g><!--link status to contact--><g class="link" data-entity-1="status" data-entity-2="contact" data-source-line="20" data-uid="lnk7" id="link_status_contact"><path codeLine="20" d="M333.2072,89.0776 C338.0137,178.5322 349,383 349,383 C349,383 364.0822,412.9869 383.9262,452.4415" fill="none" id="status-to-contact" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="383.9262" x2="394.6677" y1="452.4415" y2="459.5884"/><line style="stroke:#181818;stroke-width:1;" x1="383.9262" x2="380.3739" y1="452.4415" y2="459.5884"/><line style="stroke:#181818;stroke-width:1;" x1="383.9262" x2="387.5208" y1="452.4415" y2="459.5884"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54.9548" x="350" y="279.5938">status_id</text></g><!--link user to contact--><g class="link" data-entity-1="user" data-entity-2="contact" data-source-line="21" data-uid="lnk8" id="link_user_contact"><path codeLine="21" d="M502.6637,383.3789 C492.3997,408.5847 484.5906,427.7619 474.6457,452.1842" fill="none" id="user-to-contact" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="474.6457" x2="479.0379" y1="452.1842" y2="459.5935"/><line style="stroke:#181818;stroke-width:1;" x1="474.6457" x2="464.2193" y1="452.1842" y2="459.5935"/><line style="stroke:#181818;stroke-width:1;" x1="474.6457" x2="471.6286" y1="452.1842" y2="459.5935"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="55.5273" x="491" y="426.5938">_user__id</text></g><!--link contact to location--><g class="link" data-entity-1="contact" data-entity-2="location" data-source-line="53" data-uid="lnk12" id="link_contact_location"><path codeLine="53" d="M508.9135,644.4116 C540.8975,683.8662 571,721 571,721 C571,721 615.1052,885.1029 647.8923,1007.0946" fill="none" id="contact-to-location" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="647.8923" x2="657.6945" y1="1007.0946" y2="1014.8204"/><line style="stroke:#181818;stroke-width:1;" x1="647.8923" x2="642.2429" y1="1007.0946" y2="1014.8204"/><line style="stroke:#181818;stroke-width:1;" x1="647.8923" x2="649.9687" y1="1007.0946" y2="1014.8204"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63.6892" x="629" y="834.5938">contact_id</text></g><!--link contact to location_code--><g class="link" data-entity-1="contact" data-entity-2="location_code" data-source-line="54" data-uid="lnk13" id="link_contact_location_code"><path codeLine="54" d="M432.0104,644.018 C431.4783,668.63 431.071,687.4651 430.5215,712.881" fill="none" id="contact-to-location_code" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="430.5215" x2="438.3467" y1="712.881" y2="720.8791"/><line style="stroke:#181818;stroke-width:1;" x1="430.5215" x2="422.3505" y1="712.881" y2="720.8791"/><line style="stroke:#181818;stroke-width:1;" x1="430.5215" x2="430.3486" y1="712.881" y2="720.8791"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="63.6892" x="432" y="687.5938">contact_id</text></g><!--link country to location_code--><g class="link" data-entity-1="country" data-entity-2="location_code" data-source-line="55" data-uid="lnk14" id="link_country_location_code"><path codeLine="55" d="M241.5154,644.018 C266.2604,668.63 287.5665,689.8216 313.1199,715.2375" fill="none" id="country-to-location_code" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="313.1199" x2="324.4336" y1="715.2375" y2="720.8791"/><line style="stroke:#181818;stroke-width:1;" x1="313.1199" x2="313.1504" y1="715.2375" y2="720.8791"/><line style="stroke:#181818;stroke-width:1;" x1="313.1199" x2="318.792" y1="715.2375" y2="720.8791"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="64.0032" x="289" y="687.5938">country_id</text></g><!--link location_code to location--><g class="link" data-entity-1="location_code" data-entity-2="location" data-source-line="56" data-uid="lnk15" id="link_location_code_location"><path codeLine="56" d="M473.4979,938.3449 C484.4217,964.4782 493,985 493,985 C493,985 507.7996,996.6675 535.8816,1018.8062" fill="none" id="location_code-to-location" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="535.8816" x2="542.1641" y1="1018.8062" y2="1017.4765"/><line style="stroke:#181818;stroke-width:1;" x1="535.8816" x2="542.1641" y1="1018.8062" y2="1030.0415"/><line style="stroke:#181818;stroke-width:1;" x1="535.8816" x2="542.1641" y1="1018.8062" y2="1023.759"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="102.1539" x="494" y="981.5938">location_code_id</text></g><!--link status to country--><g class="link" data-entity-1="status" data-entity-2="country" data-source-line="57" data-uid="lnk16" id="link_status_country"><path codeLine="57" d="M310.7144,89.2707 C293.9889,123.2985 273,166 273,166 C273,166 217.8322,337.7321 181.1479,451.9268" fill="none" id="status-to-country" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="181.1479" x2="186.3177" y1="451.9268" y2="459.5434"/><line style="stroke:#181818;stroke-width:1;" x1="181.1479" x2="171.0845" y1="451.9268" y2="459.5434"/><line style="stroke:#181818;stroke-width:1;" x1="181.1479" x2="178.7011" y1="451.9268" y2="459.5434"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54.9548" x="274" y="279.5938">status_id</text></g><!--link status to location--><g class="link" data-entity-1="status" data-entity-2="location" data-source-line="58" data-uid="lnk17" id="link_status_location"><path codeLine="58" d="M440.1833,77.0172 C571.6475,111.9559 775,166 775,166 C775,166 829,274.5 829,274.5 C829,274.5 829,274.5 829,829.5 C829,829.5 784.1728,922.3563 742.9436,1007.7597" fill="none" id="status-to-location" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="742.9436" x2="746.67" y1="1007.7597" y2="1014.9641"/><line style="stroke:#181818;stroke-width:1;" x1="742.9436" x2="732.2612" y1="1007.7597" y2="1014.9641"/><line style="stroke:#181818;stroke-width:1;" x1="742.9436" x2="739.4656" y1="1007.7597" y2="1014.9641"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54.9548" x="830" y="557.0938">status_id</text></g><!--link status to location_code--><g class="link" data-entity-1="status" data-entity-2="location_code" data-source-line="59" data-uid="lnk18" id="link_status_location_code"><path codeLine="59" d="M284.1333,89.2707 C245.4916,123.2985 197,166 197,166 C197,166 6,460 6,460 C6,460 6,644 6,644 C6,644 171.0741,716.5622 295.4902,771.2522" fill="none" id="status-to-location_code" style="stroke:#181818;stroke-width:1;"/><line style="stroke:#181818;stroke-width:1;" x1="295.4902" x2="302.8139" y1="771.2522" y2="767.1478"/><line style="stroke:#181818;stroke-width:1;" x1="295.4902" x2="302.8139" y1="771.2522" y2="781.7952"/><line style="stroke:#181818;stroke-width:1;" x1="295.4902" x2="302.8139" y1="771.2522" y2="774.4715"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54.9548" x="37" y="426.5938">status_id</text></g><!--link user to country--><g class="link" data-entity-1="user" data-entity-2="country" data-source-line="60" data-uid="lnk19" id="link_user_country"><path codeLine="60" d="M421.8247,363.8521 C405.8829,375.2316 395,383 395,383 C395,383 341.5269,419.7357 280.7559,461.4848" fill="none" id="user-to-country" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="280.7559" x2="274.162" y1="461.4848" y2="472.6086"/><line style="stroke:#181818;stroke-width:1;" x1="280.7559" x2="274.162" y1="461.4848" y2="459.4208"/><line style="stroke:#181818;stroke-width:1;" x1="280.7559" x2="274.162" y1="461.4848" y2="466.0147"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="55.5273" x="348" y="426.5938">_user__id</text></g><!--link user to location--><g class="link" data-entity-1="user" data-entity-2="location" data-source-line="61" data-uid="lnk20" id="link_user_location"><path codeLine="61" d="M602.6741,383.211 C623.4083,423.6972 642,460 642,460 C642,460 701,721 701,721 C701,721 701,938 701,938 C701,938 698.2957,965.8968 694.3171,1006.9391" fill="none" id="user-to-location" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="694.3171" x2="701.5079" y1="1006.9391" y2="1014.9018"/><line style="stroke:#181818;stroke-width:1;" x1="694.3171" x2="685.5825" y1="1006.9391" y2="1014.9018"/><line style="stroke:#181818;stroke-width:1;" x1="694.3171" x2="693.5452" y1="1006.9391" y2="1014.9018"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="55.5273" x="694" y="687.5938">_user__id</text></g><!--link user to location_code--><g class="link" data-entity-1="user" data-entity-2="location_code" data-source-line="62" data-uid="lnk21" id="link_user_location_code"><path codeLine="62" d="M564.5813,383.211 C571.1289,423.6972 577,460 577,460 C577,460 577,644 577,644 C577,644 552.8502,674.0657 520.3303,714.5519" fill="none" id="user-to-location_code" style="stroke:#181818;stroke-width:1;stroke-dasharray:7,7;"/><line style="stroke:#181818;stroke-width:1;" x1="520.3303" x2="521.5575" y1="714.5519" y2="720.789"/><line style="stroke:#181818;stroke-width:1;" x1="520.3303" x2="509.0833" y1="714.5519" y2="720.789"/><line style="stroke:#181818;stroke-width:1;" x1="520.3303" x2="515.3204" y1="714.5519" y2="720.789"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="55.5273" x="578" y="557.0938">_user__id</text></g><!--SRC=[nPEnRiCW48Ptdk8wjObagsgNA8eoTkdSpHAYW5HK6oCuLxMYldiDsB6D73UPYXUu-pd- -y3tTqhpiX4ItfcJkIcPngOgoJdia67ZSZCBybeZunYZn7qgRPXb5PHAIsoD15ENhLyGGgH6XMstfT5eMpWHW2qeKQ3_bCPkdMKXo6iXVV2BMVx1xCFJfi33uUtrUEpI09fLi_JkSHFZDKhd4oY_CKIYPneF6UJFeTfBhBO5ograA0Mb1OfkWggIOJDjZBYGSDBIlcfdF7RGb_mXOwjbpHcgMbFVq2qDx-OD2-cuLSQN-hlhxK0u64pj-HtzfLtC_nEr15h2Qo2Mvn39TBCWc46-qDD8UD9Gu1Sk826ymdZojcwYU1N75P9hB1TfzkuWZZm_ZLp3s4_yhuZZoqt4yV-D8ykMnCFx8_FKL3pOIA-FH6umgJy_SJ-INT2cvQ_H3hv7hSSBv-61f1xEDx2WJJrSenqyZ5ho2m00]--></g></svg>
\ No newline at end of file
diff --git a/app/alchemy/status.plantuml b/app/alchemy/status.plantuml
new file mode 100644
index 0000000..77515bd
--- /dev/null
+++ b/app/alchemy/status.plantuml
@@ -0,0 +1,20 @@
+@startuml
+
+'!include base.plantuml
+
+
+class Status {
+    id\t\tString(3)\t\t<<Primary>>  {field}
+  + name\tString(30)\t<<Unique>>    {field}
+}
+
+'Base <|-- Status
+
+abstract StatusForeignKey {
+    status_id\t\tStatus.id {field}
+  + status\t\tStatus      {field}
+}
+
+Status *-- StatusForeignKey
+
+@enduml
diff --git a/app/alchemy/status.puml b/app/alchemy/status.puml
new file mode 100644
index 0000000..20e7048
--- /dev/null
+++ b/app/alchemy/status.puml
@@ -0,0 +1,9 @@
+@startuml
+
+entity status {
+  * id\t\tvarchar(3)
+  --
+  * name\tvarchar(30)\t<<UK>>
+}
+
+@enduml
diff --git a/app/alchemy/user.plantuml b/app/alchemy/user.plantuml
new file mode 100644
index 0000000..4a2bdb9
--- /dev/null
+++ b/app/alchemy/user.plantuml
@@ -0,0 +1,31 @@
+@startuml
+
+'!include base.plantuml
+!include status.plantuml
+skinparam linetype ortho
+
+
+class User {
+  {field}  + code\t\tString(253)\t<<Unique>>
+  {field}  + name\t\tString(253)
+  {field}  + password\tString(255) | None
+  {field}  + ldap_name\tString(255) | None
+  {field}  + notes\t\tText | None
+           + __repr__()\t\tstr
+}
+
+abstract Versioned {
+  {field}  + user__\t\tUser
+  {field}  # _created__\tDatetime
+  {field}  # _updated__\tDatetime | None
+  {field}    _user__id\t\tInteger | None
+  {field}  # __versioned__\t= True
+}
+
+'Base <|-- User
+StatusForeignKey <|-[#blue]- User
+Versioned <|-[#blue]- User
+User *-- Versioned
+
+
+@enduml
diff --git a/app/alchemy/user.puml b/app/alchemy/user.puml
new file mode 100644
index 0000000..cf63a07
--- /dev/null
+++ b/app/alchemy/user.puml
@@ -0,0 +1,25 @@
+@startuml
+
+
+!include status.puml
+skinparam linetype polyline
+
+
+entity user {
+  * id\t\t\tint
+  --
+  * code\t\tvarchar(255)\t<<UK>>
+  * name\t\tvarchar(255)
+    password\tvarchar(255)
+    ldap_name\tvarchar(255)
+    notes\t\ttext
+    status_id\t\tvarchar(3)\t<<FK>>
+  * _created__\tdatetime
+    _updated__\tdatetime
+    _user__id\t\tint\t\t\t<<FK>>
+}
+
+status --{ user : status_id
+user   ..{ user : _user__id
+
+@enduml
\ No newline at end of file
diff --git a/app/alchemy/user.py b/app/alchemy/user.py
index 3ad032b..f8aa0a2 100644
--- a/app/alchemy/user.py
+++ b/app/alchemy/user.py
@@ -61,15 +61,15 @@ class Versioned:
 
     # noinspection PyMethodParameters
     @declared_attr
-    def _user__(cls) -> Mapped["User"]:
+    def user__(cls) -> Mapped["User"]:
         return relationship()
 
 
 class User(StatusForeignKey, Versioned, Base):
     """User"""
 
-    code: Mapped[str] = mapped_column(String(253), unique=True)
-    name: Mapped[str] = mapped_column(String(253))
+    code: Mapped[str] = mapped_column(String(255), unique=True)
+    name: Mapped[str] = mapped_column(String(255))
     password: Mapped[str | None] = mapped_column(String(255))
     ldap_name: Mapped[str | None] = mapped_column(String(255))
     notes: Mapped[str | None] = mapped_column(Text)
@@ -90,10 +90,8 @@ def initialize_user(target, connection, **kwargs):
         session.commit()
         for kwargs in (
                 dict(code="CTM", name="Control-M", password=get_password_hash("secret"), notes="user for automation"),
-                dict(code="exde37c8", name="Bernhard Radermacher",
-                     password=get_password_hash("secret"),
-                     ldap_name="a0061806@kiongroup.com",
-                     ),
+                dict(code="de31c7", name="Andy Le", ldap_name="a0032514@kiongroup.com"),
+                dict(code="exde37c8", name="Bernhard Radermacher", ldap_name="a0061806@kiongroup.com"),
         ):
             kwargs.update(dict(status_id='A', _user__id=qsys.id))
             session.add(User(**kwargs))
diff --git a/app/dependencies/engine.py b/app/dependencies/engine.py
index 2e71a50..69e3cc2 100644
--- a/app/dependencies/engine.py
+++ b/app/dependencies/engine.py
@@ -1,7 +1,7 @@
 from sqlalchemy import create_engine
 
 # engine_url="sqlite+pysqlite:///vpsx.db"
-engine_url="mariadb+pymysql://fast:fast@localhost/fast_vpsx?charset=utf8mb4"
+engine_url="mariadb+pymysql://fast:fast@mariadb.ctmapp.kiongroup.net/fast_vpsx?charset=utf8mb4"
 
 
 def get_engine():
diff --git a/app/routers/contact.py b/app/routers/contact.py
index 143b9f4..37e4630 100644
--- a/app/routers/contact.py
+++ b/app/routers/contact.py
@@ -9,118 +9,94 @@ import alchemy
 import utils
 from dependencies import get_session
 from utils import update_item, create_item
-from .status_model import Status
 from .user import ACTIVE_USER
+from .models import Contact, ContactCreate, ContactUpdate
+
 
 PRIMARY_ANNOTATION = utils.make_primary_annotation('Contact')
 
-
-# ----------------------------------------------------------------
-# Models
-
-class ContactBase(SQLModel):
-    code: str = Field(max_length=80, unique=True)
-    address: str = Field(max_length=253)
-    notes: str | None
-
-
-class Contact(ContactBase):
-    id: int | None = Field(default=None, primary_key=True)
-
-
-class ContactCreate(ContactBase):
-    address: str | None = None
-    notes: str | None = None
-
-
-class ContactPublic(ContactBase):
-    id: int
-    status: Status
-
-
-class ContactUpdate(ContactBase):
-    code: str | None = None
-    address: str | None = None
-    notes: str | None = None
-
-
 # ----------------------------------------------------------------
 # Routes
 
 router = APIRouter(prefix="/contact", tags=["contact"])
 
 
-@router.get("/", response_model=list[ContactPublic])
+@router.get("/",
+            response_model=list[Contact])
 async def get_contacts(
         offset: int = 0,
         limit: Annotated[int, Query] = 100,
         session=Depends(get_session)):
-    """Get list of all contacts"""
-    if limit < 1:
-        limit = sys.maxsize
-    return session.exec(select(alchemy.Contact).offset(offset).limit(limit)).all()
+    """Get list of all Contacts"""
+    return session.exec(
+        select(
+            alchemy.Contact
+        ).offset(offset).limit(limit or sys.maxsize)).all()
 
 
-@router.get("/{contact_id}",
-            response_model=ContactPublic,
+# noinspection PyTypeHints
+@router.get("/{contact}",
+            response_model=Contact,
             responses={404: {"description": "Not found"}})
 async def get_contact(
-        contact_id: PRIMARY_ANNOTATION,
+        contact: PRIMARY_ANNOTATION,
         session=Depends(get_session)):
-    return utils.get_single_record(session, alchemy.Contact, contact_id)
+    return utils.get_single_record(session, alchemy.Contact, 'Contact', contact)
 
 
+# noinspection PyTypeHints
 @router.post("/",
-             response_model=ContactPublic)
+             response_model=Contact)
 async def create_contact(
-        contact: ContactCreate,
+        data: ContactCreate,
         current_user: ACTIVE_USER,
         session=Depends(get_session)):
     return create_item(
         session=session,
         cls=alchemy.Contact,
+        name='Contact',
         current_user=current_user,
-        data=Contact.model_validate(contact))
+        data=data)
 
 
-@router.patch("/{contact_id}",
-              response_model=ContactPublic,
+@router.patch("/{contact}",
+              response_model=Contact,
               responses={404: {"description": "Not found"}})
 async def update_contact(
-        contact_id: PRIMARY_ANNOTATION,
-        contact: ContactUpdate,
+        contact: PRIMARY_ANNOTATION,
+        data: ContactUpdate,
         current_user: ACTIVE_USER,
         session=Depends(get_session)):
     return update_item(
         session=session,
         current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Contact, contact_id),
-        data=contact)
+        item=utils.get_single_record(session, alchemy.Contact, 'Contact', contact),
+        data=data)
 
 
-@router.put("/{contact_id}/activate",
-            response_model=ContactPublic,
-              responses={404: {"description": "Not found"}})
+@router.put("/{contact}/activate",
+            response_model=Contact,
+            responses={404: {"description": "Not found"}})
 async def activate_contact(
-        contact_id: PRIMARY_ANNOTATION,
+        contact: PRIMARY_ANNOTATION,
         current_user: ACTIVE_USER,
         session=Depends(get_session)):
     return utils.set_item_status(
         session=session,
         current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Contact, contact_id),
+        item=utils.get_single_record(session, alchemy.Contact, 'Contact', contact),
         status='A')
 
 
-@router.put("/{contact_id}/deactivate",
-            response_model=ContactPublic,
-              responses={404: {"description": "Not found"}})
+@router.put("/{contact}/deactivate",
+            response_model=Contact,
+            responses={404: {"description": "Not found"}})
 async def deactivate_contact(
-        contact_id: PRIMARY_ANNOTATION,
+        contact: PRIMARY_ANNOTATION,
         current_user: ACTIVE_USER,
         session=Depends(get_session)):
     return utils.set_item_status(
         session=session,
         current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Contact, contact_id),
+        item=utils.get_single_record(session, alchemy.Contact, 'Contact', contact),
         status='I')
diff --git a/app/routers/country.py b/app/routers/country.py
deleted file mode 100644
index 8074c00..0000000
--- a/app/routers/country.py
+++ /dev/null
@@ -1,125 +0,0 @@
-import sys
-from typing import Annotated
-
-from fastapi import APIRouter, Query, Depends
-from sqlmodel import SQLModel, Field
-from sqlmodel import select
-
-import alchemy
-import utils
-from dependencies import get_session
-from utils import update_item, create_item
-from .status_model import Status
-from .user import ACTIVE_USER
-
-PRIMARY_ANNOTATION = utils.make_primary_annotation('Country')
-
-
-# ----------------------------------------------------------------
-# Models
-
-class CountryBase(SQLModel):
-    code: str = Field(max_length=2, unique=True)
-    name: str = Field(max_length=80)
-    notes: str | None
-
-
-class Country(CountryBase):
-    id: int | None = Field(default=None, primary_key=True)
-
-
-class CountryCreate(CountryBase):
-    notes: str | None = None
-
-
-class CountryPublic(CountryBase):
-    id: int
-    status: Status
-
-
-class CountryUpdate(CountryBase):
-    code: str | None = None
-    name: str | None = None
-    notes: str | None = None
-
-
-# ----------------------------------------------------------------
-# Routes
-
-router = APIRouter(prefix="/country", tags=["country"])
-
-
-@router.get("/", response_model=list[CountryPublic])
-async def get_countries(
-        offset: int = 0,
-        limit: Annotated[int, Query] = 100,
-        session=Depends(get_session)):
-    """Get list of all countries"""
-    if limit < 1:
-        limit = sys.maxsize
-    return session.exec(select(alchemy.Country).offset(offset).limit(limit)).all()
-
-
-@router.get("/{country_id}",
-            response_model=CountryPublic,
-            responses={404: {"description": "Not found"}})
-async def get_country(
-        country_id: PRIMARY_ANNOTATION,
-        session=Depends(get_session)):
-    return utils.get_single_record(session, alchemy.Country, country_id)
-
-
-@router.post("/",
-             response_model=CountryPublic)
-async def create_country(
-        country: CountryCreate,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return create_item(
-        session=session,
-        cls=alchemy.Country,
-        current_user=current_user,
-        data=Country.model_validate(country))
-
-
-@router.patch("/{country_id}",
-              response_model=CountryPublic,
-              responses={404: {"description": "Not found"}})
-async def update_country(
-        country_id: PRIMARY_ANNOTATION,
-        country: CountryUpdate,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return update_item(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Country, country_id),
-        data=country)
-
-
-@router.put("/{country_id}/activate",
-            response_model=CountryPublic,
-              responses={404: {"description": "Not found"}})
-async def activate_country(
-        country_id: PRIMARY_ANNOTATION,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return utils.set_item_status(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Country, country_id),
-        status='A')
-
-
-@router.put("/{country_id}/deactivate",
-            response_model=CountryPublic,
-              responses={404: {"description": "Not found"}})
-async def deactivate_country(
-        country_id: PRIMARY_ANNOTATION,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return utils.set_item_status(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.Country, country_id),
-        status='I')
diff --git a/app/routers/location.py b/app/routers/location.py
index 23c1ca1..82b894a 100644
--- a/app/routers/location.py
+++ b/app/routers/location.py
@@ -4,14 +4,13 @@ from typing import Annotated
 from fastapi import APIRouter, Query, Depends, HTTPException
 # from sqlmodel import SQLModel, Field
 from sqlmodel import select, and_
-from pydantic import BaseModel, Field
 # from sqlalchemy import select
 
 import alchemy
 import utils
 from dependencies import get_session
-from utils import update_item, create_item
-from .status_model import Status
+from utils import update_item
+from .models.location import LocationCode, Country, LocationCreate, LocationCodeCreate, CountryCreate, CountryUpdate
 from .user import ACTIVE_USER
 
 PRIMARY_ANNOTATION = utils.make_primary_annotation('Country')
@@ -73,66 +72,6 @@ PRIMARY_ANNOTATION = utils.make_primary_annotation('Country')
 #     notes: str | None = None
 
 
-class Contact(BaseModel):
-    code: str
-    address: str | None
-    notes: str | None
-
-
-class Location(BaseModel):
-    id: int
-    code: str
-    description: str | None
-    notes: str | None
-    status: Status
-    contact: Contact | None
-
-
-class LocationCode(BaseModel):
-    id: int
-    code: str
-    description: str | None
-    notes: str | None
-    status: Status
-    locations: list[Location]
-    contact: Contact | None
-
-
-
-class Country(BaseModel):
-    id: int
-    code: str
-    name: str
-    notes: str | None
-    status: Status
-    location_codes: list[LocationCode] | None
-
-
-class LocationCreate(BaseModel):
-    code: str = Field(max_length=30)
-    description: str | None = None
-    notes: str | None = None
-
-class LocationCodeCreate(BaseModel):
-    code: str = Field(max_length=8)
-    description: str | None = None
-    notes: str | None = None
-    locations: list[LocationCreate] | None = None
-
-class CountryCreate(BaseModel):
-    code: str = Field(max_length=2)
-    name: str = Field(max_length=80)
-    notes: str | None = None
-    location_codes: list[LocationCodeCreate] | None = None
-
-class CountryUpdate(BaseModel):
-    code: str | None = Field(default=None, max_length=2)
-    name: str | None = Field(default=None, max_length=80)
-    notes: str | None = None
-
-
-
-
 # class CountryUpdate(CountryBase):
 #     code: str | None = None
 #     name: str | None = None
@@ -168,7 +107,7 @@ async def get_country(
 
 
 @router.post("/",
-              response_model=Country)
+             response_model=Country)
 async def create_country(
         country: CountryCreate,
         current_user: ACTIVE_USER,
@@ -243,7 +182,7 @@ async def deactivate_country(
 
 
 @router.post("/{country}",
-            response_model=LocationCode,)
+             response_model=LocationCode, )
 async def create_location_code(
         country: PRIMARY_ANNOTATION,
         data: LocationCodeCreate,
@@ -274,7 +213,7 @@ async def create_location_code(
 
 
 @router.post("/{country}/{location_code}",
-            response_model=LocationCode,)
+             response_model=LocationCode, )
 async def create_location(
         country: PRIMARY_ANNOTATION,
         location_code: PRIMARY_ANNOTATION,
diff --git a/app/routers/location_code.py b/app/routers/location_code.py
deleted file mode 100644
index 4078da7..0000000
--- a/app/routers/location_code.py
+++ /dev/null
@@ -1,134 +0,0 @@
-import sys
-from typing import Annotated
-
-from fastapi import APIRouter, Query, Depends
-from sqlmodel import SQLModel, Field
-from sqlmodel import select
-
-import alchemy
-import utils
-from dependencies import get_session
-from utils import update_item, create_item
-from .status_model import Status
-from .user import ACTIVE_USER
-from .contact import Contact
-from .country import Country
-
-
-PRIMARY_ANNOTATION = utils.make_primary_annotation('Location Code')
-
-
-# ----------------------------------------------------------------
-# Models
-
-
-class LocationCodeBase(SQLModel):
-    code: str = Field(max_length=8, unique=True)
-    description: str = Field(max_length=256)
-    notes: str | None
-
-
-class LocationCode(LocationCodeBase):
-    id: int | None = Field(default=None, primary_key=True)
-    country: Country
-    contact: Contact | None = None
-
-
-class LocationCodeCreate(LocationCodeBase):
-    country_id: int
-    contact_id : int | None = None
-    notes: str | None = None
-
-
-class LocationCodePublic(LocationCode):
-    status: Status
-
-
-class LocationCodeUpdate(LocationCodeBase):
-    code: str | None = None
-    description: str | None = None
-    country_id: int | None = None
-    contact_id: int | None = None
-    notes: str | None = None
-
-
-# ----------------------------------------------------------------
-# Routes
-
-router = APIRouter(prefix="/location_code", tags=["location_code"])
-
-
-@router.get("/", response_model=list[LocationCodePublic])
-async def get_location_codes(
-        offset: int = 0,
-        limit: Annotated[int, Query] = 100,
-        session=Depends(get_session)):
-    """Get list of all location codes"""
-    if limit < 1:
-        limit = sys.maxsize
-    return session.exec(select(alchemy.LocationCode).offset(offset).limit(limit)).all()
-
-
-@router.get("/{location_code_id}",
-            response_model=LocationCodePublic,
-            responses={404: {"description": "Not found"}})
-async def get_location_code(
-        location_code_id: PRIMARY_ANNOTATION,
-        session=Depends(get_session)):
-    return utils.get_single_record(session, alchemy.LocationCode, location_code_id)
-
-
-@router.post("/",
-             response_model=LocationCodePublic)
-async def create_location_code(
-        location_code: LocationCodeCreate,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return create_item(
-        session=session,
-        cls=alchemy.LocationCode,
-        current_user=current_user,
-        data=LocationCodeCreate.model_validate(location_code))
-
-
-@router.patch("/{location_code_id}",
-              response_model=LocationCodePublic,
-              responses={404: {"description": "Not found"}})
-async def update_location_code(
-        location_code_id: PRIMARY_ANNOTATION,
-        location_code: LocationCodeUpdate,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return update_item(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.LocationCode, location_code_id),
-        data=location_code)
-
-
-@router.put("/{location_code_id}/activate",
-            response_model=LocationCodePublic,
-              responses={404: {"description": "Not found"}})
-async def activate_location_code(
-        locationCode_id: PRIMARY_ANNOTATION,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return utils.set_item_status(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.LocationCode, locationCode_id),
-        status='A')
-
-
-@router.put("/{location_code_id}/deactivate",
-            response_model=LocationCodePublic,
-              responses={404: {"description": "Not found"}})
-async def deactivate_location_code(
-        location_code_id: PRIMARY_ANNOTATION,
-        current_user: ACTIVE_USER,
-        session=Depends(get_session)):
-    return utils.set_item_status(
-        session=session,
-        current_user=current_user,
-        item=utils.get_single_record(session, alchemy.LocationCode, location_code_id),
-        status='I')
diff --git a/app/routers/models/__init__.py b/app/routers/models/__init__.py
new file mode 100644
index 0000000..b292f06
--- /dev/null
+++ b/app/routers/models/__init__.py
@@ -0,0 +1,5 @@
+from .contact import Contact, ContactCreate, ContactUpdate
+from .location import Country, CountryCreate, CountryUpdate, LocationCode, LocationCodeCreate, Location, LocationCreate
+from .status import Status
+
+
diff --git a/app/routers/models/contact.py b/app/routers/models/contact.py
new file mode 100644
index 0000000..1225748
--- /dev/null
+++ b/app/routers/models/contact.py
@@ -0,0 +1,23 @@
+from typing import Annotated
+
+from pydantic import BaseModel, Field
+
+from .status import Status
+
+
+class Contact(BaseModel):
+    id: int
+    code: str
+    address: str | None
+    notes: str | None
+    status: Status | None
+
+
+class ContactCreate(BaseModel):
+    code: str = Field(max_length=80)
+    address: Annotated[str | None, Field(max_length=253)] = None
+    notes: str | None = None
+
+
+class ContactUpdate(ContactCreate):
+    code: Annotated[str | None, Field(max_length=80)] = None
diff --git a/app/routers/models/location.py b/app/routers/models/location.py
new file mode 100644
index 0000000..7957675
--- /dev/null
+++ b/app/routers/models/location.py
@@ -0,0 +1,66 @@
+from typing import Annotated
+
+from pydantic import BaseModel, Field
+
+from .contact import Contact
+from .status import Status
+
+
+class Location(BaseModel):
+    id: int
+    code: str
+    description: str | None
+    notes: str | None
+    status: Status
+    contact: Contact | None
+
+class LocationCreate(BaseModel):
+    code: str = Field(max_length=30)
+    description: Annotated[str | None, Field(max_length=80)] = None
+    notes: str | None = None
+
+class LocationUpdate(LocationCreate):
+    code: Annotated[str | None, Field(max_length=30)] = None
+
+
+class LocationCode(BaseModel):
+    id: int
+    code: str
+    description: str | None
+    notes: str | None
+    status: Status
+    locations: list[Location]
+    contact: Contact | None
+
+class LocationCodeCreate(BaseModel):
+    code: str = Field(max_length=8)
+    description: Annotated[str | None, Field(max_length=80)] = None
+    notes: str | None = None
+    locations: list[LocationCreate] | None = None
+
+
+
+class Country(BaseModel):
+    id: int
+    code: str
+    name: str
+    notes: str | None
+    status: Status
+    location_codes: list[LocationCode] | None
+
+
+
+
+
+
+class CountryCreate(BaseModel):
+    code: str = Field(max_length=2)
+    name: str = Field(max_length=80)
+    notes: str | None = None
+    location_codes: list[LocationCodeCreate] | None = None
+
+
+class CountryUpdate(BaseModel):
+    code: str | None = Field(default=None, max_length=2)
+    name: str | None = Field(default=None, max_length=80)
+    notes: str | None = None
diff --git a/app/routers/models/status.py b/app/routers/models/status.py
new file mode 100644
index 0000000..4a80f0a
--- /dev/null
+++ b/app/routers/models/status.py
@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class Status(BaseModel):
+    id: str
+    name: str
diff --git a/app/routers/status.py b/app/routers/status.py
index 1b054e3..0d1120a 100644
--- a/app/routers/status.py
+++ b/app/routers/status.py
@@ -3,7 +3,7 @@ from sqlmodel import select, Session
 
 import alchemy
 from dependencies import get_session
-from routers.status_model import Status
+from routers.models import Status
 
 router = APIRouter(prefix="/status", tags=["status"])
 
diff --git a/app/routers/status_model.py b/app/routers/status_model.py
deleted file mode 100644
index 504ca87..0000000
--- a/app/routers/status_model.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from sqlmodel import SQLModel, Field
-
-
-class Status(SQLModel):
-    id: str | None = Field(max_length=3, primary_key=True)
-    name: str = Field(max_length=30, unique=True)
diff --git a/app/routers/user.py b/app/routers/user.py
index 5cebc12..da84353 100644
--- a/app/routers/user.py
+++ b/app/routers/user.py
@@ -16,7 +16,7 @@ from sqlmodel import SQLModel, Field, Session, select
 import alchemy
 import utils
 from dependencies import get_session
-from routers.status_model import Status
+from routers.models import Status
 
 logging.getLogger('passlib').setLevel(logging.ERROR)
 
diff --git a/app/utils/__init__.py b/app/utils/__init__.py
index e4b8c45..6164c16 100644
--- a/app/utils/__init__.py
+++ b/app/utils/__init__.py
@@ -35,11 +35,12 @@ def set_item_status(session, current_user, item, status: str):
 
 def update_item(session, current_user, item, data):
     for k, v in data.model_dump(exclude_unset=True).items():
-        if (k == 'code' and
-                session.scalar(select(item.__class__).where(item.__class__.code == v)) != item):
-            raise HTTPException(status_code=422,
-                                detail=[dict(msg=f"{item.__class__.__name__} {k!r} already exists",
-                                             type="Integrity Error")])
+        if k == 'code':
+            r = session.scalar(select(item.__class__).where(item.__class__.code == v))
+            if r and r != item:
+                raise HTTPException(status_code=422,
+                                    detail=[dict(msg=f"{item.__class__.__name__} {v!r} already exists",
+                                                 type="Integrity Error")])
         setattr(item, k, v)
     item._user__id = current_user.id
     try:
@@ -52,11 +53,11 @@ def update_item(session, current_user, item, data):
     return item
 
 
-def create_item(session, cls, current_user, data):
+def create_item(session, cls, name, current_user, data):
     item = cls(**data.model_dump())
     if session.scalar(select(cls).where(cls.code == item.code)):
         raise HTTPException(status_code=422,
-                            detail=[dict(msg=f"{cls.__class__.__name__} {item.code} already exists",
+                            detail=[dict(msg=f"{name} {item.code!r} already exists",
                                          type="Integrity Error")])
     item._user__id = current_user.id
     session.add(item)